From 37f255146028954e5c3c374fa2f1eb596b69f9a4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 11 Feb 2025 07:50:05 +0100 Subject: [PATCH 1/4] ; * lisp/gnus/nnweb.el (nnweb-type): Doc fix. --- lisp/gnus/nnweb.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el index 57964f93437..9ada2dbc1d7 100644 --- a/lisp/gnus/nnweb.el +++ b/lisp/gnus/nnweb.el @@ -42,7 +42,7 @@ (defvoo nnweb-type 'google "What search engine type is being used. -Valid types include `google' and `dejanews'.") +The only valid type is currently `google'.") (defvar nnweb-type-definition '((google From 737f249aa2c86fb555b134b9e430a5be9cf2b655 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 11 Feb 2025 16:42:19 +0200 Subject: [PATCH 2/4] ; Document 'completing-read-multiple' in the ELisp manual * doc/lispref/minibuf.texi (Minibuffer Completion): Mention 'completing-read-multiple' (bug#76194). --- doc/lispref/minibuf.texi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index 43e87f89aee..9bff31aaf3c 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi @@ -1249,6 +1249,16 @@ different function to completely override the normal behavior of @code{completing-read}. @end defvar +@findex completing-read-multiple +@vindex crm-separator +If you need to prompt the user for several strings, like several +elements of a list or several parameters (e.g., user, host, and port) of +a connection, you can use @code{completing-read-multiple}. It allows +typing several strings separated by a separator string (by default, tabs +and commas; customize @code{crm-separator} to change that), and provides +completion for each individual string the user types. It returns the +strings that were read, as a list. + @node Completion Commands @subsection Minibuffer Commands that Do Completion From 88bc748f52fe3ed161d5c7b3aca1de0fb0fa1209 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 11 Feb 2025 17:47:21 +0200 Subject: [PATCH 3/4] Fix minibuffer-next-completion in completing-read-multiple * lisp/emacs-lisp/crm.el (completing-read-multiple): Adapt to the previous removal of completion-base-affixes (bug#48356, bug#48356). --- lisp/emacs-lisp/crm.el | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el index 454c3e85074..a371a8e14de 100644 --- a/lisp/emacs-lisp/crm.el +++ b/lisp/emacs-lisp/crm.el @@ -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)) From 19791839cfbb9202aff8a8d476ec76741592c97d Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 11 Feb 2025 09:12:07 +0100 Subject: [PATCH 4/4] ; Don't document a complicated default * doc/misc/message.texi (Superseding): Don't document the default value of 'message-ignored-supersedes-headers' here; the list was out-of-date, and is likely to become out-of-date again in the future if updated. It's also easy enough to look up for users outside of Info. --- doc/misc/message.texi | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/misc/message.texi b/doc/misc/message.texi index bd20aec5bc6..588108e27ff 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -289,12 +289,7 @@ supersede the message in the current buffer. @vindex message-ignored-supersedes-headers Headers matching the @code{message-ignored-supersedes-headers} are -removed before popping up the new message buffer. The default is@* -@samp{^Path:\\|^Date\\|^NNTP-Posting-Host:\\|^Xref:\\|^Lines:\\|@* -^Received:\\|^X-From-Line:\\|^X-Trace:\\|^X-Complaints-To:\\|@* -Return-Path:\\|^Supersedes:\\|^NNTP-Posting-Date:\\|^X-Trace:\\|@* -^X-Complaints-To:\\|^Cancel-Lock:\\|^Cancel-Key:\\|^X-Hashcash:\\|@* -^X-Payment:\\|^Approved:}. +removed before popping up the new message buffer.