summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJimmy Aguilar Mena <spacibba@aol.com>2019-05-05 16:14:34 +0200
committerJimmy Aguilar Mena <spacibba@aol.com>2019-05-05 16:59:25 +0200
commitcca81f22d972f4bfc953534104e9e72da421f51e (patch)
treebd03de18056f37ce1da42b46a792739909202856 /src
parenta336300ccf024824fbf50298623e04f369952670 (diff)
downloademacs-cca81f22d972f4bfc953534104e9e72da421f51e.tar.gz
Fixed fill-column-indicator face removing background.
*lisp/faces.el: Removed background in default fill-column-indicator face. *src/xdisp.c: fill-column-indicator face merged with saved face.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 17827481447..a8604d58af7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20201,7 +20201,7 @@ append_space_for_newline (struct it *it, bool default_face_p)
XFIXNAT (Vdisplay_fill_column_indicator_character);
it->face_id =
merge_faces (it->w, Qfill_column_indicator,
- 0, DEFAULT_FACE_ID);
+ 0, saved_face_id);
face = FACE_FROM_ID(it->f, it->face_id);
goto produce_glyphs;
}
@@ -20494,7 +20494,7 @@ extend_face_to_end_of_line (struct it *it)
XFIXNAT (Vdisplay_fill_column_indicator_character);
it->face_id =
merge_faces (it->w, Qfill_column_indicator,
- 0, DEFAULT_FACE_ID);
+ 0, saved_face_id);
PRODUCE_GLYPHS (it);
}
@@ -20656,13 +20656,13 @@ extend_face_to_end_of_line (struct it *it)
{
if (it->current_x == fill_column_indicator_column)
{
- const int saved_face = it->face_id;
+ const int saved_face_id = it->face_id;
it->face_id =
- merge_faces (it->w, Qfill_column_indicator, 0, DEFAULT_FACE_ID);
+ merge_faces (it->w, Qfill_column_indicator, 0, saved_face_id);
it->c = it->char_to_display =
XFIXNAT (Vdisplay_fill_column_indicator_character);
PRODUCE_GLYPHS (it);
- it->face_id = saved_face;
+ it->face_id = saved_face_id;
it->c = it->char_to_display = ' ';
}
else