diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
| commit | 41520ab0b3f0a0ae6bd81731f67eb43cf23500d8 (patch) | |
| tree | 4bca9a170abd1057555ecc73c8ba6b58640cd8db /lisp/loadup.el | |
| parent | ea50afbd1738693ae470f282330aecf2746809c7 (diff) | |
| parent | 39e55877e2bfca874f1640302fec16ded1bbf7d3 (diff) | |
| download | emacs-41520ab0b3f0a0ae6bd81731f67eb43cf23500d8.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 17ff7a423ba..8789c6db371 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -62,10 +62,10 @@ (load "widget") (load "custom") (load "emacs-lisp/map-ynp") -(load "env") (load "cus-start") (load "international/mule") (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. +(load "env") (load "format") (load "bindings") (setq load-source-file-function 'load-with-code-conversion) @@ -74,6 +74,9 @@ (load "cus-face") (load "faces") ; after here, `defface' may be used. +(load "button") +(load "startup") + (message "Lists of integers (garbage collection statistics) are normal output") (message "while building Emacs; they do not indicate a problem.") (message "%s" (garbage-collect)) @@ -81,7 +84,6 @@ (message "%s" (garbage-collect)) (load "simple") -(load "button") (load "help") (load "jka-cmpr-hook") @@ -147,7 +149,6 @@ (message "%s" (garbage-collect)) (load "menu-bar") (load "paths.el") ;Don't get confused if someone compiled paths by mistake. -(load "startup") (load "emacs-lisp/lisp") (load "textmodes/page") (load "register") @@ -173,7 +174,10 @@ (load "mwheel") (load "tool-bar"))) (if (featurep 'x) - (load "x-dnd")) + (progn + (load "x-dnd") + (load "term/x-win"))) + (message "%s" (garbage-collect)) (if (eq system-type 'vax-vms) @@ -181,6 +185,9 @@ (load "vms-patch"))) (if (eq system-type 'windows-nt) (progn + (load "international/ccl") + (load "international/code-pages") + (load "term/w32-win") (load "ls-lisp") (load "disp-table") ; needed to setup ibm-pc char set, see internal.el (load "dos-w32") @@ -198,6 +205,9 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) +(if (featurep 'mac-carbon) + (progn + (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if we have float support. (load "emacs-lisp/float-sup"))) |