lisp/progmodes/which-func.el (which-func-ff-hook): Check against user-error.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dae3e640cc2eb5012a5ea38940adee9eda7662c0..91ab817391653f27ea0516d58bddc17c531cce39 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-22  Juanma Barranquero  <lekktu@gmail.com>
 
+       * progmodes/which-func.el (which-func-ff-hook):
+       Check against user-error, not error.
+
        * emacs-lisp/edebug.el (top): Do not load or setup up loading of
        cl-specs.el, which no longer exists.
 

diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index d57a3128a1621f81df1dc4f75a3ee77664b584df..07cb43b64a2500d180ad55d96c61648c9987b380 100644 (file)
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -209,7 +209,8 @@ It creates the Imenu index for the buffer, if necessary."
          (setq imenu--index-alist
                (save-excursion (funcall imenu-create-index-function))))
     (error
-     (unless (equal err '(error "This buffer cannot use `imenu-default-create-index-function'"))
+     (unless (equal err
+                    '(user-error "This buffer cannot use `imenu-default-create-index-function'"))
        (message "which-func-ff-hook error: %S" err))
      (setq which-func-mode nil))))