* lisp/imenu.el (imenu--split-submenus): Use imenu--subalist-p.

Fixes: debbugs:12717

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a86637f4edd7d6fe90fc4c30292f0141a812285..fb783aca16fe4bfbf055b7f219efcb2adbe8e3ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-15  Drew Adams  <drew.adams@oracle.com>
+
+       * imenu.el (imenu--split-submenus): Use imenu--subalist-p (bug#12717).
+
 2012-11-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/cl-macs.el (cl--transform-lambda): Defend against

diff --git a/lisp/imenu.el b/lisp/imenu.el
index 4686d1cf538f50c179b68f5916f69bae6c38bb78..1d3da2db15bc86404f74f6a5818935068b947121 100644 (file)
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -546,9 +546,7 @@ The returned alist DOES NOT share structure with MENULIST."
 Return a split and sorted copy of ALIST.  The returned alist DOES
 NOT share structure with ALIST."
   (mapcar (lambda (elt)
-            (if (and (consp elt)
-                     (stringp (car elt))
-                     (listp (cdr elt)))
+            (if (imenu--subalist-p elt)
                 (imenu--split-menu (cdr elt) (car elt))
               elt))
          alist))