X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6cc41fb06c37234822d5aedf7ce0f77b88bb450a..ab5c0fcd35dcdf465a597ed83e5783bbbf70eff1:/lisp/loadup.el diff --git a/lisp/loadup.el b/lisp/loadup.el index b2cb8276f0..da7613bee2 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -1,17 +1,17 @@ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs -;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009 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 +;; 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 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,9 +19,7 @@ ;; 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, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -48,6 +46,12 @@ (message "Using load-path %s" load-path) +(if (or (member (nth 3 command-line-args) '("dump" "bootstrap")) + (member (nth 4 command-line-args) '("dump" "bootstrap"))) + ;; To reduce the size of dumped Emacs, we avoid making huge + ;; char-tables. + (setq inhibit-load-charset-map t)) + ;; We don't want to have any undo records in the dumped Emacs. (set-buffer "*scratch*") (setq buffer-undo-list t) @@ -73,6 +77,7 @@ (load "cus-face") (load "faces") ; after here, `defface' may be used. +(load "minibuffer") (load "button") (load "startup") @@ -80,13 +85,21 @@ (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. + +(condition-case nil + ;; Don't get confused if someone compiled this by mistake. + (load "loaddefs.el") + ;; In case loaddefs hasn't been generated yet. + (file-error (load "ldefs-boot.el"))) + (message "%s" (garbage-collect)) +(load "abbrev") ;lisp-mode.el and simple.el use define-abbrev-table. (load "simple") (load "help") (load "jka-cmpr-hook") +(load "epa-hook") ;; Any Emacs Lisp source file (*.el) loaded here after can contain ;; multilingual text. (load "international/mule-cmds") @@ -101,10 +114,7 @@ (load "language/chinese") (load "language/cyrillic") (load "language/indian") -(load "language/devanagari") ; This should be loaded after indian. -(load "language/malayalam") ; This should be loaded after indian. -(load "language/tamil") ; This should be loaded after indian. -(load "language/kannada") ; This should be loaded after indian. +(load "language/sinhala") (load "language/english") (load "language/ethiopic") (load "language/european") @@ -124,7 +134,7 @@ (load "language/utf-8-lang") (load "language/georgian") (load "language/khmer") -(load "language/myanmar") +(load "language/burmese") (load "language/cham") (load "indent") @@ -156,16 +166,12 @@ (load "textmodes/page") (load "register") (load "textmodes/paragraphs") -(load "abbrev") ;lisp-mode.el uses define-abbrev-table. (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 - (load "vmsproc"))) (load "buff-menu") (if (fboundp 'x-create-frame) @@ -174,41 +180,42 @@ (load "image") (load "international/fontset") (load "dnd") - (load "mwheel") (load "tool-bar"))) (if (featurep 'x) (progn (load "x-dnd") + (load "term/common-win") (load "term/x-win"))) - + (message "%s" (garbage-collect)) -(if (eq system-type 'vax-vms) - (progn - (load "vms-patch"))) (if (eq system-type 'windows-nt) (progn (load "w32-vars") + (load "term/common-win") (load "term/w32-win") (load "ls-lisp") - (load "disp-table") ; needed to setup ibm-pc char set, see internal.el + (load "disp-table") (load "dos-w32") (load "w32-fns"))) (if (eq system-type 'ms-dos) (progn - (load "ls-lisp") (load "dos-w32") (load "dos-fns") (load "dos-vars") - (load "international/ccl") ; codepage.el uses CCL en/decoder - (load "international/codepage") ; internal.el uses cpNNN coding systems + ;; Don't load term/common-win: it isn't appropriate for the `pc' + ;; ``window system'', which generally behaves like a terminal. + (load "term/pc-win") + (load "ls-lisp") (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el -(if (eq system-type 'macos) - (progn - (load "ls-lisp"))) -(if (featurep 'mac-carbon) +(if (featurep 'ns) (progn - (load "term/mac-win"))) + (load "emacs-lisp/easymenu") ;; for platform-related menu adjustments + (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"))) @@ -224,17 +231,11 @@ ;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. +;is generated. ;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") @@ -254,6 +255,8 @@ ;; must be among the ones parsed by make-docfile ;; to construct DOC. Any that are not processed ;; for DOC will not have doc strings in the dumped Emacs. +;; Note also that any uncompiled files that are loaded should +;; have doc-strings that conform to the make-docfile convention. (message "Finding pointers to doc strings...") (if (or (equal (nth 3 command-line-args) "dump") @@ -324,6 +327,7 @@ (equal (nth 4 command-line-args) "bootstrap")) (setcdr load-path nil)) +(setq inhibit-load-charset-map nil) (clear-charset-maps) (garbage-collect) @@ -335,19 +339,10 @@ (if (or (member (nth 3 command-line-args) '("dump" "bootstrap")) (member (nth 4 command-line-args) '("dump" "bootstrap"))) - (if (eq system-type 'vax-vms) - (progn - (message "Dumping data as file temacs.dump") - (dump-emacs "temacs.dump" "temacs") - (kill-emacs)) - (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))))) - (if (memq system-type '(ms-dos windows-nt cygwin)) - (message "Dumping under the name emacs") - (message "Dumping under names emacs and %s" name))) + (progn + (if (memq system-type '(ms-dos windows-nt cygwin)) + (message "Dumping under the name emacs") + (message "Dumping under the name emacs")) (condition-case () (delete-file "emacs") (file-error nil)) @@ -358,12 +353,17 @@ (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 (memq system-type '(ms-dos windows-nt cygwin))) + (if (not (or (memq system-type '(ms-dos windows-nt cygwin)) + ;; Don't bother adding another name if we're just + ;; building bootstrap-emacs. + (equal (nth 3 command-line-args) "bootstrap") + (equal (nth 4 command-line-args) "bootstrap"))) (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))))) + (message "Adding name %s" name) (add-name-to-file "emacs" name t))) (kill-emacs))) @@ -381,10 +381,10 @@ (eval top-level) -;;; Local Variables: -;;; no-byte-compile: t -;;; no-update-autoloads: t -;;; End: +;; Local Variables: +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: -;;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335 +;; arch-tag: 121e1dd4-36e1-45ac-860e-239f577a6335 ;;; loadup.el ends here