Skip to content

Commit

Permalink
Fixes for working with Emacs 23.2
Browse files Browse the repository at this point in the history
  • Loading branch information
berndl committed Nov 23, 2009
1 parent f90ca73 commit 59a0238
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
13 changes: 6 additions & 7 deletions Makefile
Expand Up @@ -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

Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions NEWS
Expand Up @@ -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

Expand Down
11 changes: 6 additions & 5 deletions ecb-cedet-wrapper.el
Expand Up @@ -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)
Expand Down

0 comments on commit 59a0238

Please sign in to comment.