From 0e38ae052eb194ac509b77ba9be4b0ab70c784f4 Mon Sep 17 00:00:00 2001 From: Nicolas Richard Date: Mon, 24 Feb 2014 16:41:46 +0100 Subject: [PATCH] lisp/minibuffer.el: Fix bug#16808. (completion--try-word-completion): Fix error when completing M-x commands. --- lisp/ChangeLog | 5 +++++ lisp/minibuffer.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * minibuffer.el (completion--try-word-completion): + Fix error when completing M-x commands (bug#16808). + 2014-02-24 Leo Liu * 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 -- 2.39.2