aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-05-23 19:57:15 +0300
committerEli Zaretskii2010-05-23 19:57:15 +0300
commitd8c315d13db58ad60843b22c0c250eeb62abef77 (patch)
treebd87832673ba8fab7af8873ace5caea02eae15f0 /src
parent1111783029f1d7f50c348d1836ec56c62fb344c2 (diff)
downloademacs-d8c315d13db58ad60843b22c0c250eeb62abef77.tar.gz
emacs-d8c315d13db58ad60843b22c0c250eeb62abef77.zip
dispextern.h (init_iterator): Sync prototype with changed definition.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dispextern.h4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eb71ddf9377..a8511a358cd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-05-23 Eli Zaretskii <eliz@gnu.org>
2
3 * dispextern.h (init_iterator): Sync prototype with changed
4 definition.
5
12010-05-19 Eli Zaretskii <eliz@gnu.org> 62010-05-19 Eli Zaretskii <eliz@gnu.org>
2 7
3 Redesign and reimplement bidi-aware edge positions of glyph rows. 8 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));
2911void redisplay_preserve_echo_area P_ ((int)); 2911void redisplay_preserve_echo_area P_ ((int));
2912int set_cursor_from_row P_ ((struct window *, struct glyph_row *, 2912int set_cursor_from_row P_ ((struct window *, struct glyph_row *,
2913 struct glyph_matrix *, int, int, int, int)); 2913 struct glyph_matrix *, int, int, int, int));
2914void init_iterator P_ ((struct it *, struct window *, int, 2914void init_iterator P_ ((struct it *, struct window *, EMACS_INT,
2915 int, struct glyph_row *, enum face_id)); 2915 EMACS_INIT, struct glyph_row *, enum face_id));
2916void init_iterator_to_row_start P_ ((struct it *, struct window *, 2916void init_iterator_to_row_start P_ ((struct it *, struct window *,
2917 struct glyph_row *)); 2917 struct glyph_row *));
2918int get_next_display_element P_ ((struct it *)); 2918int get_next_display_element P_ ((struct it *));