andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix initials completion style after // in file name

Browse source 
* lisp/minibuffer.el (completion-initials-expand): Change the
heuristic to check for an empty previous field, not total string
length (bug#81241).
* test/lisp/minibuffer-tests.el (completion-initials): New test.
This commit is contained in:
Spencer Baugh 2026-07-01 15:39:31 -04:00 • committed by Sean Whitton
parent 6b31360a31
commit 82009df4de
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/minibuffer.el
View file

@ -5070,12 +5070,14 @@ usual. Returns (ALL PAT PREFIX SUFFIX)."
;; to /usr/share/a/e just because we mistyped "ae" for "ar",
;; so we probably don't want initials to touch anything that
;; looks like /usr/share/foo. As a heuristic, we just check that
;; the text before the boundary char is at most 1 char.
;; This allows both ~/eee and /eee and not much more.
;; the previous completion field is empty.
;; This allows ~/eee and /eee and /usr//eee and not much more.
;; FIXME: It sadly also disallows the use of ~/eee when that's
;; embedded within something else (e.g. "(~/eee" in Info node
;; completion or "ancestor:/eee" in bzr-revision completion).
(when (< (car bounds) 3)
(when (let ((str-without-last-field (substring str 0 (1- (car bounds)))))
(= (car (completion-boundaries str-without-last-field table pred ""))
(length str-without-last-field)))
(let ((sep (substring str (1- (car bounds)) (car bounds))))
;; FIXME: the above string-match checks the whole string, whereas
;; we end up only caring about the after-boundary part.

12
test/lisp/minibuffer-tests.el
View file

@ -355,6 +355,18 @@
("sources/clang" "sys/class")
"pcm/" "")))))
(ert-deftest completion-initials ()
;; Should expand initials:
(should (equal (completion-initials-expand "/ttab" #'read-file-name-internal nil)
"/t/t/a/b"))
(should (equal (completion-initials-expand "~/ttab" #'read-file-name-internal nil)
"~/t/t/a/b"))
(should (equal (completion-initials-expand "/home//ttab" #'read-file-name-internal nil)
"/home//t/t/a/b")) ; bug#81241
;; Should not expand initials:
(should-not (completion-initials-expand "/x/ttab" #'read-file-name-internal nil))
(should-not (completion-initials-expand "/usr/share/ttab" #'read-file-name-internal nil)))
(ert-deftest completion-pcm-test-anydelim ()
;; After each delimiter is a special wildcard which matches any
;; sequence of delimiters.