*** empty log message ***

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index db6be0a6e99..146398f2de3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * simple.el (yank): Fix typo in docstring.
+
 2006-03-11  Ryan Yeske  <rcyeske@gmail.com>
 
         * mail/rmailsum.el (rmail-summary-next-msg): Skip deleted
diff --git a/src/ChangeLog b/src/ChangeLog
index bef64046ae1..389538b1617 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * window.c: Rename preserve_y to window_scroll_pixel_based_preserve_y.
+        (window_scroll_pixel_based, syms_of_window): Adapt to above change.
+
 2006-03-11  Eli Zaretskii  <eliz@gnu.org>
 
         * w32fns.c (w32_wnd_proc): Ignore middle and extra button events
@@ -39,7 +44,7 @@
         * xterm.c (x_fully_uncatch_errors, x_catching_errors): New functions.
 
         * eval.c (unwind_to_catch): Call x_fully_uncatch_errors.
-        (internal_condition_case_1, internal_condition_case_2): 
+        (internal_condition_case_1, internal_condition_case_2):
         Abort if within unclosed x_catch_errors.
 
 2006-03-11  Romain Francoise  <romain@orebokech.com>