From 302b4d7f4e792e538fd1a3e9559af9b1e4897b1b Mon Sep 17 00:00:00 2001 From: David Engster Date: Sat, 31 Jan 2015 23:12:22 +0100 Subject: [PATCH] eieio: Move to obsolete and use the one that ships with Emacs * lisp/eieio: Move to obsolete. * etc/fallback-libraries: Add eieio fallback libraries. * Makefile (top-level): Remove eieio compilation and add compilation of fallback eieio for Emacs 24.1 and 24.2. Throw error for Emacs 23.x. * cedet-devel-load.el: Always require eieio at the top. Load cedet-compat earlier. Remove advices for eieio helpers. * cedet-remove-builtin.el: eieio must not be removed anymore. * semantic/ede-grammar.el (semantic-ede-proj-target-grammar): Remove cedet-compat from aux-packages initform, as it will be loaded by cedet-devel-load anyway. (ede-proj-makefile-insert-variables): Remove eieio from load-path. * lisp/cedet/cedet-compat.el: Load fallback eieio for Emacs 24.1 and 24.2. Add new aliases for Emacs 24.3. * Project.ede, Makefiles: Remove eieio and regenerate. * tests: Remove eieio tests. --- test/manual/cedet/Project.ede | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/manual/cedet/Project.ede b/test/manual/cedet/Project.ede index 40cba1cf9b8..61459b6c9f0 100644 --- a/test/manual/cedet/Project.ede +++ b/test/manual/cedet/Project.ede @@ -11,7 +11,7 @@ :source '("cedet-integ-test.el" "cit-cpp.el" "cit-el.el" "cit-texi.el" "cit-load.el" "cit-srec.el" "cit-gnustep.el" "cit-uml.el" "cit-dist.el" "cit-symref.el" "cit-externaldb.el" "cit-android.el" "cit-arduino.el" "cit-projvar.el" "cit-globalref.el") :versionsource '("cedet-integ-test.el") :compiler 'ede-emacs-preload-compiler - :aux-packages '("inversion" "eieio" "semantic" "semantic-bovine" "semantic-wisent" "srecode" "ede" "ede-gnustep" "cogre") + :aux-packages '("inversion" "semantic" "semantic-bovine" "semantic-wisent" "srecode" "ede" "ede-gnustep" "cogre") :pre-load-packages '("cedet-compat")) (ede-proj-target-makefile-miscelaneous "templates" :name "templates" -- 2.39.2