]> git.eshelyaron.com Git - emacs.git/commit
Merge CEDET upstream.
authorDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 20:13:16 +0000 (22:13 +0200)
committerDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 20:13:16 +0000 (22:13 +0200)
commit3f2a848dbeb297cdadfc9dd3cff71bab24679b92
tree3641e34f25caf6b5a6eca8537afdd24ee074c6a3
parentaaabfc8b2744aabe00b9fc97eaca59940b5afdeb
Merge CEDET upstream.

* 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.
18 files changed:
lisp/ChangeLog
lisp/cedet/ChangeLog
lisp/cedet/ede/locate.el
lisp/cedet/semantic.el
lisp/cedet/semantic/analyze.el
lisp/cedet/semantic/chart.el
lisp/cedet/semantic/db-el.el
lisp/cedet/semantic/db-file.el
lisp/cedet/semantic/grammar-wy.el
lisp/cedet/semantic/grammar.el
lisp/cedet/semantic/texi.el
lisp/cedet/srecode/compile.el
lisp/cedet/srecode/dictionary.el
lisp/cedet/srecode/insert.el
lisp/cedet/srecode/java.el
lisp/cedet/srecode/map.el
lisp/emacs-lisp/eieio-opt.el
lisp/emacs-lisp/eieio.el