bug#62700: 29.0.60; minibuffer-{previous,next,choose}-completion behave unintuitively when point is not at end of buffer

[sbaugh@catern.com]

[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]

Eli Zaretskii <eliz@gnu.org> writes:

>> Cc: 62700@debbugs.gnu.org, Spencer Baugh <sbaugh@catern.com>
>> From: Spencer Baugh <sbaugh@janestreet.com>
>> Date: Thu, 20 Apr 2023 14:46:45 -0400
>> 
>> Juri Linkov <juri@linkov.net> writes:
>> >>>>> It just needs more testing for different categories of completion.
>> >>>>
>> >>>> Which categories do you have in mind?
>> >>>
>> >>> Actually, I can't find categories where it could fail.
>> >>> So your patch looks safe to push.
>> >>
>> >> Can we go ahead and push it to Emacs master, then?  I will work on the
>> >> changing-only-new-code backport for Emacs 29 as Eli requested.
>> >
>> > But your patch changes only new code.
>> 
>> Ah, I thought Eli still wanted a backport version because this changes
>> code which has been on Emacs 29 for over a year.
>
> Indeed, that's what I would like to see on the release branch.  Mainly
> because even if this is deemed a bug, it happens in a relatively rare
> situation, so I'd like to avoid risking breakage in code which affects
> other situations.

Here's the backport for the release branch.  (FYI, my papers have been
signed and the FSF copyright clerk has approved accepting my
contributions again)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Handle-point-not-at-EOB-in-minibuffer-choose-complet.patch --]
[-- Type: text/x-patch, Size: 3171 bytes --]

From a159cfb8ee80e24de180d002caa61119edc7afc1 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Fri, 21 Apr 2023 14:55:00 -0400
Subject: [PATCH] Handle point not at EOB in minibuffer-choose-completion

Without this change, only the minibuffer contents before point are
cleared when a completion is chosen, which results in stray text when
point is in the middle of the minibuffer.

After this change, we heuristically decide either to clear the whole
buffer or only part of it, taking into account the location of point.

This is a backport for the Emacs 29 release branch of a simpler fix in
minibuffer-completion-help.

* lisp/minibuffer.el (minibuffer-next-completion):
(minibuffer-choose-completion):
Recalculate completion-base-affixes with point
---
 lisp/minibuffer.el | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index dfb06b5b88f..86946ec9ce1 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -4464,13 +4464,21 @@ minibuffer-next-completion
 When `minibuffer-completion-auto-choose' is non-nil, then also
 insert the selected completion to the minibuffer."
   (interactive "p")
-  (let ((auto-choose minibuffer-completion-auto-choose))
+  (let* ((auto-choose minibuffer-completion-auto-choose)
+         ;; Backported fix for bug#62700
+         (md (completion--field-metadata (minibuffer--completion-prompt-end)))
+         (base-suffix
+          (if (eq (alist-get 'category (cdr md)) 'file)
+              (buffer-substring (save-excursion (search-forward "/" nil t) (point))
+                                (point-max))
+            "")))
     (with-minibuffer-completions-window
       (when completions-highlight-face
         (setq-local cursor-face-highlight-nonselected-window t))
       (next-completion (or n 1))
       (when auto-choose
-        (let ((completion-use-base-affixes t))
+        (let ((completion-use-base-affixes t)
+              (completion-base-affixes (list (car completion-base-affixes) base-suffix)))
           (choose-completion nil t t))))))
 
 (defun minibuffer-previous-completion (&optional n)
@@ -4489,9 +4497,17 @@ minibuffer-choose-completion
 If NO-QUIT is non-nil, insert the completion at point to the
 minibuffer, but don't quit the completions window."
   (interactive "P")
-  (with-minibuffer-completions-window
-    (let ((completion-use-base-affixes t))
-      (choose-completion nil no-exit no-quit))))
+  ;; Backported fix for bug#62700
+  (let* ((md (completion--field-metadata (minibuffer--completion-prompt-end)))
+         (base-suffix
+          (if (eq (alist-get 'category (cdr md)) 'file)
+              (buffer-substring (save-excursion (search-forward "/" nil t) (point))
+                                (point-max))
+            "")))
+    (with-minibuffer-completions-window
+      (let ((completion-use-base-affixes t)
+            (completion-base-affixes (list (car completion-base-affixes) base-suffix)))
+        (choose-completion nil no-exit no-quit)))))
 
 (defun minibuffer-complete-history ()
   "Complete the minibuffer history as far as possible.
-- 
2.38.0