[Emacs-diffs] emacs/lisp ChangeLog progmodes/which-func.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/04/28 21:29:51

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : which-func.el 

Log message:
        * progmodes/which-func.el (which-function): Don't assume that
        entries from `imenu--index-alist' are ordered by buffer position,
        which fails when submenus are present (Bug#3153).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15616&r2=1.15617
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/which-func.el?cvsroot=emacs&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15616
retrieving revision 1.15617
diff -u -b -r1.15616 -r1.15617
--- ChangeLog   28 Apr 2009 18:58:33 -0000      1.15616
+++ ChangeLog   28 Apr 2009 21:29:47 -0000      1.15617
@@ -1,3 +1,9 @@
+2009-04-28  Geert Kloosterman  <address@hidden>  (tiny change)
+
+       * progmodes/which-func.el (which-function): Don't assume that
+       entries from `imenu--index-alist' are ordered by buffer position,
+       which fails when submenus are present (Bug#3153).
+
 2009-04-28  Stefan Monnier  <address@hidden>
 
        * international/quail.el (quail-vunion): Remove unexplained nreverse.

Index: progmodes/which-func.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/which-func.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- progmodes/which-func.el     5 Jan 2009 03:23:54 -0000       1.26
+++ progmodes/which-func.el     28 Apr 2009 21:29:50 -0000      1.27
@@ -310,11 +310,8 @@
                                (setq minoffset offset
                                      name (funcall
                                            which-func-imenu-joiner-function
-                                           (reverse (cons (car pair) 
namestack)))))
-                         ;; Entries in order, so can skip all those after 
point.
-                         (setq alist nil
-                               imstack nil)))))
-
+                                          (reverse (cons (car pair)
+                                                         namestack)))))))))
             (setq alist     (car imstack)
                   namestack (cdr namestack)
                   imstack   (cdr imstack))))))