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

[Kim F . Storm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.940 emacs/src/xdisp.c:1.941
*** emacs/src/xdisp.c:1.940     Sun Nov 21 15:47:55 2004
--- emacs/src/xdisp.c   Mon Nov 22 23:26:02 2004
***************
*** 3575,3581 ****
              || EQ (XCAR (prop), Qright_fringe))
          && CONSP (XCDR (prop)))
        {
!         unsigned face_id = DEFAULT_FACE_ID;
          int fringe_bitmap;
  
          /* Save current settings of IT so that we can restore them
--- 3575,3581 ----
              || EQ (XCAR (prop), Qright_fringe))
          && CONSP (XCDR (prop)))
        {
!         int face_id = DEFAULT_FACE_ID;
          int fringe_bitmap;
  
          /* Save current settings of IT so that we can restore them
***************
*** 3594,3603 ****
          if (CONSP (XCDR (XCDR (prop))))
            {
              Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));
! 
!             face_id = lookup_named_face (it->f, face_name, 'A');
!             if (face_id < 0)
!               return 0;
            }
  
          push_it (it);
--- 3594,3602 ----
          if (CONSP (XCDR (XCDR (prop))))
            {
              Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));
!             int face_id2 = lookup_named_face (it->f, face_name, 'A', 0);
!             if (face_id2 >= 0)
!               face_id = face_id2;
            }
  
          push_it (it);
***************
*** 14534,14540 ****
                  && glyph->u.ch == ' '))
          && trailing_whitespace_p (glyph->charpos))
        {
!         int face_id = lookup_named_face (f, Qtrailing_whitespace, 0);
  
          while (glyph >= start
                 && BUFFERP (glyph->object)
--- 14533,14541 ----
                  && glyph->u.ch == ' '))
          && trailing_whitespace_p (glyph->charpos))
        {
!         int face_id = lookup_named_face (f, Qtrailing_whitespace, 0, 0);
!         if (face_id < 0)
!           return;
  
          while (glyph >= start
                 && BUFFERP (glyph->object)
***************
*** 18808,18814 ****
        struct face *face;
        struct font_info *font_info;
  
!       face_id = lookup_named_face (it->f, face_name, ' ');
        if (face_id < 0)
        return make_number (-1);
  
--- 18809,18815 ----
        struct face *face;
        struct font_info *font_info;
  
!       face_id = lookup_named_face (it->f, face_name, ' ', 0);
        if (face_id < 0)
        return make_number (-1);