Mercurial > emacs
diff src/dispextern.h @ 83231:549734260e34
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
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 08 Dec 2004 22:20:27 +0000 |
| parents | d8738586aaec be0cfc84ea0f |
| children | 223c12363c0c |
line wrap: on
line diff
--- a/src/dispextern.h Sun Nov 28 14:39:06 2004 +0000 +++ b/src/dispextern.h Wed Dec 08 22:20:27 2004 +0000 @@ -974,7 +974,7 @@ 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 @@ /* 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 @@ 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));