From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 15 Jan 2013 04:20:13 +0000 (-0500)
Subject: * lisp/progmodes/which-func.el (which-function): Silence imenu errors.
X-Git-Tag: emacs-24.3.90~173^2~7^2~295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e8cd0aecac332675ea1a700c7e3db3d48f62c15;p=emacs.git

* lisp/progmodes/which-func.el (which-function): Silence imenu errors.

Fixes: debbugs:13433
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df666d5485d..56770098b43 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
+2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/which-func.el (which-function): Silence imenu errors
+	(bug#13433).
+
 2013-01-15  Michael R. Mauger  <mmaug@yahoo.com>
 
-	* progmodes/sql.el: (sql-imenu-generic-expression): 
+	* progmodes/sql.el: (sql-imenu-generic-expression):
 	(sql-mode-font-lock-object-name): Match schema qualified names.
 	(sql-connect): Use string keys.
 	(sql-product-interactive): Wait for interpreter prompt.
@@ -9,9 +14,8 @@
 2013-01-15  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el (sql-output-to-send): Remove, unused.
-	(sql-interactive-remove-continuation-prompt): 
-	(sql-send-magic-terminator, sql-interactive-mode): Remove
-	references.
+	(sql-interactive-remove-continuation-prompt):
+	(sql-send-magic-terminator, sql-interactive-mode): Remove references.
 
 2013-01-14  Leo Liu  <sdl.web@gmail.com>
 
@@ -25,22 +29,21 @@
 
 2013-01-13  Fabián Ezequiel Gallina  <fgallina@cuca>
 
-	* progmodes/python.el (python-nav-end-of-statement): Fix
-	cornercase when handling multiline strings.
+	* progmodes/python.el (python-nav-end-of-statement):
+	Fix cornercase when handling multiline strings.
 
 2013-01-13  Richard Stallman  <rms@gnu.org>
 
 	* mail/sendmail.el (mail-position-on-field): Add doc string.
 
-	* mail/rmailmm.el (rmail-insert-mime-forwarded-message): Get
-	current message boundaries and pass them to
+	* mail/rmailmm.el (rmail-insert-mime-forwarded-message):
+	Get current message boundaries and pass them to
 	message-forward-make-body-mime.  Minor style changes.
 
 2013-01-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* cus-start.el (all): Avoid warnings about
-	scroll-bar-adjust-thumb-portion on platforms where it is not
-	defined.
+	scroll-bar-adjust-thumb-portion on platforms where it is not defined.
 
 2013-01-11  Jan Djärv  <jan.h.d@swipnet.se>
 
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index adf378f6bc7..edfe368479c 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -290,7 +290,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 t)
+      (ignore-errors (imenu--make-index-alist t))
       (unless imenu--index-alist
         (set (make-local-variable 'which-function-imenu-failed) t)))
     ;; If we have an index alist, use it.