From 6e8cd0aecac332675ea1a700c7e3db3d48f62c15 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 14 Jan 2013 23:20:13 -0500 Subject: [PATCH] * lisp/progmodes/which-func.el (which-function): Silence imenu errors. Fixes: debbugs:13433 --- lisp/ChangeLog | 23 +++++++++++++---------- lisp/progmodes/which-func.el | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) 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 + + * progmodes/which-func.el (which-function): Silence imenu errors + (bug#13433). + 2013-01-15 Michael R. Mauger - * 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 * 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 @@ -25,22 +29,21 @@ 2013-01-13 Fabián Ezequiel Gallina - * 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 * 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 * 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 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. -- 2.39.5