Mercurial > emacs
changeset 105032:57aeab3faaa9
(custom-initialize-default, custom-initialize-set): CSE.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 15 Sep 2009 04:08:02 +0000 |
| parents | 7700dc1d76fd |
| children | 65e1f1ec8586 |
| files | lisp/ChangeLog lisp/custom.el |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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.