From c162b6716f164a82083f2624db2ac0e7378d3b2a Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Fri, 10 Mar 2017 16:48:28 -0700
Subject: [PATCH] Minimize differences with master.

---
 doc/Makefile.in                  |  3 +--
 src/compiler/Stage.sh            | 18 +-----------------
 src/edwin/editor.scm             |  7 +------
 src/edwin/filcom.scm             | 13 ++-----------
 src/edwin/nntp.scm               | 13 ++-----------
 src/etc/compile-boot-compiler.sh |  2 +-
 6 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2ab21ece8..4aa52bc4d 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -65,7 +65,6 @@ htmldir = @htmldir@
 pdfdir = @pdfdir@
 psdir = @psdir@
 INST_TARGETS = @INST_TARGETS@
-PROJECT_NAME = @PACKAGE_TARNAME@
 
 SUBDIRS = ffi ref-manual sos user-manual
 DISTCLEAN_FILES = Makefile make-common config.log config.status
@@ -118,7 +117,7 @@ install-info-gz install-info:
 
 install-man:
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-	$(INSTALL_DATA) ${PROJECT_NAME}.1 $(DESTDIR)$(mandir)/man1/.
+	$(INSTALL_DATA) mit-scheme-pucked.1 $(DESTDIR)$(mandir)/man1/.
 
 install-html:
 	$(mkinstalldirs) $(DESTDIR)$(htmldir)
diff --git a/src/compiler/Stage.sh b/src/compiler/Stage.sh
index da07878a7..19454bbbe 100755
--- a/src/compiler/Stage.sh
+++ b/src/compiler/Stage.sh
@@ -52,23 +52,7 @@ make-cross)
 	  maybe_mv *.com "$S"
 	  maybe_mv *.bci "$S"
 	  maybe_mv *.moc "$S"
-	  maybe_mv *.fni "$S"
-	  maybe_mv *.lap "$S"
-	  maybe_mv *.rtl "$S" )
-    done
-    ;;
-make-clean)
-    for D in $SUBDIRS; do
-	( cd $D
-	  mkdir "$S"
-	  maybe_mv *.bin "$S"
-	  maybe_mv *.ext "$S"
-	  maybe_mv *.com "$S"
-	  maybe_mv *.bci "$S"
-	  maybe_mv *.moc "$S"
-	  maybe_mv *.fni "$S"
-	  maybe_mv *.lap "$S"
-	  maybe_mv *.rtl "$S" )
+	  maybe_mv *.fni "$S" )
     done
     ;;
 unmake)
diff --git a/src/edwin/editor.scm b/src/edwin/editor.scm
index 25bc60053..e74655e9c 100644
--- a/src/edwin/editor.scm
+++ b/src/edwin/editor.scm
@@ -616,12 +616,7 @@ TRANSCRIPT    messages appear in transcript buffer, if it is enabled;
   (if (not inferior-thread-changes?)
       (begin
 	(set! inferior-thread-changes? #t)
-	(hook/signal-inferior-thread-output!))))
-
-(define (signal-inferior-thread-output!)
-  (signal-thread-event editor-thread #f))
-
-(define hook/signal-inferior-thread-output! signal-inferior-thread-output!)
+	(signal-thread-event editor-thread #f))))
 
 (define (inferior-thread-run-light! flags)
   (set-car! flags #t)
diff --git a/src/edwin/filcom.scm b/src/edwin/filcom.scm
index f343b17c6..9e3f6641c 100644
--- a/src/edwin/filcom.scm
+++ b/src/edwin/filcom.scm
@@ -654,18 +654,9 @@ Prefix arg means treat the plaintext file as binary data."
   (lambda (from to binary-plaintext?)
     (blowfish-decrypt-file from to binary-plaintext? #f)))
 
-(define blowfish-available?
-  (let ((available? #f))
-    (named-lambda (blowfish-available?)
-      (or available?
-	  (let ((val (ignore-errors (lambda () (load-option 'blowfish)))))
-	    (and (not (condition? val))
-		 (begin
-		   (set! available? #t)
-		   #t)))))))
-
 (define (guarantee-blowfish-available)
-  (if (not (blowfish-available?))
+  (if (not (ignore-errors (lambda () (load-option 'blowfish))
+			  (lambda (condition) condition #f)))
       (editor-error "Blowfish encryption not supported on this system.")))
 
 (define (blowfish-encrypt-file from to binary-plaintext? delete-plaintext?)
diff --git a/src/edwin/nntp.scm b/src/edwin/nntp.scm
index 711ddf52c..a4f92f3d7 100644
--- a/src/edwin/nntp.scm
+++ b/src/edwin/nntp.scm
@@ -37,16 +37,6 @@ USA.
 ;;; method for combining headers into conversation threads.
 
 (declare (usual-integrations))
-
-(define gdbm-available?
-  (let ((available? #f))
-    (named-lambda (gdbm-available?)
-      (or available?
-	  (let ((val (ignore-errors (lambda () (load-option 'GDBM)))))
-	    (and (not (condition? val))
-		 (begin
-		   (set! available? #t)
-		   #t)))))))
 
 ;;;; NNTP Connection
 
@@ -540,7 +530,8 @@ USA.
 	      (news-group:%last-article group))))
 
 (define (news-group:use-gdbm? group type)
-  (and (gdbm-available?)
+  (and (ignore-errors (lambda () (load-option 'GDBM))
+		      (lambda (condition) condition #f))
        (memq type (news-group:%use-gdbm? group))))
 
 (define (set-news-group:use-gdbm! group types)
diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index 2021980f4..e0de1cc75 100755
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -71,4 +71,4 @@ run_cmd "${EXE}" --batch-mode --library lib --band x-runtime.com <<EOF
 EOF
 
 # Remove host (native) code (.bins as well as .coms) to STAGEX/ subdirs.
-run_cmd ./Stage.sh make-clean X
+run_cmd ./Stage.sh make X
-- 
2.25.1