[Emacs-diffs] emacs/lisp ChangeLog custom.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/15 04:08:04

Modified files:
        lisp           : ChangeLog custom.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16175&r2=1.16176
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/custom.el?cvsroot=emacs&r1=1.148&r2=1.149

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16175
retrieving revision 1.16176
diff -u -b -r1.16175 -r1.16176
--- ChangeLog   15 Sep 2009 04:05:12 -0000      1.16175
+++ ChangeLog   15 Sep 2009 04:08:02 -0000      1.16176
@@ -1,5 +1,7 @@
 2009-09-15  Stefan Monnier  <address@hidden>
 
+       * 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.

Index: custom.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/custom.el,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- custom.el   13 Sep 2009 00:52:59 -0000      1.148
+++ custom.el   15 Sep 2009 04:08:04 -0000      1.149
@@ -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.