(which-function): Be robust in the face of an

imenu--make-index-alist failure.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47d3fb33da346b2e75a2c944f513cfa36e0d5e0c..648d58d9ff7067d2aed64cede074593dfc52a4bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-29  Stephan Stahl  <stahl@eos.franken.de>  (tiny change)
+
+       * progmodes/which-func.el (which-function): Be robust in the face of an
+       imenu--make-index-alist failure.
+
 2005-03-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * reveal.el (reveal-mode-map): Don't override C-a and C-e.

diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index dae5722d430e14e411910522d713692052067f8f..d329e234025d2c8c7307ac571104cb6114e75942 100644 (file)
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -1,6 +1,7 @@
 ;;; which-func.el --- print current function in mode line
 
-;; Copyright (C) 1994, 1997, 1998, 2001, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1997, 1998, 2001, 2003, 2005
+;;           Free Software Foundation, Inc.
 
 ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>
 ;;           (doesn't seem to be responsive any more)
@@ -251,7 +252,7 @@ If no function name is found, return nil."
     (when (and (null name)
               (boundp 'imenu--index-alist) (null imenu--index-alist)
               (null which-function-imenu-failed))
-      (imenu--make-index-alist)
+      (imenu--make-index-alist t)
       (unless imenu--index-alist
        (make-local-variable 'which-function-imenu-failed)
        (setq which-function-imenu-failed t)))
@@ -291,5 +292,5 @@ If no function name is found, return nil."
 
 (provide 'which-func)
 
-;;; arch-tag: fa8a55c7-bfe3-4ffc-95ab-01bf21796827
+;; arch-tag: fa8a55c7-bfe3-4ffc-95ab-01bf21796827
 ;;; which-func.el ends here