[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [emacs-unicode-2] |
Date: |
Wed, 29 Sep 2004 21:43:37 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.843.2.24 emacs/src/xdisp.c:1.843.2.25
*** emacs/src/xdisp.c:1.843.2.24 Wed Sep 29 07:22:18 2004
--- emacs/src/xdisp.c Thu Sep 30 01:20:35 2004
***************
*** 308,314 ****
extern Lisp_Object QCwidth, QCheight, QCascent;
extern Lisp_Object Qscroll_bar;
extern Lisp_Object Qcursor;
- extern Lisp_Object Qfringe;
/* Non-nil means highlight trailing whitespace. */
--- 308,313 ----
***************
*** 3572,3577 ****
--- 3571,3577 ----
&& CONSP (XCDR (prop)))
{
unsigned face_id = DEFAULT_FACE_ID;
+ int fringe_bitmap;
/* Save current settings of IT so that we can restore them
when we are finished with the glyph property value. */
***************
*** 3583,3590 ****
#ifdef HAVE_WINDOW_SYSTEM
value = XCAR (XCDR (prop));
if (!SYMBOLP (value)
! || (value = Fget (value, Qfringe),
! !valid_fringe_bitmap_p (value)))
return 0;
if (CONSP (XCDR (XCDR (prop))))
--- 3583,3589 ----
#ifdef HAVE_WINDOW_SYSTEM
value = XCAR (XCDR (prop));
if (!SYMBOLP (value)
! || !(fringe_bitmap = lookup_fringe_bitmap (value)))
return 0;
if (CONSP (XCDR (XCDR (prop))))
***************
*** 3613,3624 ****
if (EQ (XCAR (prop), Qleft_fringe))
{
! it->left_user_fringe_bitmap = XINT (value);
it->left_user_fringe_face_id = face_id;
}
else
{
! it->right_user_fringe_bitmap = XINT (value);
it->right_user_fringe_face_id = face_id;
}
#endif /* HAVE_WINDOW_SYSTEM */
--- 3612,3623 ----
if (EQ (XCAR (prop), Qleft_fringe))
{
! it->left_user_fringe_bitmap = fringe_bitmap;
it->left_user_fringe_face_id = face_id;
}
else
{
! it->right_user_fringe_bitmap = fringe_bitmap;
it->right_user_fringe_face_id = face_id;
}
#endif /* HAVE_WINDOW_SYSTEM */