X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/565c0ca57e89ab1a1b4c378c615a998eb8fc0f99..723088480da2c8320e0944bc23f9b72fccb54319:/lisp/loadup.el diff --git a/lisp/loadup.el b/lisp/loadup.el index 7757a0e5b4..b7af41d624 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,7 +1,7 @@ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs -;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1992, 1994, 2001-2012 +;; Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: internal @@ -29,21 +29,15 @@ ;; If you add/remove Lisp files to be loaded here, consider the ;; following issues: -;; i) Any file loaded on all platforms should appear in $lisp -;; and $shortlisp in src/Makefile.in. Use the .el or .elc version as -;; appropriate. +;; i) Any file loaded on any platform should appear in $lisp in src/lisp.mk. +;; Use the .el or .elc version as appropriate. -;; ii) Any file that is only loaded on some platforms should appear -;; in the version of $lisp in the generated Makefile on that platform. -;; At the present time, this is achieved by use of #ifdefs. -;; It should also appear in $SOME_MACHINE_LISP on all platforms. +;; This ensures both that the Lisp files are compiled (if necessary) +;; before the emacs executable is dumped, and that they are passed to +;; make-docfile. (Any that are not processed for DOC will not have +;; doc strings in the dumped Emacs.) Because of this: -;; The above steps ensure both that the Lisp files are compiled (if -;; necessary) before the emacs executable is dumped, and that they are -;; passed to make-docfile. (Any that are not processed for DOC will -;; not have doc strings in the dumped Emacs.) Because of this: - -;; iii) If the file is loaded uncompiled, it should (where possible) +;; ii) If the file is loaded uncompiled, it should (where possible) ;; obey the doc-string conventions expected by make-docfile. ;;; Code: @@ -87,7 +81,7 @@ ;; Do it after subr, since both after-load-functions and add-hook are ;; implemented in subr.el. -(add-hook 'after-load-functions '(lambda (f) (garbage-collect))) +(add-hook 'after-load-functions (lambda (f) (garbage-collect))) ;; We specify .el in case someone compiled version.el by mistake. (load "version.el") @@ -101,12 +95,12 @@ (load "env") (load "format") (load "bindings") +(load "window") ; Needed here for `replace-buffer-in-windows'. (setq load-source-file-function 'load-with-code-conversion) (load "files") (load "cus-face") (load "faces") ; after here, `defface' may be used. -(load "minibuffer") (load "button") (load "startup") @@ -117,6 +111,7 @@ ;; In case loaddefs hasn't been generated yet. (file-error (load "ldefs-boot.el"))) +(load "minibuffer") (load "abbrev") ;lisp-mode.el and simple.el use define-abbrev-table. (load "simple") @@ -128,11 +123,11 @@ ;; multilingual text. (load "international/mule-cmds") (load "case-table") -(load "international/characters") -(load "composite") ;; This file doesn't exist when building a development version of Emacs ;; from the repository. It is generated just after temacs is built. (load "international/charprop.el" t) +(load "international/characters") +(load "composite") ;; Load language-specific files. (load "language/chinese") @@ -162,7 +157,6 @@ (load "language/cham") (load "indent") -(load "window") (load "frame") (load "term/tty-colors") (load "font-core") @@ -234,15 +228,14 @@ (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el (if (featurep 'ns) (progn - (load "emacs-lisp/easymenu") ;; for platform-related menu adjustments + (load "term/common-win") (load "term/ns-win"))) (if (fboundp 'x-create-frame) ;; Do it after loading term/foo-win.el since the value of the ;; mouse-wheel-*-event vars depends on those files being loaded or not. (load "mwheel")) -(if (fboundp 'atan) ; preload some constants and - (progn ; floating pt. functions if we have float support. - (load "emacs-lisp/float-sup"))) +;; Preload some constants and floating point functions. +(load "emacs-lisp/float-sup") (load "vc/vc-hooks") (load "vc/ediff-hook") @@ -264,7 +257,7 @@ (let* ((base (concat "emacs-" emacs-version ".")) (files (file-name-all-completions base default-directory)) (versions (mapcar (function (lambda (name) - (string-to-int (substring name (length base))))) + (string-to-number (substring name (length base))))) files))) ;; `emacs-version' is a constant, so we shouldn't change it with `setq'. (defconst emacs-version @@ -293,46 +286,16 @@ (error nil))) (message "Finding pointers to doc strings...done") -;;;Note: You can cause additional libraries to be preloaded -;;;by writing a site-init.el that loads them. -;;;See also "site-load" above. +;; Note: You can cause additional libraries to be preloaded +;; by writing a site-init.el that loads them. +;; See also "site-load" above. (load "site-init" t) (setq current-load-list nil) -;; Write the value of load-history into fns-VERSION.el, -;; then clear out load-history. -;; (if (or (equal (nth 3 command-line-args) "dump") -;; (equal (nth 4 command-line-args) "dump")) -;; (let ((buffer-undo-list t)) -;; (princ "(setq load-history\n" (current-buffer)) -;; (princ " (nconc load-history\n" (current-buffer)) -;; (princ " '(" (current-buffer)) -;; (let ((tem load-history)) -;; (while tem -;; (prin1 (car tem) (current-buffer)) -;; (terpri (current-buffer)) -;; (if (cdr tem) -;; (princ " " (current-buffer))) -;; (setq tem (cdr tem)))) -;; (princ ")))\n" (current-buffer)) -;; (write-region (point-min) (point-max) -;; (expand-file-name -;; (cond -;; ((eq system-type 'ms-dos) -;; "../lib-src/fns.el") -;; ((eq system-type 'windows-nt) -;; (format "../../../lib-src/fns-%s.el" emacs-version)) -;; (t -;; (format "../lib-src/fns-%s.el" emacs-version))) -;; invocation-directory)) -;; (erase-buffer) -;; (setq load-history nil)) -;; (setq symbol-file-load-history-loaded t)) -;; We don't use this fns-*.el file. Instead we keep the data in PURE space. +;; We keep the load-history data in PURE space. ;; Make sure that the spine of the list is not in pure space because it can ;; be destructively mutated in lread.c:build_load_history. (setq load-history (mapcar 'purecopy load-history)) -(setq symbol-file-load-history-loaded t) (set-buffer-modified-p nil) @@ -341,7 +304,7 @@ (equal (nth 4 command-line-args) "bootstrap")) (setcdr load-path nil)) -(remove-hook 'after-load-functions '(lambda (f) (garbage-collect))) +(remove-hook 'after-load-functions (lambda (f) (garbage-collect))) (setq inhibit-load-charset-map nil) (clear-charset-maps) @@ -373,7 +336,7 @@ (dump-emacs "emacs" "temacs") (message "%d pure bytes used" pure-bytes-used) ;; Recompute NAME now, so that it isn't set when we dump. - (if (not (or (memq system-type '(ms-dos windows-nt cygwin)) + (if (not (or (memq system-type '(ms-dos windows-nt)) ;; Don't bother adding another name if we're just ;; building bootstrap-emacs. (equal (nth 3 command-line-args) "bootstrap") @@ -403,5 +366,4 @@ ;; no-update-autoloads: t ;; End: -;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335 ;;; loadup.el ends here