CVS update by aidan xemacs/lisp ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/11/08 15:43:43

  Modified:    xemacs/lisp ChangeLog cus-edit.el
Log:
Fix corruption of ~/.emacs when trying to migrate an init file;
thank you Jason Spiro!

Revision  Changes    Path
1.856     +9 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -p -r1.855 -r1.856
--- ChangeLog	2007/11/08 07:12:39	1.855
+++ ChangeLog	2007/11/08 14:43:38	1.856
@@ -1,3 +1,12 @@
+2007-11-08  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* cus-edit.el (custom-save-all):
+	Merge Jason Spiro's fix of 
+	c241693f0710021645g642f145n5925c7a35e7b2c58 at mail.gmail.com , to
+	avoid corruption of the custom-set-variables and custom-set-fonts
+	calls in ~/.emacs if XEmacs doesn't understand any part of the
+	syntax of ~/.emacs . 
+
 2007-10-31  Mike Sperber  <mike at xemacs.org>
 
 	* autoload.el (make-autoload): Add `defclass' and `defmethod' as



1.26      +3 -0      XEmacs/xemacs/lisp/cus-edit.el

Index: cus-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cus-edit.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- cus-edit.el	2007/09/20 21:18:35	1.25
+++ cus-edit.el	2007/11/08 14:43:40	1.26
@@ -3756,6 +3756,9 @@ Hashes several heavily used functions fo
 ;;;###autoload
 (defun custom-save-all ()
   "Save all customizations in `custom-file'."
+  (when init-file-had-error
+    (error 'invalid-change
+	   "Cannot save customizations; init file was not fully loaded"))
   (let ((inhibit-read-only t))
     (custom-save-variables)
     (custom-save-faces)