[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind] |
Date: |
Wed, 06 Oct 2004 01:42:49 -0400 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.754.2.32 emacs/src/xdisp.c:1.754.2.33
*** emacs/src/xdisp.c:1.754.2.32 Wed Oct 6 05:21:55 2004
--- emacs/src/xdisp.c Wed Oct 6 05:23:55 2004
***************
*** 3568,3573 ****
--- 3568,3574 ----
&& 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. */
***************
*** 3578,3585 ****
#ifdef HAVE_WINDOW_SYSTEM
value = XCAR (XCDR (prop));
! if (!NUMBERP (value)
! || !valid_fringe_bitmap_id_p (XINT (value)))
return 0;
if (CONSP (XCDR (XCDR (prop))))
--- 3579,3586 ----
#ifdef HAVE_WINDOW_SYSTEM
value = XCAR (XCDR (prop));
! if (!SYMBOLP (value)
! || !(fringe_bitmap = lookup_fringe_bitmap (value)))
return 0;
if (CONSP (XCDR (XCDR (prop))))
***************
*** 3608,3619 ****
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 */
--- 3609,3620 ----
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 */
- [Emacs-diffs] Changes to emacs/src/xdisp.c [lexbind],
Miles Bader <=