X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/eb3fa2cfcfff550c08f5645c740608f97c2c949e..97e92ffbd42de8321677900fbc7dc44b51a4290e:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 44a73c901c..284c7e3a11 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 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -46,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)
@@ -93,7 +99,7 @@
 (load "help")
 
 (load "jka-cmpr-hook")
-(load "epa-file-hook")
+(load "epa-hook")
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")
@@ -166,9 +172,6 @@
 (message "%s" (garbage-collect))
 
 (load "replace")
-(if (eq system-type 'vax-vms)
-    (progn
-      (load "vmsproc")))
 (load "buff-menu")
 
 (if (fboundp 'x-create-frame)
@@ -182,36 +185,37 @@
 (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 'atan)	; preload some constants and
     (progn		; floating pt. functions if we have float support.
       (load "emacs-lisp/float-sup")))
@@ -227,7 +231,7 @@
 ;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))
@@ -327,6 +331,7 @@
 	(equal (nth 4 command-line-args) "bootstrap"))
     (setcdr load-path nil))
 
+(setq inhibit-load-charset-map nil)
 (clear-charset-maps)
 (garbage-collect)
 
@@ -338,19 +343,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))
@@ -361,12 +357,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)))