From: David Engster <deng@randomsample.de>
Date: Sat, 31 Jan 2015 22:12:22 +0000 (+0100)
Subject: eieio: Move to obsolete and use the one that ships with Emacs
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82586cd0d9c2d0e392c70a3432944215be9332c4;p=emacs.git

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.
---

diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index 1ff2f971eaf..76c46f6b52f 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -206,16 +206,5 @@ of just logging the error."
     )
   )
 
-;;; HELPER FUNCTIONS FOR SOME TESTS
-(defun cedet-utest-eieio-classloader ()
-  "Try out the EIEIO tests, which just requires loading the test file."
-  (let ((lib (locate-library "eieio/eieio-tests.el" t)))
-    (unless lib
-      (error "Could not locate 'eieio/eieio-tests.el'"))
-    (message "EIEIO Base tests loading from: %S" lib)
-    (load-file lib)
-    ))
-
 (provide 'cedet-utests)
-
 ;;; cedet-utests.el ends here