diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-05-24 23:00:13 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-05-24 23:00:13 -0400 |
| commit | c902337068f52666425b7647e5aa43c621146e56 (patch) | |
| tree | 42d4df2fd60a541df0ca42d1efa5c36d5cc0a048 /lisp | |
| parent | 24d699fab1d81224c1e0e4b4f9aa998b4428caf3 (diff) | |
| download | emacs-c902337068f52666425b7647e5aa43c621146e56.tar.gz | |
* 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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 6 |
2 files changed, 10 insertions, 1 deletions
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 <monnier@iro.umontreal.ca> + + * 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 <sdl.web@gmail.com> * 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)))))))) |