# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1137100846 0
# Node ID 8bc556cbc95b27a09c7ceb097a5ab2d7cb376c87
# Parent  6962eb3cd807ad1bbb04f6ab363ba2648dfdf417
*** empty log message ***

diff -r 6962eb3cd807 -r 8bc556cbc95b lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jan 12 21:17:37 2006 +0000
+++ b/lisp/ChangeLog	Thu Jan 12 21:20:46 2006 +0000
@@ -1,3 +1,10 @@
+2006-01-13  Nick Roberts  <nickrob@snap.net.nz>
+
+	* wdired.el (wdired-mode-map): Add help echo for
+	wdired-abort-changes.
+
+	* man.el (Man-file-name-regexp): Adjust for a list of files.
+
 2006-01-12  Masatake YAMATO  <jet@gyve.org>
 
 	* progmodes/ld-script.el (auto-mode-alist): Support
diff -r 6962eb3cd807 -r 8bc556cbc95b src/ChangeLog
--- a/src/ChangeLog	Thu Jan 12 21:17:37 2006 +0000
+++ b/src/ChangeLog	Thu Jan 12 21:20:46 2006 +0000
@@ -1,3 +1,9 @@
+2006-01-13  Richard M. Stallman  <rms@gnu.org>
+
+	* Makefile.in: Define new macro WINDOW_SUPPORT.
+	(lisp): Use it.
+	(SOME_MACHINE_LISP): Add conditionally loaded files.
+
 2006-01-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* macterm.c [USE_ATSUI] (atsu_get_text_layout_with_text_ptr)