Restore stuff accidentally deleted in 2007-03-17T23:44:01Z!storm@cua.dk.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b7c6198e2d4ba6f08559c89941780fef19fd628..e87dbc60449f1a7f26dab75f606f748a3efb12bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,15 @@
        * buffer.c (syms_of_buffer) <buffer-display-table>: Doc fix.
        Reported by Nikolaj Schumacher <n_schumacher@web.de>.
 
+2007-03-17  Richard Stallman  <rms@gnu.org>
+
+       * dired.c (file_name_completion): Gcpro NAME.
+
+2007-03-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (try_window_id): Increment matrix positions if the
+       buffer's byte count has increased, but not the character count.
+
 2007-03-12  Andreas Schwab  <schwab@suse.de>
 
        * lisp.h: Declare check_obarray.