From: Bastien Guerry Date: Wed, 5 Mar 2014 07:04:01 +0000 (+0100) Subject: Revert 2014-03-04T14:33:56Z!bzg@gnu.org. X-Git-Tag: emacs-24.3.90~284 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65cdacb51ba7324c19adb7c18581fc5cb1402c94;p=emacs.git Revert 2014-03-04T14:33:56Z!bzg@gnu.org. Thanks to Leo for reporting this. --- 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 - - * minibuffer.el (minibuffer-completion-help): Use 0 as the - fallback value for `base-size'. (Bug#16933) - 2014-03-04 Juanma Barranquero * 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))