* lisp/progmodes/which-func.el (which-func-ff-hook): Don't output a message

if imenu is simply not configured.

Fixes: debbugs:8941

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20679038120d8521d5dc00bef51a8fdff2afc60f..1b550db3d6b11a24ae037a70d0a160281ff9464d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,17 @@
+2011-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * 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  <ken.manheimer@gmail.com>
 
        * 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 4e4d7b1505377c991efcc1a482dcdda2cd3bf833..97e188139e97d4fa87760f42da1da3a69185845c 100644 (file)
--- 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 ()