summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2015-04-18 21:17:10 +0000
committerUlrich Müller <ulm@gentoo.org>2015-04-18 21:17:10 +0000
commit36de25c672d35d1d199cedcfb7d861ba43f0cd7f (patch)
tree101df48138b7fcd8ad347fa9aaab6a3e05d6fd44 /app-emacs/d-mode
parentRemove old. (diff)
downloadgentoo-2-36de25c672d35d1d199cedcfb7d861ba43f0cd7f.tar.gz
gentoo-2-36de25c672d35d1d199cedcfb7d861ba43f0cd7f.tar.bz2
gentoo-2-36de25c672d35d1d199cedcfb7d861ba43f0cd7f.zip
Fix build failure with Emacs 24.5, bug 547026.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)
Diffstat (limited to 'app-emacs/d-mode')
-rw-r--r--app-emacs/d-mode/ChangeLog6
-rw-r--r--app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch8
2 files changed, 8 insertions, 6 deletions
diff --git a/app-emacs/d-mode/ChangeLog b/app-emacs/d-mode/ChangeLog
index 3090b39d1fd7..2150d9ea40a4 100644
--- a/app-emacs/d-mode/ChangeLog
+++ b/app-emacs/d-mode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/d-mode
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/d-mode/ChangeLog,v 1.3 2015/01/13 17:21:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/d-mode/ChangeLog,v 1.4 2015/04/18 21:17:10 ulm Exp $
+
+ 18 Apr 2015; Ulrich Müller <ulm@gentoo.org>
+ files/d-mode-2.0.6-emacs-24.4.patch:
+ Fix build failure with Emacs 24.5, bug 547026.
13 Jan 2015; Ulrich Müller <ulm@gentoo.org> d-mode-2.0.6.ebuild,
+files/d-mode-2.0.6-emacs-24.4.patch:
diff --git a/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
index c40605b87a99..e8fc3500b48e 100644
--- a/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
+++ b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
@@ -1,15 +1,13 @@
https://bugs.gentoo.org/536490
+https://bugs.gentoo.org/547026
--- Emacs-D-Mode-2.0.6-orig/d-mode.el
+++ Emacs-D-Mode-2.0.6/d-mode.el
-@@ -66,6 +66,10 @@
+@@ -66,6 +66,7 @@
;; necessary to get them compiled.)
;; Coment out 'when-compile part for debugging
(eval-when-compile
-+ (and (= emacs-major-version 24)
-+ (= emacs-minor-version 4)
-+ (null emacs-repository-version)
-+ (require 'cl))
++ (require 'cl)
(require 'cc-langs)
(require 'cc-fonts)
)