Merge from mainline.

8 files changed, 71 insertions, 22 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 705277c97a0..c39a8a700ef 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,38 @@
+2013-07-29  David Engster <deng@randomsample.de>
+
+        * lisp/cedet/cedet.el (cedet-packages): Remove speedbar since its
+        development does no longer happens in CEDET upstream but in Emacs
+        proper.  Also remove cedet-contrib and cogre since those are only
+        in upstream.
+
+        * semantic/analyze/fcn.el (semantic-analyze-type-to-name): If TYPE
+        has a parent, return a fully qualified name.
+
+        * semantic/decorate/mode.el
+        (semantic-decoration-on-includes-p-default)
+        (semantic-decoration-on-includes-highlight-default): Declare for
+        byte compiler.
+
+        * semantic/wisent/python.el (semantic/format): New require.
+
+2013-07-27  Eric Ludlam <zappo@gnu.org>
+
+        * lisp/cedet/semantic/edit.el (semantic-edits-splice-remove): Wrap
+        debug message removing middle tag in semantic-edits-verbose-flag
+        check.
+
+2013-07-27  David Engster <deng@randomsample.de>
+
+        * 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.
+
 2013-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * data-debug.el, cedet-idutils.el: Neuter the "Version:" header.
diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el
index e8720bc6624..f34442996c1 100644
--- a/lisp/cedet/cedet.el
+++ b/lisp/cedet/cedet.el
@@ -46,9 +46,6 @@
     (semantic      "2.2"           nil       "semantic/doc")
     (srecode       "1.2"           nil       "srecode"     )
     (ede           "1.2"           nil       "ede"         )
-    (speedbar      "1.0.4"         nil       "speedbar"    )
-    (cogre         "1.2"           nil       "cogre"       )
-    (cedet-contrib "1.2"           "contrib" nil           )
     )
   "Table of CEDET packages to install.")
 
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index 4300c89c9df..7512b7ca15a 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -165,7 +165,10 @@ SCOPE is the scope object with additional items in which to search for names."
 The TYPE field in a tag can be nil (return nil)
 or a string, or a non-positional tag."
   (cond ((semantic-tag-p type)
-         (semantic-tag-name type))
+         (if (semantic-tag-named-parent type)
+             (semantic-analyze-unsplit-name `(,(semantic-tag-named-parent type)
+                                              ,(semantic-tag-name type)))
+           (semantic-tag-name type)))
         ((stringp type)
          type)
         ((listp type)
diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el
index 0bbe3c61d76..c6f1ceb0f94 100644
--- a/lisp/cedet/semantic/bovine/el.el
+++ b/lisp/cedet/semantic/bovine/el.el
@@ -25,6 +25,7 @@
 
 (require 'semantic)
 (require 'semantic/bovine)
+(require 'semantic/db-el)
 (require 'find-func)
 
 (require 'semantic/ctxt)
diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 1b0f3292ad3..3376389c7d5 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -173,13 +173,17 @@ If Emacs cannot resolve this symbol to a particular file, then return nil."
              (newtags (when tab (semanticdb-find-tags-by-name-method
                                  tab (semantic-tag-name tag))))
              (match nil))
-        ;; Find the best match.
-        (dolist (T newtags)
-          (when (semantic-tag-similar-p T tag)
-            (setq match T)))
-        ;; Backup system.
-        (when (not match)
-            (setq match (car newtags)))
+        ;; We might not have a parsed tag in this file, because it
+        ;; might be generated through a macro like defstruct.
+        (if (null newtags)
+            (setq match tag)
+          ;; Find the best match.
+          (dolist (T newtags)
+            (when (semantic-tag-similar-p T tag)
+              (setq match T)))
+          ;; Backup system.
+          (when (not match)
+            (setq match (car newtags))))
         ;; Return it.
         (when tab (cons tab match))))))
 
@@ -196,15 +200,18 @@ TOKTYPE is a hint to the type of tag desired."
   (when sym
     (cond ((and (eq toktype 'function) (fboundp sym))
            (require 'semantic/bovine/el)
-           (semantic-tag-new-function
-            (symbol-name sym)
-            nil ;; return type
-            (semantic-elisp-desymbolify
-             (help-function-arglist sym)) ;; arg-list
-            :user-visible-flag (condition-case nil
-                                   (interactive-form sym)
-                                 (error nil))
-            ))
+           (let ((arglist (help-function-arglist sym)))
+             (when (not (listp arglist))
+               ;; Function might be autoloaded, in which case
+               ;; the arglist is not available yet.
+               (setq arglist nil))
+             (semantic-tag-new-function
+              (symbol-name sym)
+              nil       ;; return type
+              (semantic-elisp-desymbolify arglist)
+              :user-visible-flag (condition-case nil
+                                     (interactive-form sym)
+                                   (error nil)))))
           ((and (eq toktype 'variable) (boundp sym))
            (semantic-tag-new-variable
             (symbol-name sym)
diff --git a/lisp/cedet/semantic/decorate/mode.el b/lisp/cedet/semantic/decorate/mode.el
index ba06c73936b..cc5e9d9bec2 100644
--- a/lisp/cedet/semantic/decorate/mode.el
+++ b/lisp/cedet/semantic/decorate/mode.el
@@ -541,6 +541,10 @@ Use a primary decoration."
 
 ;;; Decoration Modes in other files
 ;;
+(declare-function semantic-decoration-on-includes-p-default
+                  "semantic/decorate/include")
+(declare-function semantic-decoration-on-includes-highlight-default
+                  "semantic/decorate/include")
 (define-semantic-decoration-style semantic-decoration-on-includes
   "Highlight class members that are includes.
 This mode provides a nice context menu on the include statements."
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)))
diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 719868f7635..2c0ed5868ce 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -39,6 +39,7 @@
 (require 'semantic/find)
 (require 'semantic/dep)
 (require 'semantic/ctxt)
+(require 'semantic/format)
 
 (eval-when-compile
   (require 'cl))