Mercurial > emacs

diff src/dispextern.h @ 90054:f2ebccfa87d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/dispextern.h	Mon Dec 06 12:38:25 2004 +0000
+++ b/src/dispextern.h	Wed Dec 08 05:02:30 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))
@@ -2737,7 +2737,7 @@
 int xstricmp P_ ((const unsigned char *, const unsigned char *));
 int lookup_face P_ ((struct frame *, Lisp_Object *));
 int lookup_non_ascii_face P_ ((struct frame *, int, struct face *));
-int lookup_named_face P_ ((struct frame *, Lisp_Object));
+int lookup_named_face P_ ((struct frame *, Lisp_Object, 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));