From: Nick Roberts <nickrob@snap.net.nz>
Date: Thu, 12 Jan 2006 21:20:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~4784
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d33a7384ae55919505864110cffb07cefba2a154;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94c9abeea1c..6ee5582d755 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index aa3c0f4e96e..b161151d926 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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)