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.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 06d07d6ee3c84c4e2b559f24683bbbbe3fc82f6c..2165c8350576505126f3b3e46ea882bd0cbedf95 100644 (file)
--- 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))))))
 
 \f