From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 30 Jan 2005 11:35:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~2526
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce4065431ec248e8ce4c68fde5a453b172264cec;p=emacs.git

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

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 22d36fe42fd..be844766439 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -208,7 +208,7 @@ man/misc.texi
 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed352686eb6..f42a4ba7f7e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 5f69fc7d856..5f05930ed6a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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.