(Fset_char_table_parent): Doc fix.

[bpt/emacs.git] / src / dispextern.h

diff --git a/src/dispextern.h b/src/dispextern.h
index 3fc33f5..01d8324 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1778,6 +1778,10 @@ struct it
      thus we need at most 16 bytes here.  */
   Lisp_Object ctl_chars[16];
 
+  /* Initial buffer or string position of the iterator, before skipping
+     over display properties and invisible text.  */
+  struct display_pos start;
+
   /* Current buffer or string position of the iterator, including
      position in overlay strings etc.  */
   struct display_pos current;
@@ -1964,6 +1968,9 @@ struct it
      glyph_row in move_it_to and display_line.  */
   int current_y;
 
+  /* Vertical matrix position of first text line in window.  */
+  int first_vpos;
+
   /* Current vertical matrix position, or line number.  Automatically
      incremented by move_it_to and display_line.  */
   int vpos;
@@ -2655,9 +2662,9 @@ int popup_activated P_ ((void));
 extern int inverse_video;
 extern int required_matrix_width P_ ((struct window *));
 extern int required_matrix_height P_ ((struct window *));
-extern Lisp_Object mode_line_string P_ ((struct window *, int, int,
+extern Lisp_Object mode_line_string P_ ((struct window *, int *, int *,
                                         enum window_part, int *));
-extern Lisp_Object marginal_area_string P_ ((struct window *, int, int,
+extern Lisp_Object marginal_area_string P_ ((struct window *, int *, int *,
                                             enum window_part, int *));
 extern void redraw_frame P_ ((struct frame *));
 extern void redraw_garbaged_frames P_ ((void));
@@ -2778,3 +2785,6 @@ extern Lisp_Object x_default_parameter P_ ((struct frame *, Lisp_Object,
 #endif /* HAVE_WINDOW_SYSTEM */
 
 #endif /* not DISPEXTERN_H_INCLUDED */
+
+/* arch-tag: c65c475f-1c1e-4534-8795-990b8509fd65
+   (do not change this comment) */