aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJimmy Aguilar Mena2019-12-22 23:46:39 +0100
committerEli Zaretskii2019-12-23 15:33:25 +0200
commit0abdb01be6c1adee1f179b1d5f7a9fb4ee670109 (patch)
tree6fc8b9b669e6e83d6b8fa3cb5c1cd3b5e223df76 /src
parent9c007950076c56b408b7c041ad362235c8d71873 (diff)
downloademacs-0abdb01be6c1adee1f179b1d5f7a9fb4ee670109.tar.gz
emacs-0abdb01be6c1adee1f179b1d5f7a9fb4ee670109.zip
Fix extension of underline, overline, and strike-through attributes
* src/xdisp.c (extend_face_to_end_of_line): Don't return early if face attributes beyond background color and box are set, since that means these attributes need to be extended past the EOL.
Diffstat (limited to 'src')
-rw-r--r--src/xdisp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index 2dfc4cbfeb4..3080f8920a3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -21624,6 +21624,9 @@ extend_face_to_end_of_line (struct it *it)
21624 if (FRAME_WINDOW_P (f) 21624 if (FRAME_WINDOW_P (f)
21625 && MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row) 21625 && MATRIX_ROW_DISPLAYS_TEXT_P (it->glyph_row)
21626 && face->box == FACE_NO_BOX 21626 && face->box == FACE_NO_BOX
21627 && face->underline == FACE_NO_UNDERLINE
21628 && !face->overline_p
21629 && !face->strike_through_p
21627 && FACE_COLOR_TO_PIXEL (face->background, f) == FRAME_BACKGROUND_PIXEL (f) 21630 && FACE_COLOR_TO_PIXEL (face->background, f) == FRAME_BACKGROUND_PIXEL (f)
21628#ifdef HAVE_WINDOW_SYSTEM 21631#ifdef HAVE_WINDOW_SYSTEM
21629 && !face->stipple 21632 && !face->stipple