# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1135305909 0
# Node ID a52cf10424bcdd22cf73c0c0f47b822ccc11a720
# Parent  34a28bb460abc9d21d3d87a0f93d803a5494cd88
*** empty log message ***

diff -r 34a28bb460ab -r a52cf10424bc man/ChangeLog
--- a/man/ChangeLog	Fri Dec 23 02:01:02 2005 +0000
+++ b/man/ChangeLog	Fri Dec 23 02:45:09 2005 +0000
@@ -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 -r 34a28bb460ab -r a52cf10424bc src/ChangeLog
--- a/src/ChangeLog	Fri Dec 23 02:01:02 2005 +0000
+++ b/src/ChangeLog	Fri Dec 23 02:45:09 2005 +0000
@@ -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.