# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1107084943 0
# Node ID cd33f6f654f771c87d85bfc090b9ea5a61cdd3af
# Parent  4a45f5c001b29867817ccaadf6051f9bb1fee927
*** empty log message ***

diff -r 4a45f5c001b2 -r cd33f6f654f7 admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Sun Jan 30 11:34:58 2005 +0000
+++ b/admin/FOR-RELEASE	Sun Jan 30 11:35:43 2005 +0000
@@ -208,7 +208,7 @@
 man/msdog.texi
 man/mule.texi       "Luc Teirlinck"
 man/m-x.texi        "Luc Teirlinck"
-man/picture.texi
+man/picture.texi    Joakim Verona <joakim@verona.se>
 man/programs.texi   "Stephen Eglen"
 man/regs.texi       "Luc Teirlinck"
 man/rmail.texi
diff -r 4a45f5c001b2 -r cd33f6f654f7 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 30 11:34:58 2005 +0000
+++ b/lisp/ChangeLog	Sun Jan 30 11:35:43 2005 +0000
@@ -1,3 +1,11 @@
+2005-01-30  Richard M. Stallman  <rms@gnu.org>
+
+	* cus-edit.el (custom-bury-buffer): Function deleted.
+	(custom-buffer-done-function): Option deleted.
+	(custom-buffer-done-kill): New (replacement option.
+	(Custom-buffer-done): Call quit-window.
+	(custom-buffer-create-internal): Update for above changes.
+
 2005-01-29  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* simple.el (undo-ask-before-discard): New var.
diff -r 4a45f5c001b2 -r cd33f6f654f7 man/ChangeLog
--- a/man/ChangeLog	Sun Jan 30 11:34:58 2005 +0000
+++ b/man/ChangeLog	Sun Jan 30 11:35:43 2005 +0000
@@ -1,3 +1,24 @@
+2005-01-30  Richard M. Stallman  <rms@gnu.org>
+
+	* custom.texi (Easy Customization): Defn of "User Option" now
+	includes faces.  Don't say just "option" when talking about variables.
+	Do say just "options" to mean "anything customizable".
+	(Specific Customization): Describe `customize-variable',
+	not `customize-option'.
+
+	* glossary.texi (Glossary) <Faces>: Add xref.
+	<User Option>: Change definition--include faces.  Change xref.
+
+	* picture.texi (Picture): Mention artist.el.
+
+	* sending.texi, screen.texi, programs.texi, misc.texi: 
+	* mini.texi, major.texi, maintaining.texi, macos.texi: 
+	* help.texi, frames.texi, files.texi:
+	Don't say just "option" when talking about variables.
+
+	* display.texi, mule.texi: Don't say just "option" when talking
+	about variables.  Other minor cleanups.
+
 2005-01-28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi: Some edits based on comments from David Abrahams.