[Emacs-diffs] /srv/bzr/emacs/trunk r100418: dispextern.h (init_iterator): Sync prototype with changed definition.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100418
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2010-05-23 19:57:15 +0300
message:
   dispextern.h (init_iterator): Sync prototype with changed definition.
modified:
  src/ChangeLog
  src/dispextern.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-22 19:32:21 +0000
+++ b/src/ChangeLog     2010-05-23 16:57:15 +0000
@@ -1,3 +1,8 @@
+2010-05-23  Eli Zaretskii  <address@hidden>
+
+       * dispextern.h (init_iterator): Sync prototype with changed
+       definition.
+
 2010-05-19  Eli Zaretskii  <address@hidden>
 
        Redesign and reimplement bidi-aware edge positions of glyph rows.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2010-05-18 15:22:15 +0000
+++ b/src/dispextern.h  2010-05-23 16:57:15 +0000
@@ -2911,8 +2911,8 @@
 void redisplay_preserve_echo_area P_ ((int));
 int set_cursor_from_row P_ ((struct window *, struct glyph_row *,
                             struct glyph_matrix *, int, int, int, int));
-void init_iterator P_ ((struct it *, struct window *, int,
-                       int, struct glyph_row *, enum face_id));
+void init_iterator P_ ((struct it *, struct window *, EMACS_INT,
+                       EMACS_INIT, struct glyph_row *, enum face_id));
 void init_iterator_to_row_start P_ ((struct it *, struct window *,
                                     struct glyph_row *));
 int get_next_display_element P_ ((struct it *));