Permalink
Browse files

Fixes for working with Emacs 23.2

  • Loading branch information...
1 parent f90ca73 commit 59a02385292602510a4118d54081025e4a30f977 berndl committed Nov 23, 2009
Showing with 18 additions and 12 deletions.
  1. +6 −7 Makefile
  2. +6 −0 NEWS
  3. +6 −5 ecb-cedet-wrapper.el
View
@@ -45,8 +45,11 @@ EMACS=emacs
# -------- Compiling ECB with the cedet-library 1.0 ----------------------
-# cedet >= 1.0 (contains a.o. semantic >= 2.0, eieio >= 0.18 and speedbar
-# >= 0.15). Set here the full path to the cedet-installation directory.
+# cedet >= 1.0preX (contains a.o. semantic >= 2.0, eieio >= 0.18 and
+# speedbar >= 0.15). Set here the full path to the cedet-installation
+# directory. Set this to empty if you want to use that cedet which is
+# integrated into Emacs >= 23.2. For Emacs-versions < 23.2 you MUST set
+# this path!
CEDET=c:/Programme/emacs-23.1/site-lisp/package-development/cedet
@@ -58,11 +61,7 @@ LOADPATH=
# - Call "make" to byte-compile the ECB. You can savely ignore the messages.
# - Or call
#
-# make EMACS="path/to/emacs"
-#
-# or
-#
-# make CEDET="path/to/cedet"
+# make [EMACS="path/to/emacs"] [CEDET="path/to/cedet"]
#
# if you want to set either different load-paths or Emacs-binary and
# you do not want edit the Makefile. Do not forget quoting the arguments
View
6 NEWS
@@ -60,6 +60,12 @@
** `defecb-window-dedicator-to-ecb-buffer' replaces `defecb-window-dedicator'
This is only relevant for people who program own special ecb-windows.
+
+** Better compatibility with forthcoming Gnu Emacs 23.2
+
+*** Works with emacs-integrated cedet-suite
+ TODO: Makefile ��berarbeiten!
+ Installationsanweisung ��berarbeiten
** Fixed Bugs
View
@@ -52,20 +52,21 @@
(semanticdb-mode . semantic/db-mode)
(eieio . eieio)
(speedbar . speedbar))
- "Maps the cvs-library of cedet to the equivalent lib of Emacs >= 32.2
+ "Maps the cvs-library of cedet to the equivalent lib of Emacs >= 23.2
The elemant is an assoc list where the car is the lib-symbol of a
cedet-library and the cdr is the corresponding lib-symbol of the cedet-suite
integrated into Emacs >= 23.2
ALL CEDET-LIBRARIES NEEDED BY ECB MUST BE REGISTERED HERE!")
(defun ecb-cedet-require (cvs-lib)
- "Loads a cedet-library into Emacs.
+ "Loads a cedet-library CVS-LIB into Emacs.
+CVS-LIB is the symbol-name of the cedet-library in the cvs-version of cedet.
All cedet libaryies needed by ECB must be loaded with this function! Do not
use `require' for looading a cedet-library into Emacs!"
- (if (featurep 'cedet)
- (require cvs-lib)
- (require (cdr (assoc cvs-lib ecb-cedet-lib-registry)))))
+ (require (if (featurep 'cedet)
+ cvs-lib
+ (cdr (assoc cvs-lib ecb-cedet-lib-registry)))))
(ecb-cedet-require 'semantic)

0 comments on commit 59a0238

Please sign in to comment.