diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2015-08-08 12:31:56 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2015-08-08 12:31:56 +0000 |
| commit | fecf6edb4b2c36db1c953b276083b9b48c6a6b6b (patch) | |
| tree | d5b0bb1c0e93939b3db619687b0894f2360c0d62 | |
| parent | Version bump. Remove old. (diff) | |
| download | gentoo-2-fecf6edb4b2c36db1c953b276083b9b48c6a6b6b.tar.gz gentoo-2-fecf6edb4b2c36db1c953b276083b9b48c6a6b6b.tar.bz2 gentoo-2-fecf6edb4b2c36db1c953b276083b9b48c6a6b6b.zip | |
Fix build failure with Emacs 24.5, bug 557002.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
| -rw-r--r-- | app-emacs/csharp-mode/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app-emacs/csharp-mode/ChangeLog b/app-emacs/csharp-mode/ChangeLog index 2c7cd3a2a70e..d0fe04cd02a4 100644 --- a/app-emacs/csharp-mode/ChangeLog +++ b/app-emacs/csharp-mode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emacs/csharp-mode -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.15 2014/11/19 17:27:02 ulm Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.16 2015/08/08 12:31:56 ulm Exp $ + + 08 Aug 2015; Ulrich Müller <ulm@gentoo.org> + files/csharp-mode-0.7.0-emacs-24.4.patch: + Fix build failure with Emacs 24.5, bug 557002. 19 Nov 2014; Ulrich Müller <ulm@gentoo.org> csharp-mode-0.7.0-r1.ebuild, +files/csharp-mode-0.7.0-emacs-24.4.patch: diff --git a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch index 1bbc0d2d3a45..c3f73201cbae 100644 --- a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch +++ b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch @@ -2,13 +2,12 @@ https://bugs.gentoo.org/528374 --- a/csharp-mode.el +++ b/csharp-mode.el -@@ -125,6 +125,10 @@ +@@ -125,6 +125,9 @@ (stringp byte-compile-dest-file)) (cons (file-name-directory byte-compile-dest-file) load-path) load-path))) + (and (= emacs-major-version 24) -+ (= emacs-minor-version 4) -+ (null emacs-repository-version) ++ (>= emacs-minor-version 4) + (require 'cl)) (load "cc-mode" nil t) (load "cc-fonts" nil t) |