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 origin/emacs-30

Browse source 
894b0e3a2f ; Adapt comment in tramp.el
cc87717fa0 Add keyword placeholder to tramp.el
7d0d61d854 Rewrite ERT manual introduction
b2f124f2a8 ; cperl-mode.el: Don't misinterpret exec_fcn as keyword exec
59d1aac49d Document return values of the various read-* functions
This commit is contained in:
Sean Whitton 2025-03-12 10:09:09 +08:00
commit 99852fb867
21 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/faces.el
View file

@ -1095,7 +1095,7 @@ of the default face. Value is FACE."
"Text string to display as the sample text for `read-face-name'.")
(defun read-face-name (prompt &optional default multiple)
"Read one or more face names, prompting with PROMPT.
"Read and return one or more face names, strings, prompting with PROMPT.
PROMPT should not end in a space or a colon.
If DEFAULT is non-nil, it should be a face (a symbol) or a face
@ -1373,7 +1373,7 @@ of a global face. Value is the new attribute value."
(pattern &optional face frame maximum width))
(defun read-face-font (face &optional frame)
"Read the name of a font for FACE on FRAME.
"Read and return the string name of the font for FACE on FRAME.
If optional argument FRAME is nil or omitted, use the selected frame."
(let ((completion-ignore-case t))
(completing-read (format-message
@ -1981,7 +1981,7 @@ If omitted or nil, that stands for the selected frame's display."
(defun read-color (&optional prompt convert-to-RGB allow-empty-name msg
foreground face)
"Read a color name or RGB triplet.
"Read a color name or RGB triplet, return a string, the color name or RGB.
Completion is available for color names, but not for RGB triplets.
RGB triplets have the form \"#RRGGBB\". Each of the R, G, and B