[Emacs-diffs] Changes to emacs/src/dispextern.h,v [EMACS_22_BASE]

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/11/03 03:46:57

Index: dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.225.2.3
retrieving revision 1.225.2.4
diff -u -b -r1.225.2.3 -r1.225.2.4
--- dispextern.h        2 Sep 2007 16:58:49 -0000       1.225.2.3
+++ dispextern.h        3 Nov 2007 03:46:57 -0000       1.225.2.4
@@ -1808,6 +1808,9 @@
   Lisp_Object height;
 };
 
+/* Input sources for fetching characters or data to display.
+   The input source is found in the `method' field.  */
+
 enum it_method {
   GET_FROM_BUFFER = 0,
   GET_FROM_DISPLAY_VECTOR,
@@ -2856,6 +2859,9 @@
 void recompute_basic_faces P_ ((struct frame *));
 int face_at_buffer_position P_ ((struct window *, int, int, int, int *,
                                 int, int));
+int face_at_buffer_position_no_overlays P_ ((struct window *, int, int,
+                                            int, int *,
+                                            int, int));
 int face_at_string_position P_ ((struct window *, Lisp_Object, int, int, int,
                                 int, int *, enum face_id, int));
 int merge_faces P_ ((struct frame *, Lisp_Object, int, int));