From: Juanma Barranquero Date: Tue, 22 May 2012 16:50:02 +0000 (+0200) Subject: lisp/progmodes/which-func.el (which-func-ff-hook): Check against user-error. X-Git-Tag: emacs-24.2.90~471^2~6^2~110^2~21 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e1701c68b9f62f5b30f1738144509bf21599f4c;p=emacs.git lisp/progmodes/which-func.el (which-func-ff-hook): Check against user-error. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dae3e640cc2..91ab8173916 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2012-05-22 Juanma Barranquero + * 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 d57a3128a16..07cb43b64a2 100644 --- 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))))