summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <fgallina@gnu.org>2013-04-19 10:29:41 -0300
committerFabián Ezequiel Gallina <fgallina@gnu.org>2013-04-19 10:29:41 -0300
commit6bd1a072a81c36a8064737c6c3e1647df00b9698 (patch)
tree7470288994354315a8d4997a42935d2e49d2238b /lisp
parent87e1a81114d1efdf25865507453e748dbd554c35 (diff)
downloademacs-6bd1a072a81c36a8064737c6c3e1647df00b9698.tar.gz
emacs-6bd1a072a81c36a8064737c6c3e1647df00b9698.tar.bz2
emacs-6bd1a072a81c36a8064737c6c3e1647df00b9698.zip
Small fixes to 2013-04-19T02:31:09Z!fgallina@gnu.org
* lisp/ChangeLog: Fix Changelog Entry. * progmodes/python.el (python-imenu-create-flat-index): Remove leftover `message' call and give credit to old imenu--flatten-index-alist.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/python.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 06d07d6ee3c..2165c835057 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3176,6 +3176,7 @@ To this:
(\"decorator\" . 173)
(\"decorator.wrap\" . 353)
(\"decorator.wrapped_f\" . 393))"
+ ;; Inspired by imenu--flatten-index-alist removed in revno 21853.
(apply
'nconc
(mapcar
@@ -3187,14 +3188,14 @@ To this:
(cond ((or (numberp pos) (markerp pos))
(list (cons name pos)))
((listp pos)
- (message "%S" item)
(cons
(cons name (cdar pos))
(python-imenu-create-flat-index (cddr item) name))))))
(or alist
- (let ((python-imenu-format-item-label-function (lambda (type name) name))
- (python-imenu-format-parent-item-label-function (lambda (type name) name))
- (python-imenu-format-parent-item-jump-label-function (lambda (type name) name)))
+ (let* ((fn (lambda (type name) name))
+ (python-imenu-format-item-label-function fn)
+ (python-imenu-format-parent-item-label-function fn)
+ (python-imenu-format-parent-item-jump-label-function fn))
(python-imenu-create-index))))))