[Emacs-diffs] Changes to emacs/src/xdisp.c

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.910 emacs/src/xdisp.c:1.911
*** emacs/src/xdisp.c:1.910     Tue Sep 28 23:02:41 2004
--- emacs/src/xdisp.c   Wed Sep 29 11:58:05 2004
***************
*** 307,313 ****
  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.  */
  
--- 307,312 ----
***************
*** 3569,3574 ****
--- 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.  */
***************
*** 3580,3587 ****
  #ifdef HAVE_WINDOW_SYSTEM
          value = XCAR (XCDR (prop));
          if (!SYMBOLP (value)
!             || (value = Fget (value, Qfringe),
!                 !valid_fringe_bitmap_p (value)))
            return 0;
  
          if (CONSP (XCDR (XCDR (prop))))
--- 3580,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))))
***************
*** 3610,3621 ****
  
          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 */