Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c1dbe028
Commit
c1dbe028
authored
Sep 08, 2019
by
Jimmy Aguilar Mena
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed extend face filtered for prop.
parent
28655de4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
src/xdisp.c
src/xdisp.c
+4
-9
src/xfaces.c
src/xfaces.c
+2
-2
No files found.
src/xdisp.c
View file @
c1dbe028
...
...
@@ -4106,17 +4106,12 @@ handle_fontified_prop (struct it *it)
***********************************************************************/
static enum prop_handled
handle_face_prop_general (struct it *it,
handle_face_prop_general (struct it *it,
int *face_id_ptr,
enum lface_attribute_index attr_filter)
{
int new_face_id
, *face_id_ptr
;
int new_face_id;
ptrdiff_t next_stop;
if (attr_filter == LFACE_EXTEND_INDEX)
face_id_ptr = &(it->extend_face_id);
else
face_id_ptr = &(it->face_id);
if (!STRINGP (it->string))
{
new_face_id
...
...
@@ -4270,7 +4265,7 @@ handle_face_prop_general (struct it *it,
static enum prop_handled
handle_face_prop (struct it *it)
{
return handle_face_prop_general (it, 0);
return handle_face_prop_general (it,
&(it->face_id),
0);
}
...
...
@@ -20508,7 +20503,7 @@ extend_face_to_end_of_line (struct it *it)
|| WINDOW_RIGHT_MARGIN_WIDTH (it->w) > 0))
return;
handle_face_prop_general (it, LFACE_EXTEND_INDEX);
handle_face_prop_general (it,
&(it->extend_face_id),
LFACE_EXTEND_INDEX);
/* Face extension extends the background and box of IT->extend_face_id
to the end of the line. If the background equals the background
src/xfaces.c
View file @
c1dbe028
...
...
@@ -6129,11 +6129,11 @@ face_at_buffer_position (struct window *w, ptrdiff_t pos,
}
/* Begin with attributes from the default face. */
memcpy
(
attrs
,
default_face
->
lface
,
sizeof
attrs
);
memcpy (attrs, default_face->lface, sizeof
(
attrs)
)
;
/* Merge in attributes specified via text properties. */
if (!NILP (prop))
merge_face_ref
(
w
,
f
,
prop
,
attrs
,
true
,
NULL
,
0
);
merge_face_ref (w, f, prop, attrs, true, NULL,
attr_filter
);
/* Now merge the overlay data. */
noverlays = sort_overlays (overlay_vec, noverlays, w);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment