From: Stefan Monnier Date: Sat, 25 May 2013 03:00:13 +0000 (-0400) Subject: * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~185 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c902337068f52666425b7647e5aa43c621146e56;p=emacs.git * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use error-completion on the first 2 args of condition-case. Fixes: debbugs:14446 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 055a552073d..57625ef4dbe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-05-25 Stefan Monnier + + * emacs-lisp/lisp.el (lisp-completion-at-point): Don't use + error-completion on the first 2 args of condition-case (bug#14446). + 2013-05-25 Leo Liu * comint.el (comint-previous-matching-input): Do not flood the diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index f301a1875ed..ce8f45e9730 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -714,7 +714,11 @@ considered." (append macro-declarations-alist defun-declarations-alist))))) - ((or `condition-case `condition-case-unless-debug) + ((and (or `condition-case `condition-case-unless-debug) + (guard (save-excursion + (ignore-errors + (forward-sexp 2) + (< (point) beg))))) (list t obarray :predicate (lambda (sym) (get sym 'error-conditions)))) (_ (list nil obarray #'fboundp))))))))