aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDmitry Antipov2013-05-21 09:27:33 +0400
committerDmitry Antipov2013-05-21 09:27:33 +0400
commitecc3c6edd7422fa14b525461d0b5c288690b9b89 (patch)
tree336b4006279f496d43cea57dbb201d748d6a0892 /src
parent195eea0f0b1dfe11ddc87117ec4e486379588be7 (diff)
downloademacs-ecc3c6edd7422fa14b525461d0b5c288690b9b89.tar.gz
emacs-ecc3c6edd7422fa14b525461d0b5c288690b9b89.zip
* xdisp.c (reseat_at_previous_visible_line_start):
Already declared in dispextern.h, so remove it here. (move_it_vertically_backward): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 88a9405786b..f9925abb9ef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-05-21 Dmitry Antipov <dmantipov@yandex.ru>
2
3 * xdisp.c (reseat_at_previous_visible_line_start):
4 Already declared in dispextern.h, so remove it here.
5 (move_it_vertically_backward): Likewise.
6
12013-05-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 72013-05-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 8
3 * xfns.c (check_x_display_info): Don't use XINT for terminal object. 9 * xfns.c (check_x_display_info): Don't use XINT for terminal object.
diff --git a/src/xdisp.c b/src/xdisp.c
index 3f7e8610a09..5e92f3643c0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -881,7 +881,6 @@ static void next_overlay_string (struct it *);
881static void reseat (struct it *, struct text_pos, int); 881static void reseat (struct it *, struct text_pos, int);
882static void reseat_1 (struct it *, struct text_pos, int); 882static void reseat_1 (struct it *, struct text_pos, int);
883static void back_to_previous_visible_line_start (struct it *); 883static void back_to_previous_visible_line_start (struct it *);
884void reseat_at_previous_visible_line_start (struct it *);
885static void reseat_at_next_visible_line_start (struct it *, int); 884static void reseat_at_next_visible_line_start (struct it *, int);
886static int next_element_from_ellipsis (struct it *); 885static int next_element_from_ellipsis (struct it *);
887static int next_element_from_display_vector (struct it *); 886static int next_element_from_display_vector (struct it *);
@@ -900,7 +899,6 @@ static int get_next_display_element (struct it *);
900static enum move_it_result 899static enum move_it_result
901 move_it_in_display_line_to (struct it *, ptrdiff_t, int, 900 move_it_in_display_line_to (struct it *, ptrdiff_t, int,
902 enum move_operation_enum); 901 enum move_operation_enum);
903void move_it_vertically_backward (struct it *, int);
904static void get_visually_first_element (struct it *); 902static void get_visually_first_element (struct it *);
905static void init_to_row_start (struct it *, struct window *, 903static void init_to_row_start (struct it *, struct window *,
906 struct glyph_row *); 904 struct glyph_row *);