Mercurial > hg > xemacs-beta
comparison lisp/subr.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 | aa20a889ff14 |
| children | 57a64ab2ae45 b9167d522a9a |
comparison
equal
deleted
inserted
replaced
| 5283:be436ac36ba4 | 5284:d27c1ee1943b |
|---|---|
| 37 ;; of commentary just to give diff(1) something to synch itself with to | 37 ;; of commentary just to give diff(1) something to synch itself with to |
| 38 ;; provide useful context diffs. -sb | 38 ;; provide useful context diffs. -sb |
| 39 | 39 |
| 40 ;; BEGIN SYNCHED WITH FSF 21.2 | 40 ;; BEGIN SYNCHED WITH FSF 21.2 |
| 41 | 41 |
| 42 ;;; Code: | 42 ;; XEmacs; no need for custom-declare-variable-list, preloaded-file-list is |
| 43 (defvar custom-declare-variable-list nil | 43 ;; ordered to make it unnecessary. |
| 44 "Record `defcustom' calls made before `custom.el' is loaded to handle them. | 44 |
| 45 Each element of this list holds the arguments to one call to `defcustom'.") | |
| 46 | |
| 47 ;; Use this, rather than defcustom, in subr.el and other files loaded | |
| 48 ;; before custom.el. See dumped-lisp.el. | |
| 49 (defun custom-declare-variable-early (&rest arguments) | |
| 50 (setq custom-declare-variable-list | |
| 51 (cons arguments custom-declare-variable-list))) | |
| 52 | |
| 53 | |
| 54 (defun macro-declaration-function (macro decl) | 45 (defun macro-declaration-function (macro decl) |
| 55 "Process a declaration found in a macro definition. | 46 "Process a declaration found in a macro definition. |
| 56 This is set as the value of the variable `macro-declaration-function'. | 47 This is set as the value of the variable `macro-declaration-function'. |
| 57 MACRO is the name of the macro being defined. | 48 MACRO is the name of the macro being defined. |
| 58 DECL is a list `(declare ...)' containing the declarations. | 49 DECL is a list `(declare ...)' containing the declarations. |
| 1584 region)) | 1575 region)) |
| 1585 | 1576 |
| 1586 (define-function 'eval-in-buffer 'with-current-buffer) | 1577 (define-function 'eval-in-buffer 'with-current-buffer) |
| 1587 (make-obsolete 'eval-in-buffer 'with-current-buffer) | 1578 (make-obsolete 'eval-in-buffer 'with-current-buffer) |
| 1588 | 1579 |
| 1589 ;;; The real defn is in abbrev.el but some early callers | |
| 1590 ;;; (eg lisp-mode-abbrev-table) want this before abbrev.el is loaded... | |
| 1591 | |
| 1592 (if (not (fboundp 'define-abbrev-table)) | |
| 1593 (progn | |
| 1594 (setq abbrev-table-name-list '()) | |
| 1595 (fset 'define-abbrev-table | |
| 1596 (function (lambda (name defs) | |
| 1597 ;; These are fixed-up when abbrev.el loads. | |
| 1598 (setq abbrev-table-name-list | |
| 1599 (cons (cons name defs) | |
| 1600 abbrev-table-name-list))))))) | |
| 1601 | |
| 1602 ;;; `functionp' has been moved into C. | 1580 ;;; `functionp' has been moved into C. |
| 1603 | 1581 |
| 1604 ;;(defun functionp (object) | 1582 ;;(defun functionp (object) |
| 1605 ;; "Non-nil if OBJECT can be called as a function." | 1583 ;; "Non-nil if OBJECT can be called as a function." |
| 1606 ;; (or (and (symbolp object) (fboundp object)) | 1584 ;; (or (and (symbolp object) (fboundp object)) |