mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 06:20:43 -08:00
Code Issues Projects Releases Wiki Activity

Merge CEDET upstream.

Browse source 
* emacs-lisp/eieio.el (eieio-update-lisp-imenu-expression):
Removed.  This feature is already integrated in imenu.

* emacs-lisp/eieio-opt.el: Remove require for `button' since it is
always loaded.  Require `speedbar' unconditionally.

* semantic/analyze.el (semantic-analyze-dereference-alias): New
function to dereference aliases.
(semantic-analyze-current-context-default): Use it.

* semantic/grammar.el (semantic-grammar-create-package):
* srecode/compile.el (srecode-compile-templates): Throw a proper
error if semantic-mode is not enabled (bug#9968).

Compiler warning fixes:

* semantic.el (semantic-elapsed-time): Make it a defsubst.

* srecode/dictionary.el (srecode-adebug-dictionary): Remove
require for `semantic'.

* srecode/map.el:
* srecode/insert.el: Declare functions from `data-debug'.

* semantic/grammar.el: Require `help-fns'.  Declare functions from
`eldoc', which is required in function body.

* srecode/java.el:
* semantic/texi.el:
* semantic/grammar-wy.el:
* semantic/db-file.el:
* semantic/db-el.el:
* semantic/chart.el: Fix requires.

* ede/locate.el: Remove useless requires. Declare functions
instead and require in functions when needed.
This commit is contained in:
David Engster 2012-10-25 22:13:16 +02:00
parent aaabfc8b27
commit 3f2a848dbe
18 changed files with 124 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/emacs-lisp/eieio-opt.el
View file

@ -29,9 +29,9 @@
;;
(require 'eieio)
(require 'button)
(require 'help-mode)
(require 'find-func)
(require 'speedbar)
(require 'help-mode)
;;; Code:
;;;###autoload
@ -710,10 +710,6 @@ Arguments UNUSED are not used."
;;; SPEEDBAR SUPPORT
;;
(eval-when-compile
(condition-case nil
(require 'speedbar)
(error (message "Error loading speedbar... ignored"))))
(defvar eieio-class-speedbar-key-map nil
"Keymap used when working with a project in speedbar.")

23
lisp/emacs-lisp/eieio.el
View file

@ -3049,29 +3049,6 @@ Optional argument NOESCAPE is passed to `prin1-to-string' when appropriate."
)
)
;;; Interfacing with imenu in emacs lisp mode
;; (Only if the expression is defined)
;;
(if (eval-when-compile (boundp 'lisp-imenu-generic-expression))
(progn
(defun eieio-update-lisp-imenu-expression ()
"Examine `lisp-imenu-generic-expression' and modify it to find `defmethod'."
(let ((exp lisp-imenu-generic-expression))
(while exp
;; it's of the form '( ( title expr indx ) ... )
(let* ((subcar (cdr (car exp)))
(substr (car subcar)))
(if (and (not (string-match "|method\\\\" substr))
(string-match "|advice\\\\" substr))
(setcar subcar
(replace-match "|advice\\|method\\" t t substr 0))))
(setq exp (cdr exp)))))
(eieio-update-lisp-imenu-expression)
))
;;; Autoloading some external symbols, and hooking into the help system
;;