From 983f1af9dde017d0d22bcc6c2b3c7fc22aae7bb9 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 29 Sep 2004 11:58:05 +0000 Subject: [PATCH] (handle_single_display_prop): Use lookup_fringe_bitmap. --- src/xdisp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/xdisp.c b/src/xdisp.c index 2577bc46efb..ddd247b3430 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -307,7 +307,6 @@ extern Lisp_Object Qheight; 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 @@ handle_single_display_prop (it, prop, object, position, && 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 @@ handle_single_display_prop (it, prop, object, position, #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 @@ handle_single_display_prop (it, prop, object, position, 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 */ -- 2.39.2