--- a/lisp/cus-edit.el	Mon Aug 13 10:05:53 2007 +0200
+++ b/lisp/cus-edit.el	Mon Aug 13 10:06:47 2007 +0200
@@ -2107,10 +2107,10 @@
 					   :sibling-args (:help-echo "\
 OS/2 Presentation Manager")
 					   pm)
-				    (const :format "Win32 "
+				    (const :format "MSWindows "
 					   :sibling-args (:help-echo "\
 Windows NT/95/97")
-					   win32)
+					   mswindows)
 				    (const :format "DOS "
 					   :sibling-args (:help-echo "\
 Plain MS-DOS")
@@ -2387,6 +2387,7 @@
     (face-spec-set symbol value)
     (put symbol 'saved-face value)
     (put symbol 'customized-face nil)
+    (custom-save-all)
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
@@ -2921,10 +2922,10 @@
 
 ;;; The `custom-save-all' Function.
 ;;;###autoload
-(defcustom custom-file (if (boundp 'emacs-user-extension-dir)
+(defcustom custom-file (if (boundp 'user-init-directory)
 			   (concat "~"
 				   init-file-user
-				   emacs-user-extension-dir
+				   user-init-directory
 				   "options.el")
 			 "~/.emacs")
   "File used for storing customization information.