[Emacs-diffs] Changes to emacs/lisp/loadup.el [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/lisp/loadup.el
diff -c /dev/null emacs/lisp/loadup.el:1.131.2.1
*** /dev/null   Mon Sep  8 08:56:05 2003
--- emacs/lisp/loadup.el        Mon Sep  8 08:53:37 2003
***************
*** 0 ****
--- 1,347 ----
+ ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
+ 
+ ;; Copyright (C) 1985, 1986, 1992, 1994, 2001 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 2, 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
+ ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ;; 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., 59 Temple Place - Suite 330,
+ ;; Boston, MA 02111-1307, USA.
+ 
+ ;;; Commentary:
+ 
+ ;; This is loaded into a bare Emacs to make a dumpable one.
+ 
+ ;;; Code:
+ 
+ ;; add subdirectories to the load-path for files that might
+ ;; get autoloaded when bootstrapping
+ (if (or (equal (nth 3 command-line-args) "bootstrap")
+       (equal (nth 4 command-line-args) "bootstrap")
+       ;; in case CANNOT_DUMP
+       (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
+     (let ((dir (car load-path)))
+       ;; We'll probably overflow the pure space.
+       (setq purify-flag nil)
+       (setq load-path (list dir
+                           (expand-file-name "emacs-lisp" dir)
+                           (expand-file-name "language" dir)
+                           (expand-file-name "international" dir)
+                           (expand-file-name "textmodes" dir)))))
+ 
+ (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 "emacs-lisp/byte-run")
+ (load "emacs-lisp/backquote")
+ (load "subr")
+ 
+ ;; We specify .el in case someone compiled version.el by mistake.
+ (load "version.el")
+ 
+ (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 "format")
+ (load "bindings")
+ (setq load-source-file-function 'load-with-code-conversion)
+ (load "files")
+ 
+ (load "cus-face")
+ (load "faces")  ; after here, `defface' may be used.
+ 
+ (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))
+ (load "simple")
+ 
+ (load "help")
+ 
+ ;; Any Emacs Lisp source file (*.el) loaded here after can contain
+ ;; multilingual text.
+ (load "international/mule-cmds")
+ (load "case-table")
+ (load "composite")
+ (load "international/characters")
+ 
+ ;; Load language-specific files.
+ (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/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")
+ (load "language/utf-8-lang")
+ (load "language/georgian")
+ 
+ (load "indent")
+ (load "window")
+ (load "frame")
+ (load "term/tty-colors")
+ (load "font-core")
+ 
+ (if (fboundp 'frame-face-alist)
+     (progn
+       (load "facemenu")))
+ (if (fboundp 'track-mouse)
+     (progn
+       (load "mouse")
+       (and (boundp 'x-toolkit-scroll-bars)
+          (load "scroll-bar"))
+       (load "select")))
+ (load "emacs-lisp/timer")
+ (load "isearch")
+ 
+ (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")
+ (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
+       (load "vmsproc")))
+ (load "abbrev")
+ (load "buff-menu")
+ (if (eq system-type 'vax-vms)
+     (progn
+       (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-vars")
+       (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
+       (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
+ (if (eq system-type 'macos)
+     (progn
+       (load "ls-lisp")))
+ (if (fboundp 'atan)   ; preload some constants and
+     (progn            ; floating pt. functions if we have float support.
+       (load "emacs-lisp/float-sup")))
+ (message "%s" (garbage-collect))
+ 
+ (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.
+ (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 "."))
+          (files (file-name-all-completions base default-directory))
+          (versions (mapcar (function (lambda (name)
+                                        (string-to-int (substring name (length 
base)))))
+                            files)))
+       ;; `emacs-version' is a constant, so we shouldn't change it with `setq'.
+       (defconst 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
+ ;; to construct DOC.  Any that are not processed
+ ;; for DOC will not have doc strings in the dumped Emacs.
+ 
+ (message "Finding pointers to doc strings...")
+ (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)))))
+       (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)))
+     (condition-case nil
+       (Snarf-documentation "DOC")
+       (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.
+ (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.
+ ;; 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)
+ 
+ ;; reset the load-path.  See lread.c:init_lread why.
+ (if (or (equal (nth 3 command-line-args) "bootstrap")
+       (equal (nth 4 command-line-args) "bootstrap"))
+     (setcdr load-path nil))
+ 
+ (clear-charset-maps)
+ (garbage-collect)
+ 
+ ;;; At this point, we're ready to resume undo recording for scratch.
+ (buffer-enable-undo "*scratch*")
+ 
+ (if (null (garbage-collect))
+     (setq pure-space-overflow t))
+ 
+ (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 (eq system-type 'ms-dos)
+           (message "Dumping under the name emacs")
+         (message "Dumping under names emacs and %s" name)))
+       (condition-case ()
+         (delete-file "emacs")
+       (file-error nil))
+       ;; 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 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 (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.
+ (setq purify-flag nil)
+ 
+ ;; 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.  First, remove `-l loadup' from args.
+ 
+ (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)
+ 
+ 
+ ;;; Local Variables:
+ ;;; no-byte-compile: t
+ ;;; no-update-autoloads: t
+ ;;; End:
+ ;;; loadup.el ends here