[Emacs-diffs] emacs-24 r117442: * speedbar.el (speedbar-generic-list-tag-p): Allow special

[Leo Liu]

------------------------------------------------------------
revno: 117442
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-08-13 11:21:43 +0800
message:
  * speedbar.el (speedbar-generic-list-tag-p): Allow special
  elements from imenu.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/speedbar.el               
speedbar.el-20091113204419-o5vbwnq5f7feedwu-1271

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-11 01:13:38 +0000
+++ b/lisp/ChangeLog    2014-08-13 03:21:43 +0000
@@ -1,3 +1,8 @@
+2014-08-13  Leo Liu  <address@hidden>
+
+       * speedbar.el (speedbar-generic-list-tag-p): Allow special
+       elements from imenu.
+
 2014-08-11  Glenn Morris  <address@hidden>
 
        * subr.el (with-output-to-temp-buffer): Doc fix; from elisp manual.

=== modified file 'lisp/speedbar.el'
--- a/lisp/speedbar.el  2014-04-21 21:43:17 +0000
+++ b/lisp/speedbar.el  2014-08-13 03:21:43 +0000
@@ -2123,9 +2123,10 @@
 ;;  in order to make it look nice.
 ;;
 ;;  A generic list is of the form:
-;;  ( ("name" . marker-or-number)              <-- one tag at this level
-;;    ("name" ("name" . mon) ("name" . mon) )  <-- one group of tags
-;;    ("name" mon ("name" . mon) )             <-- group w/ a position and tags
+;;  ( ("name" . marker-or-number)                <-- one tag at this level
+;;    ("name" marker-or-number goto-fun . args)  <-- one tag at this level
+;;    ("name" ("name" . mon) ("name" . mon) )    <-- one group of tags
+;;    ("name" mon ("name" . mon) )               <-- group w/ a position and 
tags
 (defun speedbar-generic-list-group-p (sublst)
   "Non-nil if SUBLST is a group.
 Groups may optionally contain a position."
@@ -2156,6 +2157,8 @@
   (and (stringp (car-safe sublst))
        (or (and (number-or-marker-p (cdr-safe sublst))
                (not (cdr-safe (cdr-safe sublst))))
+           (ignore-errors (and (number-or-marker-p (nth 1 sublst))
+                               (functionp (nth 2 sublst))))
           ;; For semantic/bovine items, this is needed
           (symbolp (car-safe (cdr-safe sublst))))
        ))