HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update CEDET from upstream.
[bpt/emacs.git]
/
lisp
/
emacs-lisp
/
eieio-speedbar.el
diff --git
a/lisp/emacs-lisp/eieio-speedbar.el
b/lisp/emacs-lisp/eieio-speedbar.el
index
e16c3a1
..
327e5ce
100644
(file)
--- a/
lisp/emacs-lisp/eieio-speedbar.el
+++ b/
lisp/emacs-lisp/eieio-speedbar.el
@@
-1,10
+1,8
@@
;;; eieio-speedbar.el -- Classes for managing speedbar displays.
;;; eieio-speedbar.el -- Classes for managing speedbar displays.
-;; Copyright (C) 1999, 2000, 2001, 2002, 2005, 2007, 2008, 2009, 2010
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1999-2002, 2005, 2007-2012 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Author: Eric M. Ludlam <zappo@gnu.org>
-;; Version: 0.2
;; Keywords: OO, tools
;; Package: eieio
;; Keywords: OO, tools
;; Package: eieio
@@
-192,23
+190,24
@@
that path."
\f
;;; DEFAULT SUPERCLASS baseline methods
;;
\f
;;; DEFAULT SUPERCLASS baseline methods
;;
-;; First, define methods onto the superclass so all classes
-;; will have some minor support.
+;; First, define methods with no class defined. These will work as if
+;; on the default superclass. Specifying no class will allow these to be used
+;; when no other methods are found, allowing multiple inheritance to work
+;; reliably with eieio-speedbar.
-(defmethod eieio-speedbar-description (
(object eieio-default-superclass)
)
+(defmethod eieio-speedbar-description (
object
)
"Return a string describing OBJECT."
(object-name-string object))
"Return a string describing OBJECT."
(object-name-string object))
-(defmethod eieio-speedbar-derive-line-path (
(object eieio-default-superclass)
)
+(defmethod eieio-speedbar-derive-line-path (
object
)
"Return the path which OBJECT has something to do with."
nil)
"Return the path which OBJECT has something to do with."
nil)
-(defmethod eieio-speedbar-object-buttonname (
(object eieio-default-superclass)
)
+(defmethod eieio-speedbar-object-buttonname (
object
)
"Return a string to use as a speedbar button for OBJECT."
(object-name-string object))
"Return a string to use as a speedbar button for OBJECT."
(object-name-string object))
-(defmethod eieio-speedbar-make-tag-line ((object eieio-default-superclass)
- depth)
+(defmethod eieio-speedbar-make-tag-line (object depth)
"Insert a tag line into speedbar at point for OBJECT.
By default, all objects appear as simple TAGS with no need to inherit from
the special `eieio-speedbar' classes. Child classes should redefine this
"Insert a tag line into speedbar at point for OBJECT.
By default, all objects appear as simple TAGS with no need to inherit from
the special `eieio-speedbar' classes. Child classes should redefine this
@@
-221,7
+220,7
@@
Argument DEPTH is the depth at which the tag line is inserted."
'speedbar-tag-face
depth))
'speedbar-tag-face
depth))
-(defmethod eieio-speedbar-handle-click (
(object eieio-default-superclass)
)
+(defmethod eieio-speedbar-handle-click (
object
)
"Handle a click action on OBJECT in speedbar.
Any object can be represented as a tag in SPEEDBAR without special
attributes. These default objects will be pulled up in a custom
"Handle a click action on OBJECT in speedbar.
Any object can be represented as a tag in SPEEDBAR without special
attributes. These default objects will be pulled up in a custom
@@
-283,7
+282,7
@@
Add one of the child classes to this class to the parent list of a class."
:abstract t)
\f
:abstract t)
\f
-;;; Methods to eieio-speedbar-* which do not need to be overriden
+;;; Methods to eieio-speedbar-* which do not need to be overrid
d
en
;;
(defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar)
depth)
;;
(defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar)
depth)
@@
-410,7
+409,7
@@
Optional DEPTH is the depth we start at."
default-directory))))
\f
default-directory))))
\f
-;;; Methods to the eieio-speedbar-* classes which need to be overriden.
+;;; Methods to the eieio-speedbar-* classes which need to be overrid
d
en.
;;
(defmethod eieio-speedbar-object-children ((object eieio-speedbar))
"Return a list of children to be displayed in speedbar.
;;
(defmethod eieio-speedbar-object-children ((object eieio-speedbar))
"Return a list of children to be displayed in speedbar.
@@
-422,5
+421,4
@@
to create a speedbar button."
(provide 'eieio-speedbar)
(provide 'eieio-speedbar)
-;; arch-tag: eaac1283-10b0-4419-a929-982b87e83234
;;; eieio-speedbar.el ends here
;;; eieio-speedbar.el ends here