/[emacs]/emacs/src/xdisp.c
ViewVC logotype

Diff of /emacs/src/xdisp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.843.2.24 by miles, Wed Sep 29 07:22:18 2004 UTC revision 1.843.2.25 by miles, Thu Sep 30 01:20:35 2004 UTC
# Line 308  extern Lisp_Object Qheight; Line 308  extern Lisp_Object Qheight;
308  extern Lisp_Object QCwidth, QCheight, QCascent;  extern Lisp_Object QCwidth, QCheight, QCascent;
309  extern Lisp_Object Qscroll_bar;  extern Lisp_Object Qscroll_bar;
310  extern Lisp_Object Qcursor;  extern Lisp_Object Qcursor;
 extern Lisp_Object Qfringe;  
311    
312  /* Non-nil means highlight trailing whitespace.  */  /* Non-nil means highlight trailing whitespace.  */
313    
# Line 3572  handle_single_display_prop (it, prop, ob Line 3571  handle_single_display_prop (it, prop, ob
3571            && CONSP (XCDR (prop)))            && CONSP (XCDR (prop)))
3572          {          {
3573            unsigned face_id = DEFAULT_FACE_ID;            unsigned face_id = DEFAULT_FACE_ID;
3574              int fringe_bitmap;
3575    
3576            /* Save current settings of IT so that we can restore them            /* Save current settings of IT so that we can restore them
3577               when we are finished with the glyph property value.  */               when we are finished with the glyph property value.  */
# Line 3583  handle_single_display_prop (it, prop, ob Line 3583  handle_single_display_prop (it, prop, ob
3583  #ifdef HAVE_WINDOW_SYSTEM  #ifdef HAVE_WINDOW_SYSTEM
3584            value = XCAR (XCDR (prop));            value = XCAR (XCDR (prop));
3585            if (!SYMBOLP (value)            if (!SYMBOLP (value)
3586                || (value = Fget (value, Qfringe),                || !(fringe_bitmap = lookup_fringe_bitmap (value)))
                   !valid_fringe_bitmap_p (value)))  
3587              return 0;              return 0;
3588    
3589            if (CONSP (XCDR (XCDR (prop))))            if (CONSP (XCDR (XCDR (prop))))
# Line 3613  handle_single_display_prop (it, prop, ob Line 3612  handle_single_display_prop (it, prop, ob
3612    
3613            if (EQ (XCAR (prop), Qleft_fringe))            if (EQ (XCAR (prop), Qleft_fringe))
3614              {              {
3615                it->left_user_fringe_bitmap = XINT (value);                it->left_user_fringe_bitmap = fringe_bitmap;
3616                it->left_user_fringe_face_id = face_id;                it->left_user_fringe_face_id = face_id;
3617              }              }
3618            else            else
3619              {              {
3620                it->right_user_fringe_bitmap = XINT (value);                it->right_user_fringe_bitmap = fringe_bitmap;
3621                it->right_user_fringe_face_id = face_id;                it->right_user_fringe_face_id = face_id;
3622              }              }
3623  #endif /* HAVE_WINDOW_SYSTEM */  #endif /* HAVE_WINDOW_SYSTEM */

Legend:
Removed from v.1.843.2.24  
changed lines
  Added in v.1.843.2.25

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26