# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1096459085 0
# Node ID 4d3c89d6b88d56a4da160b3e9fb3d3392efe71d2
# Parent  bb98cba5936224bc27f6ad07d21adcecb547ba04
(handle_single_display_prop): Use lookup_fringe_bitmap.

diff -r bb98cba59362 -r 4d3c89d6b88d src/xdisp.c
--- 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 */