summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-05-24 23:08:04 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-05-24 23:08:04 -0400
commitdf76dacbd1f6830c96cf63053efe776d40c0e84d (patch)
tree18171ff68af38fa934fe44c256c26047e087220b /lisp
parentc902337068f52666425b7647e5aa43c621146e56 (diff)
downloademacs-df76dacbd1f6830c96cf63053efe776d40c0e84d.tar.gz
* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't burp at EOB.
Fixes: debbugs:14446
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/emacs-lisp/lisp.el2
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57625ef4dbe..efa6f06cbb1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
* emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
error-completion on the first 2 args of condition-case (bug#14446).
+ Don't burp at EOB.
2013-05-25 Leo Liu <sdl.web@gmail.com>
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index ce8f45e9730..b221d2f823d 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -726,7 +726,7 @@ considered."
(let ((tail (if (null (car table-etc))
(cdr table-etc)
(cons
- (if (memq (char-syntax (char-after end))
+ (if (memq (char-syntax (or (char-after end) ?\s))
'(?\s ?>))
(cadr table-etc)
(apply-partially 'completion-table-with-terminator