# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1252987682 0
# Node ID 57aeab3faaa9a0f920600fc0e3cd6f4c2dc07fa8
# Parent  7700dc1d76fdec15ef12859aa8c034e4d85baaba
(custom-initialize-default, custom-initialize-set): CSE.

diff -r 7700dc1d76fd -r 57aeab3faaa9 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 15 04:05:12 2009 +0000
+++ b/lisp/ChangeLog	Tue Sep 15 04:08:02 2009 +0000
@@ -1,5 +1,7 @@
 2009-09-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* custom.el (custom-initialize-default, custom-initialize-set): CSE.
+
 	* desktop.el (desktop-path): Check user-emacs-directory.
 
 	* emacs-lisp/bytecomp.el (byte-compile-refresh-preloaded): New function.
diff -r 7700dc1d76fd -r 57aeab3faaa9 lisp/custom.el
--- a/lisp/custom.el	Tue Sep 15 04:05:12 2009 +0000
+++ b/lisp/custom.el	Tue Sep 15 04:08:02 2009 +0000
@@ -57,9 +57,9 @@
 symbol."
   (unless (default-boundp symbol)
     ;; Use the saved value if it exists, otherwise the standard setting.
-    (set-default symbol (if (get symbol 'saved-value)
-			    (eval (car (get symbol 'saved-value)))
-			  (eval value)))))
+    (set-default symbol (eval (if (get symbol 'saved-value)
+                                  (car (get symbol 'saved-value))
+                                value)))))
 
 (defun custom-initialize-set (symbol value)
   "Initialize SYMBOL based on VALUE.
@@ -70,9 +70,9 @@
   (unless (default-boundp symbol)
     (funcall (or (get symbol 'custom-set) 'set-default)
 	     symbol
-	     (if (get symbol 'saved-value)
-		 (eval (car (get symbol 'saved-value)))
-	       (eval value)))))
+	     (eval (if (get symbol 'saved-value)
+                       (car (get symbol 'saved-value))
+                     value)))))
 
 (defun custom-initialize-reset (symbol value)
   "Initialize SYMBOL based on VALUE.