X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/0d20f9a04efa7cfbe205e4967b6797b89fc64fe7..d6749f8f3d61ad9362f457d2d4f7c0dce80e0e78:/lisp/loadup.el diff --git a/lisp/loadup.el b/lisp/loadup.el index 9447c74891..f4da8db885 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,12 +1,15 @@ -;;Load up standardly loaded Lisp files for Emacs. -;; This is loaded into a bare Emacs to make a dumpable one. -;; Copyright (C) 1985, 1986 Free Software Foundation, Inc. +;;; loadup.el --- load up standardly loaded Lisp files for Emacs. + +;; Copyright (C) 1985, 1986, 1992, 1994 Free Software Foundation, Inc. + +;; Maintainer: FSF +;; Keywords: internal ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 1, or (at your option) +;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, @@ -15,11 +18,30 @@ ;; 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: + +;; This is loaded into a bare Emacs to make a dumpable one. + +;;; Code: +(message "Using load-path %s" load-path) + +;;; We don't want to have any undo records in the dumped Emacs. +(buffer-disable-undo "*scratch*") (load "subr") + +;; We specify .el in case someone compiled version.el by mistake. +(load "version.el") + +(garbage-collect) +(load "byte-run") +(garbage-collect) +(load "map-ynp") (garbage-collect) (load "loaddefs.el") ;Don't get confused if someone compiled loaddefs by mistake. (garbage-collect) @@ -29,25 +51,48 @@ (garbage-collect) (load "files") (garbage-collect) +(load "format") +(garbage-collect) (load "indent") +(garbage-collect) +(load "isearch") +(garbage-collect) (load "window") +(if (fboundp 'delete-frame) + (progn + (garbage-collect) + (load "frame"))) +(if (fboundp 'frame-face-alist) + (progn + (garbage-collect) + (load "faces") + (load "facemenu"))) +(if (fboundp 'track-mouse) + (progn + (garbage-collect) + (load "mouse") + (garbage-collect) + (load "scroll-bar") + (load "select"))) +(load "menu-bar") +(garbage-collect) (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 "register") (garbage-collect) (load "paragraphs") +(garbage-collect) (load "lisp-mode") (garbage-collect) (load "text-mode") -(load "fill") (garbage-collect) -(load "c-mode") -(garbage-collect) -(load "isearch") +(load "fill") (garbage-collect) (load "replace") (if (eq system-type 'vax-vms) @@ -62,21 +107,62 @@ (progn (garbage-collect) (load "vms-patch"))) +(if (eq system-type 'windows-nt) + (progn + (garbage-collect) + (load "ls-lisp") + (garbage-collect) + (load "disp-table") ; needed to setup ibm-pc char set, see internal.el + (garbage-collect) + (load "winnt") + (garbage-collect))) +(if (eq system-type 'ms-dos) + (progn + (load "ls-lisp") + (garbage-collect) + (load "dos-fns") + (garbage-collect) + (load "disp-table") ; needed to setup ibm-pc char set, see internal.el + (garbage-collect))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if (garbage-collect) ; we have float support. (load "float-sup"))) +(garbage-collect) +(load "vc-hooks") +(load "ediff-hook") + ;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 ../etc/makedoc.com. -;For other systems, you must edit ../src/ymakefile. +;is generated. For VMS, you must edit ../vms/makedoc.com. +;For other systems, you must edit ../src/Makefile.in. (if (load "site-load" t) (garbage-collect)) -(load "version.el") ;Don't get confused if someone compiled version.el by mistake. +(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 ".")) + (files (file-name-all-completions base default-directory)) + (versions (mapcar (function (lambda (name) + (string-to-int (substring name (length base))))) + files))) + (setq emacs-version (format "%s.%d" + emacs-version + (if versions + (1+ (apply 'max versions)) + 1))))) ;; Note: all compiled Lisp files loaded above this point ;; must be among the ones parsed by make-docfile @@ -84,16 +170,21 @@ ;; for DOC will not have doc strings in the dumped Emacs. (message "Finding pointers to doc strings...") -(if (fboundp 'dump-emacs) +(if (or (equal (nth 3 command-line-args) "dump") + (equal (nth 4 command-line-args) "dump")) (let ((name emacs-version)) (while (string-match "[^-+_.a-zA-Z0-9]+" name) (setq name (concat (downcase (substring name 0 (match-beginning 0))) "-" (substring name (match-end 0))))) - (copy-file (expand-file-name "../etc/DOC") - (concat (expand-file-name "../etc/DOC-") name) - t) - (Snarf-documentation (concat "DOC-" name))) + (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)) + (copy-file (expand-file-name "../etc/DOC") name t)) + (Snarf-documentation (file-name-nondirectory name))) (Snarf-documentation "DOC")) (message "Finding pointers to doc strings...done") @@ -101,8 +192,12 @@ ;by writing a site-init.el that loads them. ;See also "site-load" above. (load "site-init" t) +(setq current-load-list nil) (garbage-collect) +;;; At this point, we're ready to resume undo recording for scratch. +(buffer-enable-undo "*scratch*") + (if (or (equal (nth 3 command-line-args) "dump") (equal (nth 4 command-line-args) "dump")) (if (eq system-type 'vax-vms) @@ -115,18 +210,26 @@ (setq name (concat (downcase (substring name 0 (match-beginning 0))) "-" (substring name (match-end 0))))) - (message "Dumping under names xemacs and %s" name)) + (if (eq system-type 'ms-dos) + (message "Dumping under the name emacs") + (message "Dumping under names emacs and %s" name))) (condition-case () - (delete-file "xemacs") + (delete-file "emacs") (file-error nil)) - (dump-emacs "xemacs" "temacs") + ;; 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. + (dump-emacs "emacs" "temacs") + (message "%d pure bytes used" pure-bytes-used) ;; Recompute NAME now, so that it isn't set when we dump. - (let ((name (concat "emacs-" emacs-version))) - (while (string-match "[^-+_.a-zA-Z0-9]+" name) - (setq name (concat (downcase (substring name 0 (match-beginning 0))) - "-" - (substring name (match-end 0))))) - (add-name-to-file "xemacs" name t)) + (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))) + "-" + (substring name (match-end 0))))) + (add-name-to-file "emacs" name t))) (kill-emacs))) ;; Avoid error if user loads some more libraries now. @@ -136,5 +239,11 @@ ;; this file must be loaded each time Emacs is run. ;; So run the startup code now. -(or (fboundp 'dump-emacs) - (eval top-level)) +(or (equal (nth 3 command-line-args) "dump") + (equal (nth 4 command-line-args) "dump") + (progn + ;; Avoid loading loadup.el a second time! + (setq command-line-args (cdr (cdr command-line-args))) + (eval top-level))) + +;;; loadup.el ends here