From dbdfea8b74c9d4311baad6e9f1407a6655d6bb78 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@raeburn.org>
Date: Fri, 9 Jun 2017 02:56:28 -0400
Subject: [PATCH] Don't check for dump-emacs being bound.
---
lisp/loadup.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 12c7d2d720f..8ca80ee7dca 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -75,7 +75,7 @@
(nth 4 command-line-args)))
(member (nth 7 command-line-args) '("unidata-gen-file"
"unidata-gen-charprop"))
- (if (fboundp 'dump-emacs)
+ (if t; (fboundp 'dump-emacs)
(string-match "src/bootstrap-emacs" (nth 0 command-line-args))
t))
;; Value of max-lisp-eval-depth when compiling initially.
@@ -90,7 +90,7 @@
(message "Using load-path %s" load-path)
;; This is a poor man's `last', since we haven't loaded subr.el yet.
-(if (and (fboundp 'dump-emacs)
+(if (and t; (fboundp 'dump-emacs)
(or (equal (member "bootstrap" command-line-args) '("bootstrap"))
(equal (member "dump" command-line-args) '("dump"))))
(progn
@@ -353,14 +353,14 @@ lost after dumping")))
;; in non-ASCII directories is to manipulate unibyte strings in the
;; current locale's encoding.
(if (and (member (car (last command-line-args)) '("dump" "bootstrap"))
- (fboundp 'dump-emacs)
+ t; (fboundp 'dump-emacs)
(multibyte-string-p default-directory))
(error "default-directory must be unibyte when dumping Emacs!"))
;; Determine which build number to use
;; based on the executables that now exist.
(if (and (equal (last command-line-args) '("dump"))
- (fboundp 'dump-emacs)
+ t; (fboundp 'dump-emacs)
(not (eq system-type 'ms-dos)))
(let* ((base (concat "emacs-" emacs-version "."))
(exelen (if (eq system-type 'windows-nt) -4))
@@ -378,7 +378,7 @@ lost after dumping")))
(message "Finding pointers to doc strings...")
-(if (and (fboundp 'dump-emacs)
+(if (and t; (fboundp 'dump-emacs)
(equal (last command-line-args) '("dump")))
(Snarf-documentation "DOC" 'clear)
(condition-case nil
@@ -448,7 +448,7 @@ lost after dumping")))
;; Make sure we will attempt bidi reordering henceforth.
(setq redisplay--inhibit-bidi nil)
-(if (and (fboundp 'dump-emacs)
+(if (and t; (fboundp 'dump-emacs)
(member (car (last command-line-args)) '("dump" "bootstrap")))
(progn
;; Prevent build-time PATH getting stored in the binary.
--
2.39.5