diff options
| author | David Engster <dengste@eml.cc> | 2012-10-25 22:13:16 +0200 |
|---|---|---|
| committer | David Engster <dengste@eml.cc> | 2012-10-25 22:13:16 +0200 |
| commit | 3f2a848dbeb297cdadfc9dd3cff71bab24679b92 (patch) | |
| tree | 3641e34f25caf6b5a6eca8537afdd24ee074c6a3 /lisp/cedet/semantic.el | |
| parent | aaabfc8b2744aabe00b9fc97eaca59940b5afdeb (diff) | |
| download | emacs-3f2a848dbeb297cdadfc9dd3cff71bab24679b92.tar.gz emacs-3f2a848dbeb297cdadfc9dd3cff71bab24679b92.tar.bz2 emacs-3f2a848dbeb297cdadfc9dd3cff71bab24679b92.zip | |
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.
Diffstat (limited to 'lisp/cedet/semantic.el')
| -rw-r--r-- | lisp/cedet/semantic.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 373864a43d5..01d3206f662 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -382,7 +382,7 @@ to use Semantic, and `semantic-init-hook' is run." "When non-nil, activate the interactive parsing debugger. Do not set this yourself. Call `semantic-debug'.") -(defun semantic-elapsed-time (start end) +(defsubst semantic-elapsed-time (start end) "Copied from elp.el. Was `elp-elapsed-time'. Arguments START and END bound the time being calculated." (float-time (time-subtract end start))) |