diff options
| author | Stefan Monnier | 2005-08-24 11:49:07 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2005-08-24 11:49:07 +0000 |
| commit | b6790c3eec383718d9918c95e058581f75b1368d (patch) | |
| tree | 9616869912c0a8fbbc241d9323f0459025d2ba53 | |
| parent | 55b039c3f9c0ea5124a0b0a45e0f60014369bf8e (diff) | |
| download | emacs-b6790c3eec383718d9918c95e058581f75b1368d.tar.gz emacs-b6790c3eec383718d9918c95e058581f75b1368d.zip | |
(custom-theme-set-variables): Sort minor modes last.
| -rw-r--r-- | lisp/custom.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/custom.el b/lisp/custom.el index 38b3355c2c3..0831535f181 100644 --- a/lisp/custom.el +++ b/lisp/custom.el | |||
| @@ -726,15 +726,13 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')." | |||
| 726 | (error "Circular custom dependency between `%s' and `%s'" | 726 | (error "Circular custom dependency between `%s' and `%s'" |
| 727 | sym1 sym2)) | 727 | sym1 sym2)) |
| 728 | (2-then-1 nil) | 728 | (2-then-1 nil) |
| 729 | ;; Put symbols with :require last. The macro | 729 | ;; Put minor modes and symbols with :require last. |
| 730 | ;; define-minor-mode generates a defcustom | 730 | ;; Putting minor modes last ensures that the mode |
| 731 | ;; with a :require and a :set, where the | 731 | ;; function will see other customized values rather |
| 732 | ;; setter function calls the mode function. | 732 | ;; than default values. |
| 733 | ;; Putting symbols with :require last ensures | 733 | (t (or (nth 3 a2) |
| 734 | ;; that the mode function will see other | 734 | (eq (get sym2 'custom-set) |
| 735 | ;; customized values rather than default | 735 | 'custom-set-minor-mode)))))))) |
| 736 | ;; values. | ||
| 737 | (t (nth 3 a2))))))) | ||
| 738 | (while args | 736 | (while args |
| 739 | (let ((entry (car args))) | 737 | (let ((entry (car args))) |
| 740 | (if (listp entry) | 738 | (if (listp entry) |