diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el index 996aa7d453a..e58f73109a4 100644 --- a/lisp/emacs-lisp/cl-seq.el +++ b/lisp/emacs-lisp/cl-seq.el @@ -134,7 +134,7 @@ the result of calling FUNCTION with zero arguments. This is the only case where FUNCTION is called with fewer than two arguments. If SEQ contains exactly one element and no :INITIAL-VALUE is -specified, then return that element and FUNCTION is not called. +specified, then just return that element wihout calling FUNCTION. If :FROM-END is non-nil, the reduction occurs from the back of the SEQ moving forward, and the order of arguments to the diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index d8ffdb1fa20..6394c1bca95 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -385,9 +385,7 @@ third element of SEQUENCE, etc. FUNCTION will be called with INITIAL-VALUE (and then the accumulated value) as the first argument, and the elements from SEQUENCE as the second argument. -If SEQUENCE is empty, return INITIAL-VALUE and FUNCTION is not called. - -This does not modify SEQUENCE." +If SEQUENCE is empty, return INITIAL-VALUE without calling FUNCTION." (if (seq-empty-p sequence) initial-value (let ((acc initial-value)) diff --git a/lisp/face-remap.el b/lisp/face-remap.el index bd8ead32127..7de0995f3d8 100644 --- a/lisp/face-remap.el +++ b/lisp/face-remap.el @@ -122,6 +122,10 @@ of face attribute/value pairs. If more than one face is listed, that specifies an aggregate face, in the same way as in a `face' text property, except for possible priority changes noted below. +If a face property list specifies `:font', the value should be +either a font-spec object or the return value of `font-face-attributes' +called with a font object, font spec, or font entity. + The face remapping specified by SPECS takes effect alongside the remappings from other calls to `face-remap-add-relative' for the same FACE, as well as the normal definition of FACE (at lowest @@ -192,6 +196,10 @@ The remaining arguments, SPECS, specify the base of the remapping. Each one of SPECS should be either a face name or a property list of face attribute/value pairs, like in a `face' text property. +If a face property list specifies `:font', the value should be +either a font-spec object or the return value of `font-face-attributes' +called with a font object, font spec, or font entity. + If SPECS is empty or a single face `eq' to FACE, call `face-remap-reset-base' to use the normal definition of FACE as the base remapping; note that this is different from SPECS containing a single value nil, which means @@ -572,6 +580,10 @@ one face is listed, that specifies an aggregate face, like in a `face' text property. If SPECS is nil or omitted, disable `buffer-face-mode'. +If a face property list specifies `:font', the value should be +either a font-spec object or the return value of `font-face-attributes' +called with a font object, font spec, or font entity. + This function makes the variable `buffer-face-mode-face' buffer local, and sets it to FACE." (interactive (list (read-face-name "Set buffer face" (face-at-point t)))) @@ -590,6 +602,10 @@ or a property list of face attributes and values. If more than one face is listed, that specifies an aggregate face, like in a `face' text property. +If a face property list specifies `:font', the value should be +either a font-spec object or the return value of `font-face-attributes' +called with a font object, font spec, or font entity. + If `buffer-face-mode' is already enabled, and is currently using the face specs SPECS, then it is disabled; if `buffer-face-mode' is disabled, or is enabled and currently displaying some other @@ -615,6 +631,10 @@ SPECS can be any value suitable for a `face' text property, including a face name, a plist of face attributes and values, or a list of faces. +If a face property list specifies `:font', the value should be +either a font-spec object or the return value of `font-face-attributes' +called with a font object, font spec, or font entity. + If INTERACTIVE is non-nil, display a message describing the result.