1 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1b9655e9605..fc1e8054e13 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-18  Tom Tromey  <tromey@redhat.com>
 
+        * xdisp.c (emacs_scroll_step): Rename from scroll_step.
+        (try_scrolling): Rename argument to 'arg_scroll_conservatively'.
+        (redisplay_window): Update.
+        (syms_of_xdisp): Update.
+
+2011-01-18  Tom Tromey  <tromey@redhat.com>
+
         * gtkutil.h (x_gtk_use_old_file_dialog, x_gtk_show_hidden_files)
         (x_gtk_file_dialog_help_text, x_gtk_whole_detached_tool_bar):
         Declare.