[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112728: * lisp/emacs-lisp/lisp.el (l
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112728: * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use |
Date: |
Fri, 24 May 2013 23:00:13 -0400 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112728
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14446
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-24 23:00:13 -0400
message:
* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
error-completion on the first 2 args of condition-case.
modified:
lisp/ChangeLog
lisp/emacs-lisp/lisp.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-25 02:40:33 +0000
+++ b/lisp/ChangeLog 2013-05-25 03:00:13 +0000
@@ -1,3 +1,8 @@
+2013-05-25 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
* comint.el (comint-previous-matching-input): Do not flood the
=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el 2013-04-17 20:52:02 +0000
+++ b/lisp/emacs-lisp/lisp.el 2013-05-25 03:00:13 +0000
@@ -714,7 +714,11 @@
(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))))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112728: * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use,
Stefan Monnier <=