/[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.940 by kfstorm, Sun Nov 21 15:47:55 2004 UTC revision 1.941 by kfstorm, Mon Nov 22 23:26:02 2004 UTC
# Line 3575  handle_single_display_prop (it, prop, ob Line 3575  handle_single_display_prop (it, prop, ob
3575                || EQ (XCAR (prop), Qright_fringe))                || EQ (XCAR (prop), Qright_fringe))
3576            && CONSP (XCDR (prop)))            && CONSP (XCDR (prop)))
3577          {          {
3578            unsigned face_id = DEFAULT_FACE_ID;            int face_id = DEFAULT_FACE_ID;
3579            int fringe_bitmap;            int fringe_bitmap;
3580    
3581            /* Save current settings of IT so that we can restore them            /* Save current settings of IT so that we can restore them
# Line 3594  handle_single_display_prop (it, prop, ob Line 3594  handle_single_display_prop (it, prop, ob
3594            if (CONSP (XCDR (XCDR (prop))))            if (CONSP (XCDR (XCDR (prop))))
3595              {              {
3596                Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));                Lisp_Object face_name = XCAR (XCDR (XCDR (prop)));
3597                  int face_id2 = lookup_named_face (it->f, face_name, 'A', 0);
3598                face_id = lookup_named_face (it->f, face_name, 'A');                if (face_id2 >= 0)
3599                if (face_id < 0)                  face_id = face_id2;
                 return 0;  
3600              }              }
3601    
3602            push_it (it);            push_it (it);
# Line 14534  highlight_trailing_whitespace (f, row) Line 14533  highlight_trailing_whitespace (f, row)
14533                    && glyph->u.ch == ' '))                    && glyph->u.ch == ' '))
14534            && trailing_whitespace_p (glyph->charpos))            && trailing_whitespace_p (glyph->charpos))
14535          {          {
14536            int face_id = lookup_named_face (f, Qtrailing_whitespace, 0);            int face_id = lookup_named_face (f, Qtrailing_whitespace, 0, 0);
14537              if (face_id < 0)
14538                return;
14539    
14540            while (glyph >= start            while (glyph >= start
14541                   && BUFFERP (glyph->object)                   && BUFFERP (glyph->object)
# Line 18808  calc_line_height_property (it, prop, fon Line 18809  calc_line_height_property (it, prop, fon
18809        struct face *face;        struct face *face;
18810        struct font_info *font_info;        struct font_info *font_info;
18811    
18812        face_id = lookup_named_face (it->f, face_name, ' ');        face_id = lookup_named_face (it->f, face_name, ' ', 0);
18813        if (face_id < 0)        if (face_id < 0)
18814          return make_number (-1);          return make_number (-1);
18815    

Legend:
Removed from v.1.940  
changed lines
  Added in v.1.941

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