# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1104797361 0
# Node ID 123d350f0883ba3f9f9c85e8209e1c4720290f08
# Parent  b442f3501e4e5f2e6fefd223eb7c12534d8d2a6a
*** empty log message ***

diff -r b442f3501e4e -r 123d350f0883 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jan 04 00:08:12 2005 +0000
+++ b/lisp/ChangeLog	Tue Jan 04 00:09:21 2005 +0000
@@ -1,3 +1,11 @@
+2005-01-03  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* cus-edit.el (custom-file): Doc fix for defcustom.
+	(custom-file): The function no longer sets the variable
+	`custom-file' to its return value.
+
+	* startup.el (command-line): No longer load `custom-file'.
+
 2005-01-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/find-func.el (find-variable-regexp): Avoid defface.
diff -r b442f3501e4e -r 123d350f0883 man/ChangeLog
--- a/man/ChangeLog	Tue Jan 04 00:08:12 2005 +0000
+++ b/man/ChangeLog	Tue Jan 04 00:09:21 2005 +0000
@@ -1,3 +1,9 @@
+2005-01-03  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* custom.texi (Saving Customizations): Emacs no longer loads
+	`custom-file' after .emacs in 21.4.  (It never did in prior
+	versions.)  No longer mention customizing through Custom.
+
 2005-01-01  Jay Belanger  <belanger@truman.edu>
 
 	* calc.texi (Programming Tutorial): Changed description of how to