From: Drew Adams <drew.adams@oracle.com>
Date: Thu, 15 Nov 2012 02:02:00 +0000 (-0500)
Subject: * lisp/imenu.el (imenu--split-submenus): Use imenu--subalist-p.
X-Git-Tag: emacs-24.3.90~173^2~18^2~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=875ce3a7c5cb1b1b49cad6f1ecdff752c7923a70;p=emacs.git

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

Fixes: debbugs:12717
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a86637f4ed..fb783aca16f 100644
--- 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 4686d1cf538..1d3da2db15b 100644
--- 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))