[Emacs-diffs] /srv/bzr/emacs/trunk r111527: * lisp/progmodes/which-func.el (which-function): Silence imenu errors.

[Stefan Monnier]

------------------------------------------------------------
revno: 111527
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13433
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-01-14 23:20:13 -0500
message:
  * lisp/progmodes/which-func.el (which-function): Silence imenu errors.
modified:
  lisp/ChangeLog
  lisp/progmodes/which-func.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-15 03:21:56 +0000
+++ b/lisp/ChangeLog    2013-01-15 04:20:13 +0000
@@ -1,6 +1,11 @@
+2013-01-15  Stefan Monnier  <address@hidden>
+
+       * progmodes/which-func.el (which-function): Silence imenu errors
+       (bug#13433).
+
 2013-01-15  Michael R. Mauger  <address@hidden>
 
-       * 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  <address@hidden>
 
        * 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  <address@hidden>
 
@@ -25,22 +29,21 @@
 
 2013-01-13  Fabián Ezequiel Gallina  <address@hidden>
 
-       * 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  <address@hidden>
 
        * 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  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el      2013-01-10 15:36:01 +0000
+++ b/lisp/progmodes/which-func.el      2013-01-15 04:20:13 +0000
@@ -290,7 +290,7 @@
     (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.