(custom-initialize-default, custom-initialize-set): CSE.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eeb90cb28c5d5bd5ecb969cad09c4adcee965499..35eff3c3b981fce14ecb7a9c5a2738793750baa9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/custom.el b/lisp/custom.el
index f55cd47afc0e590be67747c31994006c5cf970a4..e3d3d9a63a088080814cd57ccd69c890f8823141 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -57,9 +57,9 @@ Otherwise, VALUE will be evaluated and used as the default binding for
 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 @@ if any, or VALUE."
   (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.