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

Merge from origin/emacs-28

Browse Source 
89a82182cb Improve documentation of read-multiple-choice
5fccd1e371 Explain why we remove stuff from 'user-full-name'
This commit is contained in:
Stefan Kangas 2021-12-26 06:30:37 +01:00
commit 4e2058aec3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/lispref/commands.texi
View File

@ -3000,7 +3000,7 @@ causes it to evaluate @code{help-form} and display the result. It
then continues to wait for a valid input character, or keyboard-quit.
@end defun
@defun read-multiple-choice prompt choices
@defun read-multiple-choice prompt choices &optional help-string
Ask user a multiple choice question. @var{prompt} should be a string
that will be displayed as the prompt.
@ -3010,6 +3010,11 @@ entry to be displayed while prompting (if there's room, it might be
shortened), and the third, optional entry is a longer explanation that
will be displayed in a help buffer if the user requests more help.
If optional argument @var{help-string} is non-@code{nil}, it should be
a string with a more detailed description of all choices. It will be
displayed in a help buffer instead of the default auto-generated
description when the user types @kbd{?}.
The return value is the matching value from @var{choices}.
@lisp

9
src/editfns.c
View File

@ -1233,7 +1233,11 @@ return "unknown".
If optional argument UID is an integer, return the full name
of the user with that uid, or nil if there is no such user.
If UID is a string, return the full name of the user with that login
name, or nil if there is no such user. */)
name, or nil if there is no such user.
If the full name includes commas, remove everything starting with
the first comma, because the \\='gecos\\=' field of the \\='/etc/passwd\\=' file
is in general a comma-separated list. */)
(Lisp_Object uid)
{
struct passwd *pw;
@ -1263,7 +1267,8 @@ name, or nil if there is no such user. */)
return Qnil;
p = USER_FULL_NAME;
/* Chop off everything after the first comma. */
/* Chop off everything after the first comma, since 'pw_gecos' is a
comma-separated list. */
q = strchr (p, ',');
full = make_string (p, q ? q - p : strlen (p));