*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f53277edaa4471db209af6cd22662df82691c2b0..49062712c36ee74ba72e0cf9d9422f38b91d03c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 5da39a2a4c857b9071c42ad2bdd75d7966726e3a..aa9859290ac74bef42947a777c923ec1b85b1c8f 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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