* bitmaps/README:

[bpt/emacs.git] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 805f82c..99abe3a 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -166,9 +166,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,16 +179,15 @@
 (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
@@ -209,9 +205,10 @@
 (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 +224,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))
@@ -338,19 +335,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 +349,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)))