diff options
| author | David Engster <dengste@eml.cc> | 2013-07-27 23:09:43 +0200 |
|---|---|---|
| committer | David Engster <dengste@eml.cc> | 2013-07-27 23:09:43 +0200 |
| commit | 25ac1ded77db0e0a839841872dbd514c4c14956b (patch) | |
| tree | ee6756b5233c98406ac9c69f2cce4150339e42a8 /lisp/cedet/semantic/edit.el | |
| parent | f5950f7afe5c62af0ba7dd834419a533c7215b3d (diff) | |
| download | emacs-25ac1ded77db0e0a839841872dbd514c4c14956b.tar.gz | |
Merge from CEDET upstream (8569).
* lisp/cedet/semantic/edit.el (semantic-edits-splice-remove): Wrap
debug message removing middle tag in semantic-edits-verbose-flag
check.
* semantic/bovine/el.el (semantic/db-el): New require.
* semantic/db-el.el (semanticdb-normalize-one-tag): It might be that a
symbol comes from a file but cannot be found in its table. This
happens for instance when a symbol was dynamically created through a
macro like `defstruct'. In this case, return the original tag.
(semanticdb-elisp-sym->tag): Deal with autoloaded functions, where
the argument list is not available until the file is loaded.
Diffstat (limited to 'lisp/cedet/semantic/edit.el')
| -rw-r--r-- | lisp/cedet/semantic/edit.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index a27eab5404c..91455cdb741 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -882,8 +882,9 @@ pre-positioned to a convenient location." ;; reparse (semantic-parse-changes-failed "Splice-remove failed. Empty buffer?") )) - (message "To Remove Middle Tag: (%s)" - (semantic-format-tag-name first))) + (when semantic-edits-verbose-flag + (message "To Remove Middle Tag: (%s)" + (semantic-format-tag-name first)))) ;; Find in the cache the preceding tag (while (and cachestart (not (eq first (car (cdr cachestart))))) (setq cachestart (cdr cachestart))) |