[Emacs-diffs] trunk r116546: lisp/minibuffer.el: Fix bug#16808.

[Juanma Barranquero]

------------------------------------------------------------
revno: 116546
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16808
author: Nicolas Richard <address@hidden>
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2014-02-24 16:41:46 +0100
message:
  lisp/minibuffer.el: Fix bug#16808.
  
  (completion--try-word-completion): Fix error when completing M-x commands.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/minibuffer.el             
minibuffer.el-20091113204419-o5vbwnq5f7feedwu-8622

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-24 03:55:17 +0000
+++ b/lisp/ChangeLog    2014-02-24 15:41:46 +0000
@@ -1,3 +1,8 @@
+2014-02-24  Nicolas Richard  <address@hidden>
+
+       * minibuffer.el (completion--try-word-completion):
+       Fix error when completing M-x commands (bug#16808).
+
 2014-02-24  Leo Liu  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): Fix debug spec.

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2014-02-08 05:15:31 +0000
+++ b/lisp/minibuffer.el        2014-02-24 15:41:46 +0000
@@ -1371,7 +1371,7 @@
                                   (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