diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-12-25 10:36:48 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-12-25 10:36:48 -0800 |
| commit | 2e20749e57164982df962c8f373e98bb40dd7d19 (patch) | |
| tree | 0a89c52a884e2721878bb73f6c33beba65176d94 /lisp/face-remap.el | |
| parent | 1ca6add75f81eac83dc7e11ec771c86f14be6a8e (diff) | |
| parent | 5d46593568073b43fb0a901cbd7e019a1797cf93 (diff) | |
| download | emacs-2e20749e57164982df962c8f373e98bb40dd7d19.tar.gz emacs-2e20749e57164982df962c8f373e98bb40dd7d19.tar.bz2 emacs-2e20749e57164982df962c8f373e98bb40dd7d19.zip | |
Merge from origin/emacs-27
5d46593568 Support build of Emacs on ARM Macos machines
7f8793e5f1 Update to Org 9.4.4
7b3367a0b5 * lisp/so-long.el: Decrease use of passive voice.
a90836c638 * doc/misc/efaq.texi (New in Emacs 27): Add section.
711fe70dd8 * doc/misc/efaq.texi (Latest version of Emacs): Bump version.
52b30834fb * lisp/face-remap.el (face-remap-set-base): Doc fix. (Bug...
b3fe0ac62e Correct argument order in comment
Diffstat (limited to 'lisp/face-remap.el')
| -rw-r--r-- | lisp/face-remap.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/face-remap.el b/lisp/face-remap.el index 13bbb5284a3..e92b89fc4e9 100644 --- a/lisp/face-remap.el +++ b/lisp/face-remap.el @@ -33,7 +33,7 @@ ;; ;; (face RELATIVE_SPECS_1 RELATIVE_SPECS_2 ... BASE_SPECS) ;; -;; The "specs" values are a lists of face names or face attribute-value +;; The "specs" values are lists of face names or face attribute-value ;; pairs, and are merged together, with earlier values taking precedence. ;; ;; The RELATIVE_SPECS_* values are added by `face-remap-add-relative' @@ -183,13 +183,13 @@ to apply on top of the normal definition of FACE." This causes the remappings specified by `face-remap-add-relative' to apply on top of the face specification given by SPECS. -The remaining arguments, SPECS, should form a list of faces. -Each list element should be either a face name or a property list +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 SPECS is empty, 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 +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 not to inherit from the global definition of FACE at all." (while (and (consp specs) (not (null (car specs))) (null (cdr specs))) (setq specs (car specs))) |