mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from savannah/emacs-30

Browse source 
19791839cf ; Don't document a complicated default
88bc748f52 Fix minibuffer-next-completion in completing-read-multiple
737f249aa2 ; Document 'completing-read-multiple' in the ELisp manual
37f2551460 ; * lisp/gnus/nnweb.el (nnweb-type): Doc fix.
This commit is contained in:
Po Lu 2025-02-12 11:16:20 +08:00
commit fb4daf4aa0
4 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/emacs-lisp/crm.el
View file

@ -251,22 +251,16 @@ with empty strings removed."
(setq-local minibuffer-completion-table #'crm--collection-fn)
(setq-local minibuffer-completion-predicate predicate)
(setq-local completion-list-insert-choice-function
(lambda (start end choice)
(if (and (stringp start) (stringp end))
(let* ((beg (save-excursion
(goto-char (minibuffer-prompt-end))
(or (search-forward start nil t)
(search-forward-regexp crm-separator nil t)
(minibuffer-prompt-end))))
(end (save-excursion
(goto-char (point-max))
(or (search-backward end nil t)
(progn
(goto-char beg)
(search-forward-regexp crm-separator nil t))
(point-max)))))
(completion--replace beg end choice))
(completion--replace start end choice))))
(lambda (_start _end choice)
(let* ((beg (save-excursion
(if (search-backward-regexp crm-separator nil t)
(1+ (point))
(minibuffer-prompt-end))))
(end (save-excursion
(if (search-forward-regexp crm-separator nil t)
(1- (point))
(point-max)))))
(completion--replace beg end choice))))
;; see completing_read in src/minibuf.c
(setq-local minibuffer-completion-confirm
(unless (eq require-match t) require-match))