summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-01-07 18:45:42 +0200
committerEli Zaretskii <eliz@gnu.org>2016-01-07 18:45:42 +0200
commit056da45d2c9a82c3ad8f0c2d3e16bb4864aa7838 (patch)
tree18b730100cd8f159df19e18ca68014a4d3021bd0
parent269d0088a89806f527180aba6fe23860ae916623 (diff)
downloademacs-056da45d2c9a82c3ad8f0c2d3e16bb4864aa7838.tar.gz
; Improve commentary in 'setup_for_ellipsis'
* src/xdisp.c (setup_for_ellipsis): Improve commentary for when we reset the ellipsis face to the default face.
-rw-r--r--src/xdisp.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index ee748bd8680..87a92fce0f0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4583,9 +4583,12 @@ setup_for_ellipsis (struct it *it, int len)
it->current.dpvec_index = 0;
it->dpvec_face_id = -1;
- /* Remember the current face id in case glyphs specify faces.
- IT's face is restored in set_iterator_to_next.
- saved_face_id was set to preceding char's face in handle_stop. */
+ /* Reset the current face ID to default if the last visible
+ character and the first invisible character have different faces.
+ IT->saved_face_id was set in handle_stop to the face of the
+ preceding character, and will be different from IT->face_id only
+ if the invisible text skipped in handle_invisible_prop has some
+ non-default face. IT's face is restored in set_iterator_to_next. */
if (it->saved_face_id < 0 || it->saved_face_id != it->face_id)
it->saved_face_id = it->face_id = DEFAULT_FACE_ID;