From: Stephen Leake <stephen_leake@stephe-leake.org>
Date: Thu, 1 Oct 2015 14:14:23 +0000 (-0500)
Subject: Set default base-size in minibuffer-completion-help
X-Git-Tag: emacs-25.0.90~1223^2~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=632847e07c9dbe4ef2d1defd332254f1298ea912;p=emacs.git

Set default base-size in minibuffer-completion-help

* lisp/minibuffer.el (minibuffer-completion-help): Set default base-size,
in case completion table does not set it.
---

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 689911c405a..2814d020b8d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1374,7 +1374,7 @@ appear to be a match."
                      ;; that file.
                      (= (length string) (length compl)))
             (completion--replace beg end compl))))
-    (funcall exit-function))
+      (funcall exit-function))
 
      ((memq minibuffer-completion-confirm '(confirm confirm-after-completion))
       ;; The user is permitted to exit with an input that's rejected
@@ -1391,7 +1391,7 @@ appear to be a match."
 
      (t
       ;; Call do-completion, but ignore errors.
-    (funcall completion-function))))
+      (funcall completion-function))))
 
 (defun completion--try-word-completion (string table predicate point md)
   (let ((comp (completion-try-completion string table predicate point md)))
@@ -1794,7 +1794,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))