mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge with CEDET upstream (rev. 8579).

Browse source 
* 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.
This commit is contained in:
David Engster 2013-07-29 22:26:19 +02:00
parent 25ac1ded77
commit 18657165bb
7 changed files with 72 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/cedet/semantic/analyze/fcn.el
View file

@ -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)