diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2004-12-08 22:20:27 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2004-12-08 22:20:27 +0000 |
| commit | 0962f73818948f42de87f42dae27978a235c713d (patch) | |
| tree | 01c56e7d5ec80458a9a733ca2b571fa046235f0d /src/dispextern.h | |
| parent | a097d7922cba96a274533fbf01dbe69a9250e02f (diff) | |
| parent | ec5ec7d7a17f1cc68fcaa468233b0da163b17593 (diff) | |
| download | emacs-0962f73818948f42de87f42dae27978a235c713d.tar.gz | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-714
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-271
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 99cf38249ac..d3d70b28cf8 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -974,7 +974,7 @@ struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); or a control char, or an overlay string. */ #define MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P(ROW) \ - ((ROW)->end.dpvec_index >= 0 \ + ((ROW)->end.dpvec_index > 0 \ || (ROW)->end.overlay_string_index >= 0 \ || (ROW)->ends_in_middle_of_char_p) @@ -986,7 +986,7 @@ struct glyph_row *matrix_row P_ ((struct glyph_matrix *, int)); /* Non-zero if ROW starts in the middle of a character. See above. */ #define MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P(ROW) \ - ((ROW)->start.dpvec_index >= 0 \ + ((ROW)->start.dpvec_index > 0 \ || (ROW)->starts_in_middle_of_char_p \ || ((ROW)->start.overlay_string_index >= 0 \ && (ROW)->start.string_pos.charpos > 0)) @@ -2730,7 +2730,7 @@ int ascii_face_of_lisp_face P_ ((struct frame *, int)); void prepare_face_for_display P_ ((struct frame *, struct face *)); int xstricmp P_ ((const unsigned char *, const unsigned char *)); int lookup_face P_ ((struct frame *, Lisp_Object *, int, struct face *)); -int lookup_named_face P_ ((struct frame *, Lisp_Object, int)); +int lookup_named_face P_ ((struct frame *, Lisp_Object, int, int)); int smaller_face P_ ((struct frame *, int, int)); int face_with_height P_ ((struct frame *, int, int)); int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int)); |