Revert 2014-03-04T14:33:56Z!bzg@gnu.org.

Thanks to Leo for reporting this.

2 files changed, 1 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 939f150e56e..d799dbbd961 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,11 +16,6 @@
         * net/tramp-sh.el (tramp-sh-handle-vc-registered): Do not call
         `tramp-send-command-and-check'.
 
-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 526fdb62bc3..bbb7114610d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1751,7 +1751,7 @@ variables.")
            (if completions "Sole completion" "No completions")))
 
       (let* ((last (last completions))
-             (base-size (or (cdr last) 0))
+             (base-size (cdr last))
              (prefix (unless (zerop base-size) (substring string 0 base-size)))
              (all-md (completion--metadata (buffer-substring-no-properties
                                             start (point))