diff options
| author | Jimmy Aguilar Mena <spacibba@aol.com> | 2019-09-21 23:34:40 +0200 |
|---|---|---|
| committer | Jimmy Aguilar Mena <spacibba@aol.com> | 2019-10-14 14:18:42 +0200 |
| commit | 424e6f54e5c3592f32016267179171b40dafbb99 (patch) | |
| tree | 1159d5075e6cac06f938a0a59006e7d2cc67543e /src/xfaces.c | |
| parent | 38ee12d5a2df150e6ba9023d968d1c49c85ca6e1 (diff) | |
| download | emacs-424e6f54e5c3592f32016267179171b40dafbb99.tar.gz | |
Document new :extend face attribute in manuals.
Some stylistic corrections in src/xdisp.c and src/xfaces.c.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 5577640325d..cc65527fe61 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -2282,7 +2282,7 @@ filter_face_ref (Lisp_Object face_ref, of ERR_MSGS). Use NAMED_MERGE_POINTS to detect loops in face inheritance or list structure; it may be 0 for most callers. - attr_filter is the index of a parameter that conditions the merging + ATTR_FILTER is the index of a parameter that conditions the merging for named faces (case 1) to only the face_ref where lface[merge_face_ref] is non-nil. To merge unconditionally set this value to 0. @@ -6043,7 +6043,7 @@ compute_char_face (struct frame *f, int ch, Lisp_Object prop) which a different face is needed, as far as text properties and overlays are concerned. W is a window displaying current_buffer. - attr_filter is passed merge_face_ref. + ATTR_FILTER is passed merge_face_ref. REGION_BEG, REGION_END delimit the region, so it can be highlighted. @@ -6126,7 +6126,8 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos, } /* Optimize common cases where we can use the default face. */ - if (noverlays == 0 && NILP (prop)) + if (noverlays == 0 + && NILP (prop)) { SAFE_FREE (); return default_face->id; |