Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

update for fresh Emacs & CEDET 1.1 & higher

but it should also work with older CEDET versions, although I hadn't checked it
  • Loading branch information...
commit 375f6c2f5be50629aac1177e41f608c52ffb3283 1 parent f015dd5
Alex Ott alexott authored
6 Makefile
View
@@ -131,7 +131,11 @@ ecb: $(ecb_LISP_EL)
@$(RM) $(ecb_LISP_ELC) ecb-compile-script
@echo "(add-to-list 'load-path nil)" > ecb-compile-script
@if test ! -z "${CEDET}"; then\
- echo "(load-file \"$(CEDET)/common/cedet.el\")" >> ecb-compile-script; \
+ if test -f $(CEDET)/cedet-devel-load.el ; then \
+ echo "(load-file \"$(CEDET)/cedet-devel-load.el\")" >> ecb-compile-script; \
+ else \
+ echo "(load-file \"$(CEDET)/common/cedet.el\")" >> ecb-compile-script; \
+ fi \
else \
echo "(semantic-mode 1)" >> ecb-compile-script; \
echo "(require 'semantic/bovine/el)" >> ecb-compile-script; \
2  ecb-cedet-wrapper.el
View
@@ -80,7 +80,7 @@ The meaning is as follows:
3. 0 = alpha, 1 = beta, 2 = pre, 3 = nothing \(e.g. \"1.4\"), 4 = . \(e.g. \"1.4.3\"
4. Subversion after the alpha, beta, pre or .")
-(defconst ecb-cedet-required-version-max '(1 0 4 9)
+(defconst ecb-cedet-required-version-max '(1 1 4 9)
"Maximum version of CEDET currently accepted by ECB.
See `ecb-required-cedet-version-min' for an explanation.")
15 ecb-semantic-wrapper.el
View
@@ -38,8 +38,13 @@
(require 'semantic)
-(require 'semantic-ctxt)
-(require 'semantic-analyze)
+(if (locate-library "semantic-ctxt")
+ (progn
+ (require 'semantic-ctxt)
+ (require 'semantic-analyze))
+ (progn
+ (require 'semantic/ctxt)
+ (require 'semantic/analyze)))
(defconst ecb-semantic-2-loaded (string-match "^2" semantic-version))
(defconst ecb-semantic-2-beta-nr (if (and ecb-semantic-2-loaded
@@ -60,8 +65,6 @@
(silentcomp-defvar semanticdb-search-system-databases)
(silentcomp-defvar semantic-format-use-images-flag)
(silentcomp-defvar ezimage-use-images)
-;; semantic 2.0 does not have this
-(silentcomp-defvar semantic-toplevel-bovine-cache)
;; -- getter functions for all variables of semantic currently used by ECB ---
@@ -285,7 +288,9 @@ unloaded buffer representation."
(if (fboundp 'semantic-fetch-available-tags)
(defalias 'ecb--semantic-fetch-available-tags 'semantic-fetch-available-tags)
(defsubst ecb--semantic-fetch-available-tags ()
- semantic-toplevel-bovine-cache))
+ (if (boundp 'semantic--buffer-cache)
+ semantic--buffer-cache
+ semantic-toplevel-bovine-cache)))
(if (fboundp 'semantic-tag-components)
(defalias 'ecb--semantic-tag-components
2  ecb.el
View
@@ -1216,7 +1216,7 @@ value of VAR is as before storing a NEW-VALUE for variable-symbol VAR."
(ecb-select-ecb-frame)
(ecb-update-directories-buffer))
- (let ((stack-trace-on-error stack-trace-on-error))
+ (let ((debug-on-error debug-on-error))
;; we activate only if all before-hooks return non nil
(when (run-hook-with-args-until-failure 'ecb-before-activate-hook)
Please sign in to comment.
Something went wrong with that request. Please try again.