From: James N. V. Cash <james.nvc@gmail.com>
To: Juri Linkov <juri@linkov.net>
Cc: emacs-devel@gnu.org
Subject: Re: [PATCH] Handle case where `beg` and `end` are strings instead of markers
Date: Fri, 29 Apr 2022 08:10:38 -0400 [thread overview]
Message-ID: <87czh03xa9.fsf@occasionallycogent.com> (raw)
In-Reply-To: <86sfpwwerz.fsf@mail.linkov.net>
Juri Linkov <juri@linkov.net> writes:
> Please describe how do you expect this should behave from a UI point of view.
> I see that when using on a simple call:
>
> (completing-read-multiple "Tags: " '(("tag1") ("tag2") ("tag3")))
>
> subsequent completions can be selected properly
> after replacing these lines in your patch
>
> + (+ (search-forward beg)
> + (length beg)))))
>
> with
>
> + (search-forward beg))))
Ah, that seems to do it -- I was seeing subsequent completions only
partially inserting, but that change you suggest fixes that and works as
expected.
New patch as follows then:
---
lisp/minibuffer.el | 68 ++++++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 29 deletions(-)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index ef71b4e6be..08e2dc5a37 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1147,35 +1147,45 @@ completion--replace
newtext)
;; Remove all text properties.
(set-text-properties 0 (length newtext) nil newtext))
- ;; Maybe this should be in subr.el.
- ;; You'd think this is trivial to do, but details matter if you want
- ;; to keep markers "at the right place" and be robust in the face of
- ;; after-change-functions that may themselves modify the buffer.
- (let ((prefix-len 0))
- ;; Don't touch markers in the shared prefix (if any).
- (while (and (< prefix-len (length newtext))
- (< (+ beg prefix-len) end)
- (eq (char-after (+ beg prefix-len))
- (aref newtext prefix-len)))
- (setq prefix-len (1+ prefix-len)))
- (unless (zerop prefix-len)
- (setq beg (+ beg prefix-len))
- (setq newtext (substring newtext prefix-len))))
- (let ((suffix-len 0))
- ;; Don't touch markers in the shared suffix (if any).
- (while (and (< suffix-len (length newtext))
- (< beg (- end suffix-len))
- (eq (char-before (- end suffix-len))
- (aref newtext (- (length newtext) suffix-len 1))))
- (setq suffix-len (1+ suffix-len)))
- (unless (zerop suffix-len)
- (setq end (- end suffix-len))
- (setq newtext (substring newtext 0 (- suffix-len))))
- (goto-char beg)
- (let ((length (- end beg))) ;Read `end' before we insert the text.
- (insert-and-inherit newtext)
- (delete-region (point) (+ (point) length)))
- (forward-char suffix-len)))
+ (let ((beg (if (number-or-marker-p beg)
+ beg
+ (save-excursion
+ (goto-char (minibuffer-prompt-end))
+ (search-forward beg))))
+ (end (if (number-or-marker-p end)
+ end
+ (save-excursion
+ (goto-char (point-max))
+ (search-backward end)))))
+ ;; Maybe this should be in subr.el.
+ ;; You'd think this is trivial to do, but details matter if you want
+ ;; to keep markers "at the right place" and be robust in the face of
+ ;; after-change-functions that may themselves modify the buffer.
+ (let ((prefix-len 0))
+ ;; Don't touch markers in the shared prefix (if any).
+ (while (and (< prefix-len (length newtext))
+ (< (+ beg prefix-len) end)
+ (eq (char-after (+ beg prefix-len))
+ (aref newtext prefix-len)))
+ (setq prefix-len (1+ prefix-len)))
+ (unless (zerop prefix-len)
+ (setq beg (+ beg prefix-len))
+ (setq newtext (substring newtext prefix-len))))
+ (let ((suffix-len 0))
+ ;; Don't touch markers in the shared suffix (if any).
+ (while (and (< suffix-len (length newtext))
+ (< beg (- end suffix-len))
+ (eq (char-before (- end suffix-len))
+ (aref newtext (- (length newtext) suffix-len 1))))
+ (setq suffix-len (1+ suffix-len)))
+ (unless (zerop suffix-len)
+ (setq end (- end suffix-len))
+ (setq newtext (substring newtext 0 (- suffix-len))))
+ (goto-char beg)
+ (let ((length (- end beg))) ;Read `end' before we insert the text.
+ (insert-and-inherit newtext)
+ (delete-region (point) (+ (point) length)))
+ (forward-char suffix-len))))
(defcustom completion-cycle-threshold nil
"Number of completion candidates below which cycling is used.
--
2.25.1
next prev parent reply other threads:[~2022-04-29 12:10 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-29 0:36 [PATCH] Handle case where `beg` and `end` are strings instead of markers James N. V. Cash
2022-04-29 1:10 ` James N. V. Cash
2022-04-29 7:05 ` Juri Linkov
2022-04-29 12:10 ` James N. V. Cash [this message]
2022-04-29 12:55 ` Stefan Monnier
2022-04-29 14:07 ` James N. V. Cash
2022-04-29 16:18 ` Stefan Monnier
2022-04-29 17:20 ` James N. V. Cash
2022-04-29 17:29 ` Juri Linkov
2022-04-29 21:05 ` Stefan Monnier
2022-04-30 12:41 ` James N. V. Cash
2022-04-30 13:44 ` Stefan Monnier
2022-04-30 15:48 ` James N. V. Cash
2022-05-01 18:06 ` Juri Linkov
2022-05-02 15:32 ` James N. V. Cash
2022-05-02 19:11 ` Juri Linkov
2022-05-04 12:08 ` James N. V. Cash
2022-05-04 19:27 ` Juri Linkov
2022-05-04 21:09 ` James N. V. Cash
2022-05-05 18:16 ` Juri Linkov
2022-05-01 18:03 ` Juri Linkov
2022-05-01 18:37 ` Stefan Monnier
2022-05-05 18:19 ` Juri Linkov
2022-05-05 18:30 ` Exiting completion-in-region-mode (was: Handle case where `beg` and `end` are strings instead of markers) Juri Linkov
2022-05-19 18:52 ` Exiting completion-in-region-mode Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87czh03xa9.fsf@occasionallycogent.com \
--to=james.nvc@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=juri@linkov.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).