X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/172d2c6e6ead8293557f203dd3be3fd125ad7b2e..3b7f63b13fde224c5b0cf76a9dea51e820f1d93e:/lisp/loadup.el diff --git a/lisp/loadup.el b/lisp/loadup.el index 2f39713e6a..dbc8966d08 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -18,8 +18,9 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. ;;; Commentary: @@ -32,106 +33,146 @@ ;;; We don't want to have any undo records in the dumped Emacs. (buffer-disable-undo "*scratch*") -(load "subr") -(garbage-collect) (load "byte-run") -(garbage-collect) +(load "subr") + +;; We specify .el in case someone compiled version.el by mistake. +(load "version.el") + (load "map-ynp") -(garbage-collect) -(load "loaddefs.el") ;Don't get confused if someone compiled loaddefs by mistake. -(garbage-collect) +(load "widget") +(load "custom") +(load "cus-start") +(load "international/mule") +(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. +(load "format") +(load "bindings") +(setq load-source-file-function 'load-with-code-conversion) (load "simple") -(garbage-collect) (load "help") -(garbage-collect) (load "files") -(garbage-collect) +;; Any Emacs Lisp source file (*.el) loaded here after can contain +;; multilingual text. +(load "international/mule-cmds") +(load "case-table") +(load "international/characters") + +(message "Lists of integers (garbage collection statistics) are normal output") +(message "while building Emacs; they do not indicate a problem.") +(message "%s" (garbage-collect)) +(load "loaddefs.el") ;Don't get confused if someone compiled this by mistake. +(message "%s" (garbage-collect)) + +(let ((set-case-syntax-set-multibyte t)) + (load "international/latin-1") + (load "international/latin-2") + (load "international/latin-3") + (load "international/latin-4") + (load "international/latin-5")) +;; Load language-specific files. +(load "language/chinese") +(load "language/cyrillic") +(load "language/indian") +(load "language/devanagari") ; This should be loaded after indian. +(load "language/english") +(load "language/ethiopic") +(load "language/european") +(load "language/czech") +(load "language/slovak") +(load "language/romanian") +(load "language/greek") +(load "language/hebrew") +(load "language/japanese") +(load "language/korean") +(load "language/lao") +(load "language/thai") +(load "language/tibetan") +(load "language/vietnamese") +(load "language/misc-lang") +(update-coding-systems-internal) + (load "indent") -(garbage-collect) +(load "isearch") (load "window") -(garbage-collect) -(if (fboundp 'delete-frame) +(load "frame") +(load "faces") +(if (fboundp 'frame-face-alist) + (progn + (load "facemenu"))) +(if (fboundp 'track-mouse) (progn - (load "frame") (load "mouse") - (garbage-collect) - (load "menu-bar") (load "scroll-bar") (load "select"))) -(garbage-collect) + +(message "%s" (garbage-collect)) +(load "menu-bar") (load "paths.el") ;Don't get confused if someone compiled paths by mistake. -(garbage-collect) (load "startup") -(garbage-collect) -(load "lisp") -(garbage-collect) -(load "page") -(garbage-collect) +(load "emacs-lisp/lisp") +(load "textmodes/page") (load "register") -(garbage-collect) -(load "paragraphs") -(garbage-collect) -(load "lisp-mode") -(garbage-collect) -(load "text-mode") -(garbage-collect) -(load "fill") -(garbage-collect) -(load "c-mode") -(garbage-collect) -(load "isearch") -(garbage-collect) +(load "textmodes/paragraphs") +(load "emacs-lisp/lisp-mode") +(load "textmodes/text-mode") +(load "textmodes/fill") +(message "%s" (garbage-collect)) + (load "replace") (if (eq system-type 'vax-vms) (progn - (garbage-collect) (load "vmsproc"))) -(garbage-collect) (load "abbrev") -(garbage-collect) (load "buff-menu") (if (eq system-type 'vax-vms) (progn - (garbage-collect) (load "vms-patch"))) +(if (eq system-type 'windows-nt) + (progn + (load "ls-lisp") + (load "disp-table") ; needed to setup ibm-pc char set, see internal.el + (load "dos-w32") + (load "w32-fns"))) (if (eq system-type 'ms-dos) (progn (load "ls-lisp") - (garbage-collect) - (load "mouse") - (garbage-collect) + (load "dos-w32") (load "dos-fns") - (garbage-collect) - (load "disp-table") ; needed to setup ibm-pc char set, see internal.el - (garbage-collect))) + (load "dos-vars") + (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el (if (fboundp 'atan) ; preload some constants and - (progn ; floating pt. functions if - (garbage-collect) ; we have float support. + (progn ; floating pt. functions if we have float support. (load "float-sup"))) -(garbage-collect) -(load "vc-hooks") +(message "%s" (garbage-collect)) -;; We specify .el in case someone compiled version.el by mistake. -(load "version.el") +(load "vc-hooks") +(load "ediff-hook") +(message "%s" (garbage-collect)) ;If you want additional libraries to be preloaded and their ;doc strings kept in the DOC file rather than in core, ;you may load them with a "site-load.el" file. ;But you must also cause them to be scanned when the DOC file ;is generated. For VMS, you must edit ../vms/makedoc.com. -;For other systems, you must edit ../src/Makefile.in.in. +;For other systems, you must edit ../src/Makefile.in. (if (load "site-load" t) (garbage-collect)) +(if (fboundp 'x-popup-menu) + (precompute-menubar-bindings)) +;; Turn on recording of which commands get rebound, +;; for the sake of the next call to precompute-menubar-bindings. +(setq define-key-rebound-commands nil) + ;; Determine which last version number to use ;; based on the executables that now exist. (if (and (or (equal (nth 3 command-line-args) "dump") (equal (nth 4 command-line-args) "dump")) (not (eq system-type 'ms-dos))) - (let* ((base (concat "emacs-" emacs-version)) + (let* ((base (concat "emacs-" emacs-version ".")) (files (file-name-all-completions base default-directory)) (versions (mapcar (function (lambda (name) - (string-to-int (substring name (1+ (length base)))))) + (string-to-int (substring name (length base))))) files))) (setq emacs-version (format "%s.%d" emacs-version @@ -152,8 +193,9 @@ (setq name (concat (downcase (substring name 0 (match-beginning 0))) "-" (substring name (match-end 0))))) - (if (eq system-type 'ms-dos) - (setq name (expand-file-name "../etc/DOC")) + (if (memq system-type '(ms-dos windows-nt)) + (setq name (expand-file-name + (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc")) (setq name (concat (expand-file-name "../etc/DOC-") name)) (if (file-exists-p name) (delete-file name)) @@ -162,10 +204,40 @@ (Snarf-documentation "DOC")) (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. +(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) +(set-buffer-modified-p nil) + (garbage-collect) ;;; At this point, we're ready to resume undo recording for scratch. @@ -192,10 +264,11 @@ ;; We used to dump under the name xemacs, but that occasionally ;; confused people installing Emacs (they'd install the file ;; under the name `xemacs'), and it's inconsistent with every - ;; other GNU product's build process. + ;; other GNU program's build process. (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 (eq system-type 'ms-dos)) + (if (not (memq system-type '(ms-dos windows-nt))) (let ((name (concat "emacs-" emacs-version))) (while (string-match "[^-+_.a-zA-Z0-9]+" name) (setq name (concat (downcase (substring name 0 (match-beginning 0))) @@ -209,10 +282,12 @@ ;; For machines with CANNOT_DUMP defined in config.h, ;; this file must be loaded each time Emacs is run. -;; So run the startup code now. +;; So run the startup code now. First, remove `-l loadup' from args. -(or (or (equal (nth 3 command-line-args) "dump") - (equal (nth 4 command-line-args) "dump")) - (eval top-level)) +(if (and (equal (nth 1 command-line-args) "-l") + (equal (nth 2 command-line-args) "loadup")) + (setcdr command-line-args (nthcdr 3 command-line-args))) + +(eval top-level) ;;; loadup.el ends here