[Emacs-diffs] /srv/bzr/emacs/trunk r112332: Small fixes to revno 112328

[Fabián Ezequiel Gallina]

------------------------------------------------------------
revno: 112332
committer: Fabián Ezequiel Gallina <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-19 10:29:41 -0300
message:
  Small fixes to revno 112328
  
  * 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.
modified:
  lisp/progmodes/python.el

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2013-04-19 02:31:09 +0000
+++ b/lisp/progmodes/python.el  2013-04-19 13:29:41 +0000
@@ -3176,6 +3176,7 @@
      (\"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 @@
         (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))))))