From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 23 Dec 2005 02:45:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~5119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ee01fffb7c96345023e45b66b7fd564bed3a383;p=emacs.git

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

diff --git a/man/ChangeLog b/man/ChangeLog
index c7d057ff86e..c3cd82b9568 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-22  Richard M. Stallman  <rms@gnu.org>
+
+	* custom.texi (Easy Customization and subnodes):
+	Replace "active field" with "button".
+	Use "user option" only for variables.
+	Use "setting" for variable-or-face.
+
 2005-12-22  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* buffers.texi (Select Buffer): Change order in table to make
diff --git a/src/ChangeLog b/src/ChangeLog
index 8245a8b5119..39af44aeae0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-22  Richard M. Stallman  <rms@gnu.org>
+
+	* xmenu.c (xmenu_show): Call inhibit_garbage_collection.
+
 2005-12-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* mac.c (Fmac_coerce_ae_data) [MAC_OSX]: Fix memory leak.