procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/pcomplete.el (pcomplete-completions-at-point): Add hack for bug#65089

Browse source 
Improve our guess for `end` and `buftext` when point is not at the end
of the current "thing to complete".
This commit is contained in:
Stefan Monnier 2023-09-08 11:31:35 -04:00
parent 4eb4fb4ad4
commit 34b1ed3f5e
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/pcomplete.el
View file

@ -470,6 +470,8 @@ Same as `pcomplete' but using the standard completion UI."
;; rely less on c-t-subvert.
(beg (max (- (point) (length pcomplete-stub))
argbeg))
(end (point))
tmp
buftext)
;; Try and improve our guess of `beg' in case the difference
;; between pcomplete-stub and the buffer's text is simply due to
@ -477,11 +479,19 @@ Same as `pcomplete' but using the standard completion UI."
;; indispensable but reduces the reliance on c-t-subvert and
;; improves corner case behaviors.
(while (progn (setq buftext (pcomplete-unquote-argument
(buffer-substring beg (point))))
(buffer-substring beg end)))
(and (> beg argbeg)
(> (length pcomplete-stub) (length buftext))))
(setq beg (max argbeg (- beg (- (length pcomplete-stub)
(length buftext))))))
;; Try and improve our guess of `end' in case it's not point.
(while (and (< (length buftext) (length pcomplete-stub))
(< end (point-max))
(string-prefix-p (setq tmp (pcomplete-unquote-argument
(buffer-substring beg (1+ end))))
pcomplete-stub))
(setq end (1+ end))
(setq buftext tmp))
(when completions
(let ((table
(completion-table-with-quoting
@ -515,7 +525,7 @@ Same as `pcomplete' but using the standard completion UI."
seen)))))))
(when completion-ignore-case
(setq table (completion-table-case-fold table)))
(list beg (point) table
(list beg end table
:annotation-function
(lambda (cand)
(when (stringp cand)