Mercurial > emacs

diff src/xdisp.c @ 89991:6c1af301b455

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-48 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581 Fix exec-shield autoconf test * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38 Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 30 Sep 2004 01:20:39 +0000
parents e23928ac5a97 4d3c89d6b88d
children 66fccc455c7a
line wrap: on
line diff
--- a/src/xdisp.c	Wed Sep 29 09:54:59 2004 +0000
+++ b/src/xdisp.c	Thu Sep 30 01:20:39 2004 +0000
@@ -308,7 +308,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.  */
 
@@ -3572,6 +3571,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.  */
@@ -3583,8 +3583,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))))
@@ -3613,12 +3612,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 */