[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108344: lisp/progmodes/which-func.el (which-func-ff-hook): Check against user-error.

[Juanma Barranquero]

------------------------------------------------------------
revno: 108344
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2012-05-22 18:50:02 +0200
message:
  lisp/progmodes/which-func.el (which-func-ff-hook): Check against user-error.
modified:
  lisp/ChangeLog
  lisp/progmodes/which-func.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-22 16:45:44 +0000
+++ b/lisp/ChangeLog    2012-05-22 16:50:02 +0000
@@ -1,5 +1,8 @@
 2012-05-22  Juanma Barranquero  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el      2012-04-27 03:10:38 +0000
+++ b/lisp/progmodes/which-func.el      2012-05-22 16:50:02 +0000
@@ -209,7 +209,8 @@
          (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))))