Mercurial > emacs
changeset 57271:4d3c89d6b88d
(handle_single_display_prop): Use lookup_fringe_bitmap.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 29 Sep 2004 11:58:05 +0000 |
| parents | bb98cba59362 |
| children | 3b33351faee0 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Wed Sep 29 11:57:48 2004 +0000 +++ b/src/xdisp.c Wed Sep 29 11:58:05 2004 +0000 @@ -307,7 +307,6 @@ 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. */ @@ -3569,6 +3568,7 @@ && 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. */ @@ -3580,8 +3580,7 @@ #ifdef HAVE_WINDOW_SYSTEM value = XCAR (XCDR (prop)); if (!SYMBOLP (value) - || (value = Fget (value, Qfringe), - !valid_fringe_bitmap_p (value))) + || !(fringe_bitmap = lookup_fringe_bitmap (value))) return 0; if (CONSP (XCDR (XCDR (prop)))) @@ -3610,12 +3609,12 @@ if (EQ (XCAR (prop), Qleft_fringe)) { - it->left_user_fringe_bitmap = XINT (value); + it->left_user_fringe_bitmap = fringe_bitmap; it->left_user_fringe_face_id = face_id; } else { - it->right_user_fringe_bitmap = XINT (value); + it->right_user_fringe_bitmap = fringe_bitmap; it->right_user_fringe_face_id = face_id; } #endif /* HAVE_WINDOW_SYSTEM */