summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-08-10 19:51:01 +0000
committerUlrich Müller <ulm@gentoo.org>2009-08-10 19:51:01 +0000
commitc324382910ef514c9f54ac5a2147cd80f0bcb309 (patch)
treebf4dbefcdf765c294bd35fa380f3fdfcd1497d92 /app-emacs/cedet/files
parentFix deps (diff)
downloadhistorical-c324382910ef514c9f54ac5a2147cd80f0bcb309.tar.gz
historical-c324382910ef514c9f54ac5a2147cd80f0bcb309.tar.bz2
historical-c324382910ef514c9f54ac5a2147cd80f0bcb309.zip
Fix byte-compilation of EIEIO with Emacs 23.1.50, bug 280984.
Package-Manager: portage-2.2_rc36/cvs/Linux i686
Diffstat (limited to 'app-emacs/cedet/files')
-rw-r--r--app-emacs/cedet/files/50cedet-gentoo.el3
-rw-r--r--app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch18
2 files changed, 18 insertions, 3 deletions
diff --git a/app-emacs/cedet/files/50cedet-gentoo.el b/app-emacs/cedet/files/50cedet-gentoo.el
index 621e2f1a1f6f..6b7abf49da30 100644
--- a/app-emacs/cedet/files/50cedet-gentoo.el
+++ b/app-emacs/cedet/files/50cedet-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; cedet site-lisp configuration
-
(load "@SITELISP@/common/cedet" nil t)
(add-to-list 'image-load-path "@SITEETC@/common/icons" t)
(setq srecode-map-load-path
diff --git a/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch b/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch
new file mode 100644
index 000000000000..6dcd2b2235d5
--- /dev/null
+++ b/app-emacs/cedet/files/cedet-1.0_pre6-fix-eieio-comp.patch
@@ -0,0 +1,18 @@
+http://bugs.gentoo.org/280984
+Fix byte-compilation of EIEIO with Emacs 23.1.50 (as of 2009-07-23).
+Patch from upstream CVS.
+
+--- cedet/eieio/eieio-comp.el 2008/09/29 00:18:57 1.14
++++ cedet/eieio/eieio-comp.el 2009/07/27 11:32:06 1.15
+@@ -78,7 +78,10 @@
+ (class (if (listp arg1) (nth 1 arg1) nil))
+ (my-outbuffer (if (eval-when-compile
+ (string-match "XEmacs" emacs-version))
+- byte-compile-outbuffer outbuffer))
++ byte-compile-outbuffer
++ (condition-case nil
++ bytecomp-outbuffer
++ (error outbuffer))))
+ )
+ (let ((name (format "%s::%s" (or class "#<generic>") meth)))
+ (if byte-compile-verbose