[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c |
Date: |
Tue, 19 Apr 2005 06:11:41 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.999 emacs/src/xdisp.c:1.1000
*** emacs/src/xdisp.c:1.999 Mon Apr 18 14:10:09 2005
--- emacs/src/xdisp.c Tue Apr 19 10:11:41 2005
***************
*** 2706,2711 ****
--- 2706,2715 ----
it->dpvec = NULL;
it->current.dpvec_index = -1;
+ /* Use face of preceding text for ellipsis (if invisible) */
+ if (it->selective_display_ellipsis_p)
+ it->saved_face_id = it->face_id;
+
do
{
handled = HANDLED_NORMALLY;
***************
*** 3382,3390 ****
--- 3386,3397 ----
it->current.dpvec_index = 0;
it->dpvec_face_id = -1;
+ #if 0 /* Already saved in handle_stop */
/* Remember the current face id in case glyphs specify faces.
IT's face is restored in set_iterator_to_next. */
it->saved_face_id = it->face_id;
+ #endif
+
it->method = GET_FROM_DISPLAY_VECTOR;
it->ellipsis_p = 1;
}
***************
*** 5423,5428 ****
--- 5430,5437 ----
/* Precondition. */
xassert (it->dpvec && it->current.dpvec_index >= 0);
+ it->face_id = it->saved_face_id;
+
if (INTEGERP (*it->dpvec)
&& GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec)))
{
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2005/04/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/18
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Kim F . Storm <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/19
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Miles Bader, 2005/04/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/04/21