# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1148576632 0
# Node ID 6ab4517adb6b6147ca493b229a6640ce5b6e0554
# Parent  4a951c8c4c684137f1fa102763ba2a876615fe6b
*** empty log message ***

diff -r 4a951c8c4c68 -r 6ab4517adb6b lispref/ChangeLog
--- a/lispref/ChangeLog	Thu May 25 17:03:46 2006 +0000
+++ b/lispref/ChangeLog	Thu May 25 17:03:52 2006 +0000
@@ -1,3 +1,10 @@
+2006-05-25  Richard Stallman  <rms@gnu.org>
+
+	* elisp.texi (Top): Update subnode menu.
+
+	* keymaps.texi (Keymap Basics): New node, split out of Key Sequences.
+	(Keymaps): Update menu.
+
 2006-05-25  Chong Yidong  <cyd@stupidchicken.com>
 
 	* keymaps.texi (Key Sequences): Some clarifications.
diff -r 4a951c8c4c68 -r 6ab4517adb6b src/ChangeLog
--- a/src/ChangeLog	Thu May 25 17:03:46 2006 +0000
+++ b/src/ChangeLog	Thu May 25 17:03:52 2006 +0000
@@ -1,3 +1,7 @@
+2006-05-25  Richard Stallman  <rms@gnu.org>
+
+	* emacs.c (main, Fdump_emacs): Don't test __linux or __linux__.
+
 2006-05-24  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* puresize.h (BASE_PURESIZE): Increase to 1210000.