[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: |
Mon, 10 Jan 2005 09:36:14 -0500 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.959 emacs/src/xdisp.c:1.960
*** emacs/src/xdisp.c:1.959 Sun Jan 9 22:13:11 2005
--- emacs/src/xdisp.c Mon Jan 10 13:34:53 2005
***************
*** 4978,4995 ****
if (lface_id)
{
g = FAST_GLYPH_CHAR (g);
! /* The function returns -1 if lface_id is invalid. */
! face_id = ascii_face_of_lisp_face (it->f, lface_id);
! if (face_id >= 0)
! face_id = merge_into_realized_face (it->f, Qnil,
! face_id,
it->face_id);
}
}
else
{
/* Merge the escape-glyph face into the current face. */
! face_id = merge_into_realized_face (it->f, Qescape_glyph,
! 0, it->face_id);
g = '^';
}
--- 4978,4992 ----
if (lface_id)
{
g = FAST_GLYPH_CHAR (g);
! face_id = merge_faces (it->f, Qt, lface_id,
! it->face_id);
}
}
else
{
/* Merge the escape-glyph face into the current face. */
! face_id = merge_faces (it->f, Qescape_glyph, 0,
! it->face_id);
g = '^';
}
***************
*** 5009,5026 ****
if (lface_id)
{
escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
! /* The function returns -1 if lface_id is invalid. */
! face_id = ascii_face_of_lisp_face (it->f, lface_id);
! if (face_id >= 0)
! face_id = merge_into_realized_face (it->f, Qnil,
! face_id,
it->face_id);
}
}
else
{
/* Merge the escape-glyph face into the current face. */
! face_id = merge_into_realized_face (it->f, Qescape_glyph,
! 0, it->face_id);
escape_glyph = '\\';
}
--- 5006,5020 ----
if (lface_id)
{
escape_glyph = FAST_GLYPH_CHAR (escape_glyph);
! face_id = merge_faces (it->f, Qt, lface_id,
! it->face_id);
}
}
else
{
/* Merge the escape-glyph face into the current face. */
! face_id = merge_faces (it->f, Qescape_glyph, 0,
! it->face_id);
escape_glyph = '\\';
}
***************
*** 5309,5321 ****
else
{
int lface_id = FAST_GLYPH_FACE (g);
! if (lface_id)
! {
! /* The function returns -1 if lface_id is invalid. */
! int face_id = ascii_face_of_lisp_face (it->f, lface_id);
! if (face_id >= 0)
! it->face_id = face_id;
! }
}
}
else
--- 5303,5311 ----
else
{
int lface_id = FAST_GLYPH_FACE (g);
! if (lface_id > 0)
! it->face_id = merge_faces (it->f, Qt, lface_id,
! it->saved_face_id);
}
}
else
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2005/01/04
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2005/01/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/07
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/08
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/09
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Kim F . Storm <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Stefan Monnier, 2005/01/10
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2005/01/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/13
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/22
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/22
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Steven Tamm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/24
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2005/01/26