* 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 055a552073d23eb7bb600b69d05a2c7f685ef093..57625ef4dbe22dd7490308e847878e65a4c3be7a 100644 (file)
--- 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 f301a1875ed4b43931b94159563b1e039ec5a69b..ce8f45e9730636cbbd0ee6c4983ae04891a8de63 100644 (file)
--- 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))))))))