[Emacs-diffs] Changes to emacs/src/dispextern.h [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.153.4.9 emacs/src/dispextern.h:1.153.4.10
*** emacs/src/dispextern.h:1.153.4.9    Fri Nov 19 06:54:57 2004
--- emacs/src/dispextern.h      Wed Dec  8 05:02:18 2004
***************
*** 974,980 ****
     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.overlay_string_index >= 0         \
        || (ROW)->ends_in_middle_of_char_p)
  
--- 974,980 ----
     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.overlay_string_index >= 0         \
        || (ROW)->ends_in_middle_of_char_p)
  
***************
*** 986,992 ****
  /* 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)->starts_in_middle_of_char_p            \
        || ((ROW)->start.overlay_string_index >= 0      \
          && (ROW)->start.string_pos.charpos > 0))
--- 986,992 ----
  /* 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)->starts_in_middle_of_char_p            \
        || ((ROW)->start.overlay_string_index >= 0      \
          && (ROW)->start.string_pos.charpos > 0))
***************
*** 2737,2743 ****
  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 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));
--- 2737,2743 ----
  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));
  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));