minibuffer.el (minibuffer-completion-help): Use 0 as thefallback value for `base-size'

* minibuffer.el (minibuffer-completion-help): Use 0 as the
fallback value for `base-size'.  (Bug#16933)

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e361990693d..fe40615d6e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-04  Bastien Guerry  <bzg@gnu.org>
+
+        * minibuffer.el (minibuffer-completion-help): Use 0 as the
+        fallback value for `base-size'.  (Bug#16933)
+
 2014-03-04  Juanma Barranquero  <lekktu@gmail.com>
 
         * hexl.el (hexl-address-region, hexl-ascii-region)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 63e7e145d10..da3a8ad9df1 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1753,7 +1753,7 @@ variables.")
            (if completions "Sole completion" "No completions")))
 
       (let* ((last (last completions))
-             (base-size (cdr last))
+             (base-size (or (cdr last) 0))
              (prefix (unless (zerop base-size) (substring string 0 base-size)))
              (all-md (completion--metadata (buffer-substring-no-properties
                                             start (point))