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.

1 files changed, 33 insertions, 0 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 7656248cac5..6f2669e9fee 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,36 @@
+2012-10-25  David Engster  <deng@randomsample.de>
+
+        * 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.
+
 2012-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * semantic/db-file.el (semanticdb-save-database-functions):