mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

lisp/minibuffer.el (completion--sifn-requote): Fix bug#72176

Browse Source
This commit is contained in:
Stefan Monnier 2024-07-25 08:39:38 -04:00
parent 68906f184c
commit 7170282a59
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/minibuffer.el
View File

@ -3343,7 +3343,7 @@ same as `substitute-in-file-name'."
(file-error nil))) ;PCM often calls with invalid directories. (file-error nil))) ;PCM often calls with invalid directories.
(defun completion--sifn-requote (upos qstr) (defun completion--sifn-requote (upos qstr)
;; We're looking for `qpos' such that: ;; We're looking for (the largest) `qpos' such that:
;; (equal (substring (substitute-in-file-name qstr) 0 upos) ;; (equal (substring (substitute-in-file-name qstr) 0 upos)
;; (substitute-in-file-name (substring qstr 0 qpos))) ;; (substitute-in-file-name (substring qstr 0 qpos)))
;; Big problem here: we have to reverse engineer substitute-in-file-name to ;; Big problem here: we have to reverse engineer substitute-in-file-name to
@ -3373,11 +3373,13 @@ same as `substitute-in-file-name'."
;; Main assumption: nothing after qpos should affect the text before upos, ;; Main assumption: nothing after qpos should affect the text before upos,
;; so we can work our way backward from the end of qstr, one character ;; so we can work our way backward from the end of qstr, one character
;; at a time. ;; at a time.
;; Second assumptions: If qpos is far from the end this can be a bit slow, ;; Second assumption: If qpos is far from the end this can be a bit slow,
;; so we speed it up by doing a first loop that skips a word at a time. ;; so we speed it up by doing a first loop that skips a word at a time.
;; This word-sized loop is careful not to cut in the middle of env-vars. ;; This word-sized loop is careful not to cut in the middle of env-vars.
(while (let ((boundary (string-match "\\(\\$+{?\\)?\\w+\\W*\\'" qstr))) (while (let ((boundary (string-match "\\(\\$+{?\\)?\\w+\\W*\\'" qstr)))
(and boundary (and boundary
;; Try and make sure we keep the largest `qpos' (bug#72176).
(not (string-match-p "/[/~]" qstr boundary))
(progn (progn
(setq qprefix (substring qstr 0 boundary)) (setq qprefix (substring qstr 0 boundary))
(string-prefix-p uprefix (string-prefix-p uprefix