mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

(custom-theme-set-variables): Autoload packages before sorting the variables.

Browse source
This commit is contained in:
Stefan Monnier 2006-08-31 17:10:34 +00:00
parent 05c4a38a25
commit 9277ee6cd2
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/ChangeLog
View file

@ -1,9 +1,14 @@
2006-08-31 Michael Mauger <mmaug@yahoo.com>
* custom.el (custom-theme-set-variables): Autoload packages before
sorting the variables.
2006-08-30 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-cmd.el (viper-special-read-and-insert-char): convert events to
* viper-cmd.el (viper-special-read-and-insert-char): Convert events to
chars if XEmacs.
(viper-after-change-undo-hook): check if undo-in-progress is bound.
(viper-after-change-undo-hook): Check if undo-in-progress is bound.
2006-08-30 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/python.el (python-eldoc-function): Re-enable quit while

16
lisp/custom.el
View file

@ -874,6 +874,18 @@ COMMENT is a comment string about SYMBOL.
EXP itself is saved unevaluated as SYMBOL property `saved-value' and
in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
(custom-check-theme theme)
;; Process all the needed autoloads before anything else, so that the
;; subsequent code has all the info it needs (e.g. which var corresponds
;; to a minor mode), regardless of the ordering of the variables.
(dolist (entry args)
(let* ((symbol (indirect-variable (nth 0 entry))))
(unless (or (get symbol 'standard-value)
(memq (get symbol 'custom-autoload) '(nil noset)))
;; This symbol needs to be autoloaded, even just for a `set'.
(custom-load-symbol symbol))))
;; Move minor modes and variables with explicit requires to the end.
(setq args
(sort args
(lambda (a1 a2)
@ -904,10 +916,6 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
(when requests
(put symbol 'custom-requests requests)
(mapc 'require requests))
(unless (or (get symbol 'standard-value)
(memq (get symbol 'custom-autoload) '(nil noset)))
;; This symbol needs to be autoloaded, even just for a `set'.
(custom-load-symbol symbol))
(setq set (or (get symbol 'custom-set) 'custom-set-default))
(put symbol 'saved-value (list value))
(put symbol 'saved-variable-comment comment)