aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Adams2012-11-14 21:02:00 -0500
committerStefan Monnier2012-11-14 21:02:00 -0500
commit875ce3a7c5cb1b1b49cad6f1ecdff752c7923a70 (patch)
tree7134819f369759f34d5dee37529bb015ab823030
parent589fc4791fb569279b23e5a09243115a7b52cf74 (diff)
downloademacs-875ce3a7c5cb1b1b49cad6f1ecdff752c7923a70.tar.gz
emacs-875ce3a7c5cb1b1b49cad6f1ecdff752c7923a70.zip
* lisp/imenu.el (imenu--split-submenus): Use imenu--subalist-p.
Fixes: debbugs:12717
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/imenu.el4
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a86637f4ed..fb783aca16f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-11-15 Drew Adams <drew.adams@oracle.com>
2
3 * imenu.el (imenu--split-submenus): Use imenu--subalist-p (bug#12717).
4
12012-11-15 Stefan Monnier <monnier@iro.umontreal.ca> 52012-11-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * emacs-lisp/cl-macs.el (cl--transform-lambda): Defend against 7 * 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."
546Return a split and sorted copy of ALIST. The returned alist DOES 546Return a split and sorted copy of ALIST. The returned alist DOES
547NOT share structure with ALIST." 547NOT share structure with ALIST."
548 (mapcar (lambda (elt) 548 (mapcar (lambda (elt)
549 (if (and (consp elt) 549 (if (imenu--subalist-p elt)
550 (stringp (car elt))
551 (listp (cdr elt)))
552 (imenu--split-menu (cdr elt) (car elt)) 550 (imenu--split-menu (cdr elt) (car elt))
553 elt)) 551 elt))
554 alist)) 552 alist))