Mercurial > emacs
comparison src/dispextern.h @ 90054:f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 08 Dec 2004 05:02:30 +0000 |
parents | b637c617432f be0cfc84ea0f |
children | 95879cc1ed20 |
comparison
equal
deleted
inserted
replaced
90053:fff5f1a61d92 | 90054:f2ebccfa87d4 |
---|---|
972 /* Non-zero if ROW ends in the middle of a character. This is the | 972 /* Non-zero if ROW ends in the middle of a character. This is the |
973 case for continued lines showing only part of a display table entry | 973 case for continued lines showing only part of a display table entry |
974 or a control char, or an overlay string. */ | 974 or a control char, or an overlay string. */ |
975 | 975 |
976 #define MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P(ROW) \ | 976 #define MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P(ROW) \ |
977 ((ROW)->end.dpvec_index >= 0 \ | 977 ((ROW)->end.dpvec_index > 0 \ |
978 || (ROW)->end.overlay_string_index >= 0 \ | 978 || (ROW)->end.overlay_string_index >= 0 \ |
979 || (ROW)->ends_in_middle_of_char_p) | 979 || (ROW)->ends_in_middle_of_char_p) |
980 | 980 |
981 /* Non-zero if ROW ends in the middle of an overlay string. */ | 981 /* Non-zero if ROW ends in the middle of an overlay string. */ |
982 | 982 |
984 ((ROW)->end.overlay_string_index >= 0) | 984 ((ROW)->end.overlay_string_index >= 0) |
985 | 985 |
986 /* Non-zero if ROW starts in the middle of a character. See above. */ | 986 /* Non-zero if ROW starts in the middle of a character. See above. */ |
987 | 987 |
988 #define MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P(ROW) \ | 988 #define MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P(ROW) \ |
989 ((ROW)->start.dpvec_index >= 0 \ | 989 ((ROW)->start.dpvec_index > 0 \ |
990 || (ROW)->starts_in_middle_of_char_p \ | 990 || (ROW)->starts_in_middle_of_char_p \ |
991 || ((ROW)->start.overlay_string_index >= 0 \ | 991 || ((ROW)->start.overlay_string_index >= 0 \ |
992 && (ROW)->start.string_pos.charpos > 0)) | 992 && (ROW)->start.string_pos.charpos > 0)) |
993 | 993 |
994 /* Non-zero means ROW overlaps its predecessor. */ | 994 /* Non-zero means ROW overlaps its predecessor. */ |
2735 int ascii_face_of_lisp_face P_ ((struct frame *, int)); | 2735 int ascii_face_of_lisp_face P_ ((struct frame *, int)); |
2736 void prepare_face_for_display P_ ((struct frame *, struct face *)); | 2736 void prepare_face_for_display P_ ((struct frame *, struct face *)); |
2737 int xstricmp P_ ((const unsigned char *, const unsigned char *)); | 2737 int xstricmp P_ ((const unsigned char *, const unsigned char *)); |
2738 int lookup_face P_ ((struct frame *, Lisp_Object *)); | 2738 int lookup_face P_ ((struct frame *, Lisp_Object *)); |
2739 int lookup_non_ascii_face P_ ((struct frame *, int, struct face *)); | 2739 int lookup_non_ascii_face P_ ((struct frame *, int, struct face *)); |
2740 int lookup_named_face P_ ((struct frame *, Lisp_Object)); | 2740 int lookup_named_face P_ ((struct frame *, Lisp_Object, int)); |
2741 int smaller_face P_ ((struct frame *, int, int)); | 2741 int smaller_face P_ ((struct frame *, int, int)); |
2742 int face_with_height P_ ((struct frame *, int, int)); | 2742 int face_with_height P_ ((struct frame *, int, int)); |
2743 int lookup_derived_face P_ ((struct frame *, Lisp_Object, int)); | 2743 int lookup_derived_face P_ ((struct frame *, Lisp_Object, int)); |
2744 void init_frame_faces P_ ((struct frame *)); | 2744 void init_frame_faces P_ ((struct frame *)); |
2745 void free_frame_faces P_ ((struct frame *)); | 2745 void free_frame_faces P_ ((struct frame *)); |