diff options
| author | Eli Zaretskii | 2018-06-16 13:10:52 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2018-06-16 13:10:52 +0300 |
| commit | 0a6a2fb1d0b02a5ac442cf6b344e35696aac7eb7 (patch) | |
| tree | b388527691ad118a3dfbfda1937f6115c02eb8ec /src | |
| parent | 2461266be1ea68a8c79af61abe850bb5a2c65040 (diff) | |
| download | emacs-0a6a2fb1d0b02a5ac442cf6b344e35696aac7eb7.tar.gz emacs-0a6a2fb1d0b02a5ac442cf6b344e35696aac7eb7.zip | |
Improve documentation of several recent changes
* src/xfaces.c (merge_face_ref): Fix a typo in the commentary.
(evaluate_face_filter, filter_face_ref): Minor copyedits in
the commentary.
* doc/lispref/display.texi (Face Remapping):
* doc/lispref/text.texi (Special Properties): Document the
':filter' face specs and their effects. Document
'face-filters-always-match'.
* doc/emacs/files.texi (Visiting): Document the new
possibility to visit large files literally in response to
question asked by Emacs.
* etc/NEWS: Mention the new possibility to visit large files
literally.
* lisp/files.el (files--ask-user-about-large-file): Use
"literally" instead of "raw", for consistency with
find-file-literally.
* doc/lispref/frames.texi (Input Focus): Tell explicitly that
focus-change events are sometimes supported on TTY frames.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 265581cca88..31aa14b7102 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -2193,7 +2193,7 @@ merge_named_face (struct window *w, | |||
| 2193 | (:window PARAMETER VALUE), which matches if the current window has | 2193 | (:window PARAMETER VALUE), which matches if the current window has |
| 2194 | a PARAMETER EQ to VALUE. | 2194 | a PARAMETER EQ to VALUE. |
| 2195 | 2195 | ||
| 2196 | This function returns true if the face filter matches and false if | 2196 | This function returns true if the face filter matches, and false if |
| 2197 | it doesn't or if the function encountered an error. If the filter | 2197 | it doesn't or if the function encountered an error. If the filter |
| 2198 | is invalid, set *OK to false and, if ERR_MSGS is true, log an error | 2198 | is invalid, set *OK to false and, if ERR_MSGS is true, log an error |
| 2199 | message. On success, *OK is untouched. */ | 2199 | message. On success, *OK is untouched. */ |
| @@ -2247,12 +2247,12 @@ evaluate_face_filter (Lisp_Object filter, struct window *w, | |||
| 2247 | 2247 | ||
| 2248 | /* Determine whether FACE_REF is a "filter" face specification (case | 2248 | /* Determine whether FACE_REF is a "filter" face specification (case |
| 2249 | #4 in merge_face_ref). If it is, evaluate the filter, and if the | 2249 | #4 in merge_face_ref). If it is, evaluate the filter, and if the |
| 2250 | filter matches, return the filtered expression. If the filter does | 2250 | filter matches, return the filtered face spec. If the filter does |
| 2251 | not match, return `nil'. If FACE_REF is not a filtered face | 2251 | not match, return `nil'. If FACE_REF is not a filtered face |
| 2252 | specification, return FACE_REF. | 2252 | specification, return FACE_REF. |
| 2253 | 2253 | ||
| 2254 | On error, set *OK to false, having logged an error message if | 2254 | On error, set *OK to false, having logged an error message if |
| 2255 | ERR_MSGS is true, and return `nil'. | 2255 | ERR_MSGS is true, and return `nil'. Otherwise, *OK is not touched. |
| 2256 | 2256 | ||
| 2257 | W is either NULL or a window used to evaluate filters. If W is | 2257 | W is either NULL or a window used to evaluate filters. If W is |
| 2258 | NULL, no window-based face specification filter matches. | 2258 | NULL, no window-based face specification filter matches. |
| @@ -2319,7 +2319,7 @@ filter_face_ref (Lisp_Object face_ref, | |||
| 2319 | for compatibility with 20.2. | 2319 | for compatibility with 20.2. |
| 2320 | 2320 | ||
| 2321 | 4. Conses of the form | 2321 | 4. Conses of the form |
| 2322 | (:filter (:window PARAMETER VALUE) FACE-SPECIFICATION), | 2322 | (:filtered (:window PARAMETER VALUE) FACE-SPECIFICATION), |
| 2323 | which applies FACE-SPECIFICATION only if the | 2323 | which applies FACE-SPECIFICATION only if the |
| 2324 | given face attributes are being evaluated in the context of a | 2324 | given face attributes are being evaluated in the context of a |
| 2325 | window with a parameter named PARAMETER being EQ VALUE. | 2325 | window with a parameter named PARAMETER being EQ VALUE. |