Mercurial > hg > xemacs-beta
comparison lisp/custom.el @ 5284:d27c1ee1943b
Make the order of preloaded-file-list more sane.
lisp/ChangeLog addition:
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 12 Oct 2010 21:11:46 +0100 |
| parents | 7d06a8bf47d2 |
| children | b6e59ea11533 b9167d522a9a |
comparison
equal
deleted
inserted
replaced
| 5283:be436ac36ba4 | 5284:d27c1ee1943b |
|---|---|
| 42 ;; loading, all provides (and fsets) will be undone. put it first to | 42 ;; loading, all provides (and fsets) will be undone. put it first to |
| 43 ;; prevent require/provide loop with custom and cus-face. | 43 ;; prevent require/provide loop with custom and cus-face. |
| 44 (provide 'custom) | 44 (provide 'custom) |
| 45 | 45 |
| 46 (eval-when-compile | 46 (eval-when-compile |
| 47 (load "cl-macs" nil t) | |
| 48 ;; To elude warnings. | 47 ;; To elude warnings. |
| 49 (require 'cus-face)) | 48 (require 'cus-face)) |
| 50 | 49 |
| 51 (autoload 'custom-declare-face "cus-face") | 50 (autoload 'custom-declare-face "cus-face") |
| 52 (autoload 'defun* "cl-macs") | |
| 53 | 51 |
| 54 (require 'widget) | 52 (require 'widget) |
| 55 | 53 |
| 56 (defvar custom-define-hook nil | 54 (defvar custom-define-hook nil |
| 57 ;; Customize information for this option is in `cus-edit.el'. | 55 ;; Customize information for this option is in `cus-edit.el'. |
| 1054 This means reset VARIABLE to its value in TO-THEME." | 1052 This means reset VARIABLE to its value in TO-THEME." |
| 1055 (apply 'custom-theme-reset-variables 'user args)) | 1053 (apply 'custom-theme-reset-variables 'user args)) |
| 1056 | 1054 |
| 1057 ;;; The End. | 1055 ;;; The End. |
| 1058 | 1056 |
| 1059 ;; Process the defcustoms for variables loaded before this file. | 1057 ;; XEmacs; we order preloaded-file-list such that there's no need for |
| 1060 ;; `custom-declare-variable-list' is defvar'd in subr.el. Utility programs | 1058 ;; custom-declare-variable-list. |
| 1061 ;; run from temacs that do not load subr.el should defvar it themselves. | |
| 1062 ;; (As of 21.5.11, make-docfile.el.) | |
| 1063 (while custom-declare-variable-list | |
| 1064 (apply 'custom-declare-variable (car custom-declare-variable-list)) | |
| 1065 (setq custom-declare-variable-list (cdr custom-declare-variable-list))) | |
| 1066 | 1059 |
| 1067 ;; custom.el ends here | 1060 ;; custom.el ends here |