]> git.eshelyaron.com Git - emacs.git/commitdiff
minibuffer-completion-help: Fix regression when END < EOB
authorDmitry Gutov <dmitry@gutov.dev>
Thu, 11 Apr 2024 17:33:16 +0000 (20:33 +0300)
committerEshel Yaron <me@eshelyaron.com>
Sun, 14 Apr 2024 17:02:27 +0000 (19:02 +0200)
Which can happen with in-buffer completion (though this scenario
is preffed off by default).

* lisp/minibuffer.el (minibuffer-completion-help): Include the
buffer contents after END into BASE-SUFFIX (bug#48356).

(cherry picked from commit 0284b296f2ee469e0edeba8bd043b4a813cfd977)

lisp/minibuffer.el

index 98f299dd3a5f7a6f488d2f5fa5a71dbc4f318ad2..e6cc4b7837d2fa38196792f5978305df763c6c9b 100644 (file)
@@ -3008,9 +3008,10 @@ completions list."
              (full-base (substring string 0 base-size))
              (base-prefix (buffer-substring (minibuffer--completion-prompt-end)
                                             (+ start base-size)))
-             (base-suffix (completion-base-suffix start end
-                                                  minibuffer-completion-table
-                                                  minibuffer-completion-predicate))
+             (base-suffix (concat (completion-base-suffix start end
+                                                          minibuffer-completion-table
+                                                          minibuffer-completion-predicate)
+                                  (buffer-substring end (point-max))))
              (style completion--matching-style)
              (exceptional-candidates
               (or (not completions-exclude-exceptional-candidates)