diff options
| author | Juanma Barranquero | 2011-03-31 21:42:38 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-03-31 21:42:38 +0200 |
| commit | e2abce014d6f8d0d4a2bda66c1b554e84a0e51e6 (patch) | |
| tree | b3e32d4317471e120490bb90c76e9919c8d0b3f9 | |
| parent | d0f69533147fbe353453d6c324f650ad340f87e8 (diff) | |
| download | emacs-e2abce014d6f8d0d4a2bda66c1b554e84a0e51e6.tar.gz emacs-e2abce014d6f8d0d4a2bda66c1b554e84a0e51e6.zip | |
src/xdisp.c (redisplay_internal): Fix prototype.
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 98589b69cfb..c2e28251cb0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-03-31 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * xdisp.c (redisplay_internal): Fix prototype. | ||
| 4 | |||
| 1 | 2011-03-31 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-03-31 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * xdisp.c (SCROLL_LIMIT): New macro. | 7 | * xdisp.c (SCROLL_LIMIT): New macro. |
| @@ -19,11 +23,6 @@ | |||
| 19 | (syms_of_xdisp) <scroll-conservatively>: Document the | 23 | (syms_of_xdisp) <scroll-conservatively>: Document the |
| 20 | threshold of 100 lines for never-recentering scrolling. | 24 | threshold of 100 lines for never-recentering scrolling. |
| 21 | 25 | ||
| 22 | 2011-03-26 Eli Zaretskii <eliz@gnu.org> | ||
| 23 | |||
| 24 | * xdisp.c (redisplay_window): Don't check buffer's clip_changed | ||
| 25 | flag as a prerequisite for invoking try_scrolling. (Bug#6671) | ||
| 26 | |||
| 27 | 2011-03-31 Juanma Barranquero <lekktu@gmail.com> | 26 | 2011-03-31 Juanma Barranquero <lekktu@gmail.com> |
| 28 | 27 | ||
| 29 | * dispextern.h (move_it_by_lines): | 28 | * dispextern.h (move_it_by_lines): |
| @@ -210,6 +209,11 @@ | |||
| 210 | * s/usg5-4-common.h (SIGTYPE): Remove definition. | 209 | * s/usg5-4-common.h (SIGTYPE): Remove definition. |
| 211 | * s/template.h (SIGTYPE): Remove commented out definition. | 210 | * s/template.h (SIGTYPE): Remove commented out definition. |
| 212 | 211 | ||
| 212 | 2011-03-26 Eli Zaretskii <eliz@gnu.org> | ||
| 213 | |||
| 214 | * xdisp.c (redisplay_window): Don't check buffer's clip_changed | ||
| 215 | flag as a prerequisite for invoking try_scrolling. (Bug#6671) | ||
| 216 | |||
| 213 | 2011-03-26 Juanma Barranquero <lekktu@gmail.com> | 217 | 2011-03-26 Juanma Barranquero <lekktu@gmail.com> |
| 214 | 218 | ||
| 215 | * w32.c (read_unc_volume): Use parameter `henum', instead of | 219 | * w32.c (read_unc_volume): Use parameter `henum', instead of |
diff --git a/src/xdisp.c b/src/xdisp.c index 4b5835a322a..3c9d38536bb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -807,7 +807,7 @@ static void push_it (struct it *); | |||
| 807 | static void pop_it (struct it *); | 807 | static void pop_it (struct it *); |
| 808 | static void sync_frame_with_window_matrix_rows (struct window *); | 808 | static void sync_frame_with_window_matrix_rows (struct window *); |
| 809 | static void select_frame_for_redisplay (Lisp_Object); | 809 | static void select_frame_for_redisplay (Lisp_Object); |
| 810 | static void redisplay_internal (); | 810 | static void redisplay_internal (void); |
| 811 | static int echo_area_display (int); | 811 | static int echo_area_display (int); |
| 812 | static void redisplay_windows (Lisp_Object); | 812 | static void redisplay_windows (Lisp_Object); |
| 813 | static void redisplay_window (Lisp_Object, int); | 813 | static void redisplay_window (Lisp_Object, int); |
| @@ -11415,7 +11415,7 @@ do { if (polling_stopped_here) start_polling (); \ | |||
| 11415 | is not necessary; currently that causes some problems. */ | 11415 | is not necessary; currently that causes some problems. */ |
| 11416 | 11416 | ||
| 11417 | static void | 11417 | static void |
| 11418 | redisplay_internal () | 11418 | redisplay_internal (void) |
| 11419 | { | 11419 | { |
| 11420 | struct window *w = XWINDOW (selected_window); | 11420 | struct window *w = XWINDOW (selected_window); |
| 11421 | struct window *sw; | 11421 | struct window *sw; |