Merge from emacs-24; up to 2014-06-29T18:32:35Z!michael.albinus@gmx.de

1 files changed, 6 insertions, 3 deletions

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 55e86e7fef3..11d2d435383 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -2111,9 +2111,10 @@ cell of the form ( 'DIRLIST . 'FILELIST )."
 ;;  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."
@@ -2144,6 +2145,8 @@ Groups may optionally contain a position."
   (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))))
        ))