summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/minibuffer.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7927fd092a..da0d2ea4499 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-24 Nicolas Richard <theonewiththeevillook@yahoo.fr>
+
+ * minibuffer.el (completion--try-word-completion):
+ Fix error when completing M-x commands (bug#16808).
+
2014-02-24 Leo Liu <sdl.web@gmail.com>
* emacs-lisp/easy-mmode.el (define-minor-mode): Fix debug spec.
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index edc4c950104..737172e359f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1371,7 +1371,7 @@ appear to be a match."
(concat before ext after)
table predicate (1+ point) md))
exts))))
- (when (and (= 1 (length comps) (consp (car comps))))
+ (when (and (null (cdr comps)) (consp (car comps)))
(setq comp (car comps)))))
;; Completing a single word is actually more difficult than completing