procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak recent custom-reevaluate-setting change

Browse source 
* lisp/custom.el (custom-reevaluate-setting):
Tweak previous change to avoid font-lock init issues.
This commit is contained in:
Glenn Morris 2017-02-21 12:59:56 -05:00
parent 96cea19842
commit 20dda6be76
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/custom.el
View file

@ -764,17 +764,13 @@ Return non-nil if the `customized-value' property actually changed."
Use the :set function to do so. This is useful for customizable options
that are defined before their standard value can really be computed.
E.g. dumped variables whose default depends on run-time information."
(let ((val (car (or (get symbol 'saved-value)
(get symbol 'standard-value)))))
(if (default-boundp symbol)
(funcall (or (get symbol 'custom-set) 'set-default) symbol (eval val))
;; If it has never been set at all, defvar it so as to mark it
;; special, etc (bug#25770). This ignores any :set function,
;; but that is not supposed to be used for initialization anyway.
;; Or we could move this branch to the start, then unconditionally
;; call the custom-set branch.
(eval `(defvar ,symbol ,val)))))
;; If it has never been set at all, defvar it so as to mark it
;; special, etc (bug#25770).
(or (default-boundp symbol)
(eval `(defvar ,symbol nil)))
(funcall (or (get symbol 'custom-set) 'set-default)
symbol
(eval (car (or (get symbol 'saved-value) (get symbol 'standard-value))))))
;;; Custom Themes