mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
(custom-set-variables): Load the requests first,
then check the symbol's `set' function.
This commit is contained in:
parent
100b770bcf
commit
98743206de
1 changed files with 5 additions and 4 deletions
|
|
@ -408,7 +408,11 @@ the default value for the SYMBOL."
|
|||
(value (nth 1 entry))
|
||||
(now (nth 2 entry))
|
||||
(requests (nth 3 entry))
|
||||
(set (or (get symbol 'custom-set) 'custom-set-default)))
|
||||
set)
|
||||
(when requests
|
||||
(put symbol 'custom-requests requests)
|
||||
(mapcar 'require requests))
|
||||
(setq set (or (get symbol 'custom-set) 'custom-set-default))
|
||||
(put symbol 'saved-value (list value))
|
||||
(cond (now
|
||||
;; Rogue variable, set it now.
|
||||
|
|
@ -417,9 +421,6 @@ the default value for the SYMBOL."
|
|||
((default-boundp symbol)
|
||||
;; Something already set this, overwrite it.
|
||||
(funcall set symbol (eval value))))
|
||||
(when requests
|
||||
(put symbol 'custom-requests requests)
|
||||
(mapcar 'require requests))
|
||||
(setq args (cdr args)))
|
||||
;; Old format, a plist of SYMBOL VALUE pairs.
|
||||
(message "Warning: old format `custom-set-variables'")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue