diff options
| author | Xue Fuqiao | 2014-02-28 12:15:21 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2014-02-28 12:15:21 +0800 |
| commit | ecc384ac0abed461ae29a762261b1d69fc903093 (patch) | |
| tree | 61a1cf3e01b32c801ec55f81a4998b43e3ea54bc /doc | |
| parent | 4f07dcdce61f54524a8efe63493e5db6e605dd2d (diff) | |
| download | emacs-ecc384ac0abed461ae29a762261b1d69fc903093.tar.gz emacs-ecc384ac0abed461ae29a762261b1d69fc903093.zip | |
Doc fix for `face-spec-set'.
* doc/lispref/display.texi (Defining Faces): Doc fix for
`face-spec-set'.
* etc/NEWS: Copyedit.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/ChangeLog | 2 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 650f97375d6..b7148b92186 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2014-02-28 Xue Fuqiao <xfq@gnu.org> | 1 | 2014-02-28 Xue Fuqiao <xfq@gnu.org> |
| 2 | 2 | ||
| 3 | * display.texi (Defining Faces): Doc fix for `face-spec-set'. | ||
| 4 | |||
| 3 | * elisp.texi (Top): | 5 | * elisp.texi (Top): |
| 4 | * commands.texi (Generic Commands): | 6 | * commands.texi (Generic Commands): |
| 5 | (Defining Commands): Document `define-alternatives'. | 7 | (Defining Commands): Document `define-alternatives'. |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 496fbf87041..9aae04ae32a 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -2359,16 +2359,20 @@ This function applies @var{spec} as a face spec for @code{face}. | |||
| 2359 | @var{spec} should be a face spec, as described in the above | 2359 | @var{spec} should be a face spec, as described in the above |
| 2360 | documentation for @code{defface}. | 2360 | documentation for @code{defface}. |
| 2361 | 2361 | ||
| 2362 | This function also defines @var{face} as a valid face name if it is | ||
| 2363 | not already one, and (re)calculates its attributes on existing frames. | ||
| 2364 | |||
| 2362 | @cindex override spec @r{(for a face)} | 2365 | @cindex override spec @r{(for a face)} |
| 2363 | The argument @var{spec-type} determines which spec to set. If it is | 2366 | The argument @var{spec-type} determines which spec to set. If it is |
| 2364 | @code{nil} or @code{face-override-spec}, this function sets the | 2367 | @code{nil} or @code{face-override-spec}, this function sets the |
| 2365 | @dfn{override spec}, which overrides over all other face specs on | 2368 | @dfn{override spec}, which overrides over all other face specs on |
| 2366 | @var{face}. If it is @code{face-defface-spec}, this function sets the | 2369 | @var{face}. If it is @code{customized-face} or @code{saved-face}, |
| 2367 | default face spec (the same one set by @code{defface}). If it is | 2370 | this function sets the customized spec or the saved custom spec. If |
| 2368 | @code{reset}, this function clears out all customization specs and | 2371 | it is @code{face-defface-spec}, this function sets the default face |
| 2369 | override specs from @var{face} (in this case, the value of @var{spec} | 2372 | spec (the same one set by @code{defface}). If it is @code{reset}, |
| 2370 | is ignored). Any other value of @var{spec-type} is reserved for | 2373 | this function clears out all customization specs and override specs |
| 2371 | internal use. | 2374 | from @var{face} (in this case, the value of @var{spec} is ignored). |
| 2375 | Any other value of @var{spec-type} is reserved for internal use. | ||
| 2372 | @end defun | 2376 | @end defun |
| 2373 | 2377 | ||
| 2374 | @node Attribute Functions | 2378 | @node Attribute Functions |