[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/raeburn-startup 20293d1 1/4: Eli's test patch to s
From: |
Ken Raeburn |
Subject: |
[Emacs-diffs] scratch/raeburn-startup 20293d1 1/4: Eli's test patch to stop using dump-emacs. |
Date: |
Thu, 2 Feb 2017 08:28:55 +0000 (UTC) |
branch: scratch/raeburn-startup
commit 20293d1351a497df63fc3eb1fe151bd2cb2ccd90
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>
Eli's test patch to stop using dump-emacs.
---
lisp/loadup.el | 42 +++++++++++++++++++++++-------------------
1 file changed, 23 insertions(+), 19 deletions(-)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 54d19c1..9bff9df 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -453,27 +453,30 @@ lost after dumping")))
;; 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 (or (eq system-type 'ms-dos)
- ;; Don't bother adding another name if we're just
- ;; building bootstrap-emacs.
- (equal (last command-line-args) '("bootstrap"))))
- (let ((name (concat "emacs-" emacs-version))
- (exe (if (eq system-type 'windows-nt) ".exe" "")))
- (while (string-match "[^-+_.a-zA-Z0-9]+" name)
- (setq name (concat (downcase (substring name 0 (match-beginning
0)))
+ ;; (dump-emacs "emacs" "temacs")
+ ;; (message "%d pure bytes used" pure-bytes-used)
+ (let ((exe (if (memq system-type '(windows-nt ms-dos)) ".exe" "")))
+ (copy-file (expand-file-name (concat "temacs" exe)
invocation-directory)
+ (expand-file-name (concat "emacs" exe) invocation-directory)
+ t)
+ ;; Recompute NAME now, so that it isn't set when we dump.
+ (if (not (or (eq system-type 'ms-dos)
+ ;; Don't bother adding another name if we're just
+ ;; building bootstrap-emacs.
+ (equal (last 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)))))
- (setq name (concat name exe))
- (message "Adding name %s" name)
- ;; When this runs on Windows, invocation-directory is not
- ;; necessarily the current directory.
- (add-name-to-file (expand-file-name (concat "emacs" exe)
- invocation-directory)
- (expand-file-name name invocation-directory)
- t)))
+ (setq name (concat name exe))
+ (message "Adding name %s" name)
+ ;; When this runs on Windows, invocation-directory is not
+ ;; necessarily the current directory.
+ (add-name-to-file (expand-file-name (concat "emacs" exe)
+ invocation-directory)
+ (expand-file-name name invocation-directory)
+ t))))
(message "Dumping into dumped.elc...preparing...")
;; Dump the current state into a file so we can reload it!
@@ -555,6 +558,7 @@ lost after dumping")))
obarray)
(message "Dumping into dumped.elc...printing...")
(with-current-buffer (generate-new-buffer "dumped.elc")
+ (setq default-directory invocation-directory)
(insert ";address@hidden@address@hidden;;; Compiled\n;;; in Emacs
version "
emacs-version "\n")
(let ((print-circle t)