comparison lisp/cus-edit.el @ 5474:4dee0387b9de

Merged with trunk.
author Mats Lidell <matsl@xemacs.org>
date Tue, 29 Mar 2011 00:02:47 +0200
parents ac37a5f7e5be 3889ef128488
children 5d3bb1100832
comparison
equal deleted inserted replaced
5473:ac37a5f7e5be 5474:4dee0387b9de
2441 (put symbol 'customized-value nil) 2441 (put symbol 'customized-value nil)
2442 (put symbol 'customized-variable-comment nil) 2442 (put symbol 'customized-variable-comment nil)
2443 (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment)) 2443 (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
2444 (put symbol 'saved-value nil) 2444 (put symbol 'saved-value nil)
2445 (custom-push-theme 'theme-value symbol 'user 'reset 'standard) 2445 (custom-push-theme 'theme-value symbol 'user 'reset 'standard)
2446 ;; As a special optimizations we do not (explictly) 2446 ;; As a special optimization we do not (explicitly)
2447 ;; save resets to standard when no theme sets the value. 2447 ;; save resets to standard when no theme sets the value.
2448 (if (null (cdr (get symbol 'theme-value))) 2448 (if (null (cdr (get symbol 'theme-value)))
2449 (put symbol 'theme-value nil)) 2449 (put symbol 'theme-value nil))
2450 (put symbol 'saved-variable-comment nil) 2450 (put symbol 'saved-variable-comment nil)
2451 widget) 2451 widget)
2906 (put symbol 'customized-face nil) 2906 (put symbol 'customized-face nil)
2907 (put symbol 'customized-face-comment nil) 2907 (put symbol 'customized-face-comment nil)
2908 (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment)) 2908 (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
2909 (put symbol 'saved-face nil) 2909 (put symbol 'saved-face nil)
2910 (custom-push-theme 'theme-face symbol 'user 'reset 'standard) 2910 (custom-push-theme 'theme-face symbol 'user 'reset 'standard)
2911 ;; Do not explictly save resets to standards without themes. 2911 ;; Do not explicitly save resets to standards without themes.
2912 (if (null (cdr (get symbol 'theme-face))) 2912 (if (null (cdr (get symbol 'theme-face)))
2913 (put symbol 'theme-face nil)) 2913 (put symbol 'theme-face nil))
2914 (put symbol 'saved-face-comment nil) 2914 (put symbol 'saved-face-comment nil)
2915 widget) 2915 widget)
2916 )) 2916 ))