From: Eli Zaretskii Date: Sun, 23 May 2010 16:57:15 +0000 (+0300) Subject: dispextern.h (init_iterator): Sync prototype with changed definition. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~205^2~4 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8c315d13db58ad60843b22c0c250eeb62abef77;p=emacs.git dispextern.h (init_iterator): Sync prototype with changed definition. --- diff --git a/src/ChangeLog b/src/ChangeLog index eb71ddf9377..a8511a358cd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-05-23 Eli Zaretskii + + * dispextern.h (init_iterator): Sync prototype with changed + definition. + 2010-05-19 Eli Zaretskii Redesign and reimplement bidi-aware edge positions of glyph rows. diff --git a/src/dispextern.h b/src/dispextern.h index ce8527b92de..af262a05633 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -2911,8 +2911,8 @@ void mark_window_display_accurate P_ ((Lisp_Object, int)); 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 *));