From 7dbfa7197c53e527d2833a42ba21aeab43f1e171 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 5 Jul 2011 14:56:31 -0400 Subject: [PATCH] * lisp/progmodes/which-func.el (which-func-ff-hook): Don't output a message if imenu is simply not configured. Fixes: debbugs:8941 --- lisp/ChangeLog | 12 ++++++++---- lisp/progmodes/which-func.el | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 20679038120..1b550db3d6b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,13 +1,17 @@ +2011-07-05 Stefan Monnier + + * progmodes/which-func.el (which-func-ff-hook): Don't output a message + if imenu is simply not configured (bug#8941). + 2011-07-05 Ken Manheimer * allout.el (allout-post-undo-hook): New allout outline-change event hook to signal undo activity. (allout-post-command-business): Run allout-post-undo-hook if an undo just occurred. - (allout-after-copy-or-kill-hook), (allout-mode): Minor docstring - changes. - * allout-widgets.el (allout-widgets-after-undo-function): Ensure - the integrity of the current item's decoration after it has been + (allout-after-copy-or-kill-hook, allout-mode): Minor docstring changes. + * allout-widgets.el (allout-widgets-after-undo-function): + Ensure the integrity of the current item's decoration after it has been in the vicinity of an undo. (allout-widgets-mode): Include allout-widgets-after-undo-function on the new allout-post-undo-hook. diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el index 4e4d7b15053..97e188139e9 100644 --- a/lisp/progmodes/which-func.el +++ b/lisp/progmodes/which-func.el @@ -206,7 +206,8 @@ It creates the Imenu index for the buffer, if necessary." (setq imenu--index-alist (save-excursion (funcall imenu-create-index-function)))) (error - (message "which-func-ff-hook error: %S" err) + (unless (equal err '(error "This buffer cannot use `imenu-default-create-index-function'")) + (message "which-func-ff-hook error: %S" err)) (setq which-func-mode nil)))) (defun which-func-update () -- 2.39.2