From 18657165bb88252b8285c4655e907dd4fc29a0f7 Mon Sep 17 00:00:00 2001
From: David Engster <dengste@eml.cc>
Date: Mon, 29 Jul 2013 22:26:19 +0200
Subject: Merge with CEDET upstream (rev. 8579).

* 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.

* eieio.texi (top): Make clear that EIEIO is not a full CLOS
implementation.
(Introduction): Add further missing features.
(Building Classes): Add introductory paragraph.
(Wish List): Add metaclasses and EQL specialization.
---
 lisp/cedet/ChangeLog                 | 17 +++++++++++++++++
 lisp/cedet/cedet.el                  |  3 ---
 lisp/cedet/semantic/analyze/fcn.el   |  5 ++++-
 lisp/cedet/semantic/decorate/mode.el |  4 ++++
 lisp/cedet/semantic/wisent/python.el |  1 +
 5 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'lisp')

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 1b8e4725dc1..c39a8a700ef 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,20 @@
+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
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/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/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))
-- 
cgit v1.2.3