[Emacs-diffs] Changes to emacs/lisp/loadup.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/21 01:38:39

Index: lisp/loadup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/loadup.el,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- lisp/loadup.el      8 May 2008 11:15:22 -0000       1.168
+++ lisp/loadup.el      21 Jun 2008 01:38:37 -0000      1.169
@@ -343,14 +343,9 @@
          (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)))
+        (message "Dumping under the name emacs"))
       (condition-case ()
          (delete-file "emacs")
        (file-error nil))
@@ -361,12 +356,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)))