[Emacs-diffs] /srv/bzr/emacs/trunk r104972: * lisp/progmodes/which-func.el (which-func-ff-hook): Don't output a message

[Stefan Monnier]

------------------------------------------------------------
revno: 104972
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8941
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-05 14:56:31 -0400
message:
  * lisp/progmodes/which-func.el (which-func-ff-hook): Don't output a message
  if imenu is simply not configured.
modified:
  lisp/ChangeLog
  lisp/progmodes/which-func.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-05 18:54:08 +0000
+++ b/lisp/ChangeLog    2011-07-05 18:56:31 +0000
@@ -1,13 +1,17 @@
+2011-07-05  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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.

=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el      2011-05-12 07:07:06 +0000
+++ b/lisp/progmodes/which-func.el      2011-07-05 18:56:31 +0000
@@ -206,7 +206,8 @@
          (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 ()