mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

minibuffer-completion-help: Fix earlier mistake

Browse Source 
* lisp/minibuffer.el (minibuffer-completion-help): Fix earlier
mistake.  Instead of altering a variable whose value is
immutable (and already captured in a saved list), move the
reference to said list to a lexical binding and alter that
list's second element instead.

https://lists.gnu.org/archive/html/emacs-devel/2024-05/msg00875.html
This commit is contained in:
Dmitry Gutov 2024-05-18 16:30:23 +03:00
parent 8dc00dc222
commit 6badb1260a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/minibuffer.el
View File

@ -2596,6 +2596,7 @@ The candidate will still be chosen by `choose-completion' unless
(buffer-substring (point) end))))
(point)))
(field-char (and (< field-end end) (char-after field-end)))
(base-position (list (+ start base-size) field-end))
(all-md (completion--metadata (buffer-substring-no-properties
start (point))
base-size md
@ -2678,8 +2679,7 @@ The candidate will still be chosen by `choose-completion' unless
completions))))
(with-current-buffer standard-output
(setq-local completion-base-position
(list (+ start base-size) field-end))
(setq-local completion-base-position base-position)
(setq-local completion-list-insert-choice-function
(lambda (start end choice)
(unless (or (zerop (length prefix))
@ -2702,9 +2702,12 @@ The candidate will still be chosen by `choose-completion' unless
(= (aref choice (1- (length choice)))
field-char))
(setq end (1+ end)))
(cl-decf field-end (- end start (length choice)))
;; Tried to use a marker to track buffer changes
;; but that clashed with another existing marker.
(cl-decf (nth 1 base-position)
(- end start (length choice)))
;; FIXME: Use `md' to do quoting&terminator here.
(completion--replace start end choice)
(completion--replace start (min end (point-max)) choice)
(let* ((minibuffer-completion-table ctable)
(minibuffer-completion-predicate cpred)
(completion-extra-properties cprops)