*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94c9abeea1c314c967296825e1da18c10fd53770..6ee5582d755751c80685ef55840852a9a5a3d17c 100644 (file)
--- 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 aa3c0f4e96ee721a07ca17755571f058bf90bdb5..b161151d92675b75128e2a945444eb9b8b54b5ca 100644 (file)
--- 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)