From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 18 Mar 2007 00:28:26 +0000 (+0000)
Subject: Restore stuff accidentally deleted in 2007-03-17T23:44:01Z!storm@cua.dk.
X-Git-Tag: emacs-pretest-22.0.96~82
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7f51ebb1e39ba4b5843ce3d3e38bee871334c62;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b7c6198e2d..e87dbc60449 100644
--- 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.