From 517a804807e378c65e1e11a2aa55a957ccdb9fb0 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 5 Aug 1988 20:49:51 +0000
Subject: [PATCH] Replace occurrences of `*the-non-printing-object*' with
 `unspecific'. Flush randomness dealing with old `error' macro, specifically
 because it referred to `*the-non-printing-object*'.

---
 v7/src/runtime/advice.scm |  8 ++++----
 v7/src/runtime/dbgcmd.scm |  4 ++--
 v7/src/runtime/error.scm  | 14 +++----------
 v7/src/runtime/format.scm |  4 ++--
 v7/src/runtime/gcnote.scm |  5 ++---
 v7/src/runtime/global.scm |  4 ++--
 v7/src/runtime/infutl.scm |  4 ++--
 v7/src/runtime/list.scm   |  4 ++--
 v7/src/runtime/load.scm   |  6 +++---
 v7/src/runtime/output.scm | 18 ++++++++---------
 v7/src/runtime/packag.scm |  5 ++---
 v7/src/runtime/parse.scm  |  8 +++++---
 v7/src/runtime/pp.scm     |  4 ++--
 v7/src/runtime/rep.scm    |  8 ++++----
 v7/src/runtime/savres.scm |  4 ++--
 v7/src/runtime/sfile.scm  |  6 +++---
 v7/src/runtime/syntax.scm | 21 ++++++++++----------
 v7/src/runtime/system.scm |  6 +++---
 v7/src/runtime/uerror.scm |  4 ++--
 v7/src/runtime/unsyn.scm  | 41 +++++++++++++++++++++------------------
 v7/src/runtime/where.scm  |  4 ++--
 v8/src/runtime/global.scm |  4 ++--
 v8/src/runtime/infutl.scm |  4 ++--
 v8/src/runtime/load.scm   |  6 +++---
 24 files changed, 96 insertions(+), 100 deletions(-)

diff --git a/v7/src/runtime/advice.scm b/v7/src/runtime/advice.scm
index 1e93e0aa0..93efc1e71 100644
--- a/v7/src/runtime/advice.scm
+++ b/v7/src/runtime/advice.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/advice.scm,v 14.1 1988/06/13 11:38:43 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/advice.scm,v 14.2 1988/08/05 20:46:42 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -418,7 +418,7 @@ MIT in each case. |#
 
 (define ((wrap-general-advisor advisor) procedure advice . path)
   (advisor (find-internal-lambda procedure path) advice)
-  *the-non-printing-object*)
+  unspecific)
 
 (define advise-entry)
 (define advise-exit)
@@ -428,7 +428,7 @@ MIT in each case. |#
       (map-over-population unadvisor)
       (unadvisor (find-internal-lambda (car procedure&path)
 				       (cdr procedure&path))))
-  *the-non-printing-object*)
+  unspecific)
 
 (define wrap-entry-unadvisor)
 (define wrap-exit-unadvisor)
@@ -445,7 +445,7 @@ MIT in each case. |#
 
 (define ((wrap-advisor advisor) procedure . path)
   (advisor (find-internal-lambda procedure path))
-  *the-non-printing-object*)
+  unspecific)
 
 (define trace-entry)
 (define trace-exit)
diff --git a/v7/src/runtime/dbgcmd.scm b/v7/src/runtime/dbgcmd.scm
index 7f36da71e..40efcc6a9 100644
--- a/v7/src/runtime/dbgcmd.scm
+++ b/v7/src/runtime/dbgcmd.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/dbgcmd.scm,v 14.2 1988/06/13 11:43:06 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/dbgcmd.scm,v 14.3 1988/08/05 20:46:52 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -94,7 +94,7 @@ MIT in each case. |#
 	      (write-string "   ")
 	      (write-string (caddr entry)))
 	    (cdr command-set))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (standard-exit-command)  (proceed))
 
diff --git a/v7/src/runtime/error.scm b/v7/src/runtime/error.scm
index 7157632b9..708a04634 100644
--- a/v7/src/runtime/error.scm
+++ b/v7/src/runtime/error.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/error.scm,v 14.4 1988/07/14 07:40:00 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/error.scm,v 14.5 1988/08/05 20:47:00 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -65,15 +65,7 @@ MIT in each case. |#
 (define (error-procedure-handler message irritants environment)
   (with-proceed-point proceed-value-filter
     (lambda ()
-      (simple-error
-       environment
-       message
-       ;; Kludge to support minimal upwards compatibility with `error'
-       ;; forms syntaxed by older syntaxer.  Should be flushed after
-       ;; new runtime system has been in use for a while.
-       (cond ((eq? irritants *the-non-printing-object*) '())
-	     ((or (null? irritants) (pair? irritants)) irritants)
-	     (else (list irritants)))))))
+      (simple-error environment message irritants))))
 
 (define (error-from-compiled-code message . irritants)
   (with-proceed-point proceed-value-filter
@@ -89,7 +81,7 @@ MIT in each case. |#
 	      (continuation/first-subproblem continuation))))
     (if next-subproblem
 	((stack-frame->continuation next-subproblem) (car values))
-	(continuation *the-non-printing-object*))))
+	(continuation unspecific))))
 
 (define (simple-error environment message irritants)
   (signal-error
diff --git a/v7/src/runtime/format.scm b/v7/src/runtime/format.scm
index 1f4e6867d..10bfdab38 100644
--- a/v7/src/runtime/format.scm
+++ b/v7/src/runtime/format.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/format.scm,v 14.3 1988/07/07 15:45:54 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/format.scm,v 14.4 1988/08/05 20:47:10 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -68,7 +68,7 @@ MIT in each case. |#
 	 (lambda (port)
 	   (format-loop port format-string arguments)
 	   (output-port/flush-output port)
-	   *the-non-printing-object*)))
+	   unspecific)))
     (cond ((not destination)
 	   (with-output-to-string (lambda () (start (current-output-port)))))
 	  ((eq? destination true)
diff --git a/v7/src/runtime/gcnote.scm b/v7/src/runtime/gcnote.scm
index dc3f2dd1f..b4433283f 100644
--- a/v7/src/runtime/gcnote.scm
+++ b/v7/src/runtime/gcnote.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gcnote.scm,v 14.2 1988/06/13 11:45:12 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/gcnote.scm,v 14.3 1988/08/05 20:47:17 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -43,8 +43,7 @@ MIT in each case. |#
 	  (cond ((eq? current gc-notification) default/record-statistic!)
 		((eq? current default/record-statistic!) gc-notification)
 		(else (error "Can't grab GC statistics hook")))))
-  *the-non-printing-object*)
-
+  unspecific)
 (define (gc-notification statistic)
   (with-output-to-port (cmdl/output-port (nearest-cmdl))
     (lambda ()
diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm
index 75dbbe5c6..355019d80 100644
--- a/v7/src/runtime/global.scm
+++ b/v7/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.4 1988/08/05 20:15:45 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.5 1988/08/05 20:47:24 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -176,7 +176,7 @@ MIT in each case. |#
 
 (define (quit)
   (with-absolutely-no-interrupts (ucode-primitive halt))
-  *the-non-printing-object*)
+  unspecific)
 
 (define syntaxer/default-environment
   (let () (the-environment)))
diff --git a/v7/src/runtime/infutl.scm b/v7/src/runtime/infutl.scm
index 6fb4b128c..01820ce3f 100644
--- a/v7/src/runtime/infutl.scm
+++ b/v7/src/runtime/infutl.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infutl.scm,v 1.2 1988/06/16 06:31:04 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/infutl.scm,v 1.3 1988/08/05 20:47:32 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -370,7 +370,7 @@ MIT in each case. |#
 	  (procedure (vector-ref vector index))
 	  (if (< index high)
 	      (loop (1+ index))))))
-    (lambda () *the-non-printing-object*)))
+    (lambda () unspecific)))
 
 (define (vector-binary-search-range vector key key=? compare if-found
 				    if-not-found)
diff --git a/v7/src/runtime/list.scm b/v7/src/runtime/list.scm
index cfcb8e8f6..096c848ed 100644
--- a/v7/src/runtime/list.scm
+++ b/v7/src/runtime/list.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/list.scm,v 14.1 1988/06/13 11:47:11 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/list.scm,v 14.2 1988/08/05 20:47:45 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -345,7 +345,7 @@ MIT in each case. |#
 					 (cons (cdr (car lists)) cdrs)))))
 		((not (null? (car lists)))
 		 (error "FOR-EACH: Argument not a list" (car lists)))))))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (mapcan f . lists)
   ;; Compiler doesn't, but ought to, make this very fast.
diff --git a/v7/src/runtime/load.scm b/v7/src/runtime/load.scm
index 94820fbf9..713aad527 100644
--- a/v7/src/runtime/load.scm
+++ b/v7/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/load.scm,v 14.3 1988/07/14 07:40:16 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/load.scm,v 14.4 1988/08/05 20:47:59 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -80,7 +80,7 @@ MIT in each case. |#
   (let ((truename (init-file-truename)))
     (if truename
 	(load truename user-initial-environment)))
-  *the-non-printing-object*)
+  unspecific)
 
 ;;; This is careful to do the minimum number of file existence probes
 ;;; before opening the input file.
@@ -185,4 +185,4 @@ MIT in each case. |#
 	(if (stream-pair? stream)
 	    (begin (write value)
 		   (loop (stream-car stream) (stream-cdr stream)))	    value))
-      *the-non-printing-object*))
\ No newline at end of file
+      unspecific))
\ No newline at end of file
diff --git a/v7/src/runtime/output.scm b/v7/src/runtime/output.scm
index 4feb28fba..e617bdda0 100644
--- a/v7/src/runtime/output.scm
+++ b/v7/src/runtime/output.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/output.scm,v 14.2 1988/07/14 07:40:24 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/output.scm,v 14.3 1988/08/05 20:48:08 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -172,7 +172,7 @@ MIT in each case. |#
 	     (guarantee-output-port port))))
     (output-port/write-char port #\Newline)
     (output-port/flush-output port))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (write-char char #!optional port)
   (let ((port
@@ -181,7 +181,7 @@ MIT in each case. |#
 	     (guarantee-output-port port))))
     (output-port/write-char port char)
     (output-port/flush-output port))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (write-string string #!optional port)
   (let ((port
@@ -190,13 +190,13 @@ MIT in each case. |#
 	     (guarantee-output-port port))))
     (output-port/write-string port string)
     (output-port/flush-output port))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (close-output-port port)
   (let ((operation (output-port/custom-operation port 'CLOSE)))
     (if operation
 	(operation port)))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (wrap-custom-operation-0 operation-name)
   (lambda (#!optional port)
@@ -209,7 +209,7 @@ MIT in each case. |#
 	    (begin
 	      (operation port)
 	      (output-port/flush-output port)))))
-    *the-non-printing-object*))
+    unspecific))
 
 (define beep)
 (define clear)
@@ -227,7 +227,7 @@ MIT in each case. |#
 	(output-port/write-string port object)
 	(unparse-object/internal object port 0 false unparser-table))
     (output-port/flush-output port))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (write object #!optional port unparser-table)
   (let ((port
@@ -240,7 +240,7 @@ MIT in each case. |#
 	     (guarantee-unparser-table unparser-table))))
     (unparse-object/internal object port 0 true unparser-table)
     (output-port/flush-output port))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (write-line object #!optional port unparser-table)
   (let ((port
@@ -254,4 +254,4 @@ MIT in each case. |#
     (output-port/write-char port #\Newline)
     (unparse-object/internal object port 0 true unparser-table)
     (output-port/flush-output port))
-  *the-non-printing-object*)
\ No newline at end of file
+  unspecific)
\ No newline at end of file
diff --git a/v7/src/runtime/packag.scm b/v7/src/runtime/packag.scm
index d423d4b53..e429e90f1 100644
--- a/v7/src/runtime/packag.scm
+++ b/v7/src/runtime/packag.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/packag.scm,v 14.3 1988/07/14 07:40:31 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/packag.scm,v 14.4 1988/08/05 20:48:18 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -106,8 +106,7 @@ MIT in each case. |#
 	     (lambda (filename environment)
 	       (load filename environment syntax-table true)))
 	   options)))))
-  *the-non-printing-object*)
-
+  unspecific)
 (define-integrable (package/reference package name)
   (lexical-reference (package/environment package) name))
 
diff --git a/v7/src/runtime/parse.scm b/v7/src/runtime/parse.scm
index 6f0836053..c8cab44a1 100644
--- a/v7/src/runtime/parse.scm
+++ b/v7/src/runtime/parse.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/parse.scm,v 14.3 1988/07/15 22:31:58 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/parse.scm,v 14.4 1988/08/05 20:48:25 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -206,8 +206,10 @@ MIT in each case. |#
   (parse-error "end of file"))
 
 (define (parse-error message #!optional irritant)
-  (error (string-append "PARSE-OBJECT: " message)
-	 (if (default-object? irritant) *the-non-printing-object* irritant)))
+  (let ((message (string-append "PARSE-OBJECT: " message)))
+    (if (default-object? irritant)
+	(error message)
+	(error message irritant))))
 
 ;;;; Dispatch Points
 
diff --git a/v7/src/runtime/pp.scm b/v7/src/runtime/pp.scm
index 0f87f8d40..572f1a079 100644
--- a/v7/src/runtime/pp.scm
+++ b/v7/src/runtime/pp.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pp.scm,v 14.2 1988/08/05 19:44:30 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/pp.scm,v 14.3 1988/08/05 20:48:37 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -83,7 +83,7 @@ MIT in each case. |#
 		     (named-structure/description object)))
 	  (else
 	   (pp-top-level port object as-code?))))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (pp-top-level port expression as-code?)
   (fluid-let
diff --git a/v7/src/runtime/rep.scm b/v7/src/runtime/rep.scm
index 24cb5a822..77cce9478 100644
--- a/v7/src/runtime/rep.scm
+++ b/v7/src/runtime/rep.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/rep.scm,v 14.5 1988/08/01 23:09:21 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/rep.scm,v 14.6 1988/08/05 20:48:47 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -242,7 +242,7 @@ MIT in each case. |#
 (define (standard-value-filter continuation arguments)
   (continuation
    (if (null? arguments)
-       *the-non-printing-object*
+       unspecific
        (car arguments))))
 
 ;;;; REP Loops
@@ -469,12 +469,12 @@ MIT in each case. |#
   (guarantee-syntax-table syntax-table)
   (set! user-repl-syntax-table syntax-table)
   (set-repl-state/syntax-table! (cmdl/state (nearest-repl)) syntax-table)
-  *the-non-printing-object*)
+  unspecific)
 
 (define (vst syntax-table)
   (guarantee-syntax-table syntax-table)
   (set-repl-state/syntax-table! (cmdl/state (nearest-repl)) syntax-table)
-  *the-non-printing-object*)
+  unspecific)
 
 (define (re #!optional index)
   (let ((repl (nearest-repl)))
diff --git a/v7/src/runtime/savres.scm b/v7/src/runtime/savres.scm
index 03be208bd..c249a9395 100644
--- a/v7/src/runtime/savres.scm
+++ b/v7/src/runtime/savres.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.2 1988/06/13 11:50:50 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/savres.scm,v 14.3 1988/08/05 20:48:56 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -65,7 +65,7 @@ MIT in each case. |#
       (save-image filename
 		  (lambda ()
 		    (set! time-world-saved time)
-		    *the-non-printing-object*)
+		    unspecific)
 		  (lambda ()
 		    (set! time-world-saved time)
 		    (event-distributor/invoke! event:after-restore)
diff --git a/v7/src/runtime/sfile.scm b/v7/src/runtime/sfile.scm
index e654bb83e..72ec44ea5 100644
--- a/v7/src/runtime/sfile.scm
+++ b/v7/src/runtime/sfile.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/sfile.scm,v 14.1 1988/06/13 11:51:34 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/sfile.scm,v 14.2 1988/08/05 20:49:04 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -52,9 +52,9 @@ MIT in each case. |#
   (if (not ((ucode-primitive photo-open)
 	    (canonicalize-output-filename filename)))
       (error "TRANSCRIPT-ON: Transcript file already open" filename))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (transcript-off)
   (if (not ((ucode-primitive photo-close)))
       (error "TRANSCRIPT-OFF: Transcript file already closed"))
-  *the-non-printing-object*)
\ No newline at end of file
+  unspecific)
\ No newline at end of file
diff --git a/v7/src/runtime/syntax.scm b/v7/src/runtime/syntax.scm
index c1de76193..c4d5b6fa2 100644
--- a/v7/src/runtime/syntax.scm
+++ b/v7/src/runtime/syntax.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/Attic/syntax.scm,v 14.4 1988/07/16 10:14:30 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/Attic/syntax.scm,v 14.5 1988/08/05 20:49:14 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -166,15 +166,16 @@ MIT in each case. |#
     (apply transform (cdr expression))))
 
 (define (syntax-error message . irritants)
-  (error (string-append "SYNTAX: "
-			(if *current-keyword*
-			    (string-append (symbol->string *current-keyword*)
-					   ": "
-					   message)
-			    message))
-	 (cond ((null? irritants) *the-non-printing-object*)
-	       ((null? (cdr irritants)) (car irritants))
-	       (else irritants))))
+  (error-procedure
+   (string-append "SYNTAX: "
+		  (if *current-keyword*
+		      (string-append (symbol->string *current-keyword*)
+				     ": "
+				     message)
+		      message))
+   irritants
+   ;; This is not really the right environment.  Perhaps nothing is.
+   syntaxer/default-environment))
 
 (define (syntax-expressions expressions)
   (if (null? expressions)
diff --git a/v7/src/runtime/system.scm b/v7/src/runtime/system.scm
index 71edd83da..87de2cc27 100644
--- a/v7/src/runtime/system.scm
+++ b/v7/src/runtime/system.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/system.scm,v 14.3 1988/06/30 22:22:23 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/system.scm,v 14.4 1988/08/05 20:49:26 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -55,7 +55,7 @@ MIT in each case. |#
 
 (define (add-system! system)
   (set! known-systems (append! known-systems (list system)))
-  *the-non-printing-object*)
+  unspecific)
 
 (define (for-each-system! procedure)
   (for-each procedure known-systems))
@@ -106,7 +106,7 @@ MIT in each case. |#
     (newline)
     (write-string "Done"))
   (add-system! system)
-  *the-non-printing-object*)
+  unspecific)
 
 (define (split-list list n receiver)
   (if (or (not (pair? list)) (zero? n))
diff --git a/v7/src/runtime/uerror.scm b/v7/src/runtime/uerror.scm
index b0deb974d..e4a43399e 100644
--- a/v7/src/runtime/uerror.scm
+++ b/v7/src/runtime/uerror.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/uerror.scm,v 14.3 1988/07/22 22:53:14 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/uerror.scm,v 14.4 1988/08/05 20:49:33 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -385,7 +385,7 @@ MIT in each case. |#
 					  (cons frame-filter handler)))))
 		(else
 		 (error "Can't overwrite error handler" entry)))))
-      *the-non-printing-object*)
+      unspecific)
 
     (define (define-standard-frame-handler error-type frame-type frame-filter
 	      irritant)
diff --git a/v7/src/runtime/unsyn.scm b/v7/src/runtime/unsyn.scm
index b509f8127..8f39dcb7e 100644
--- a/v7/src/runtime/unsyn.scm
+++ b/v7/src/runtime/unsyn.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/unsyn.scm,v 14.2 1988/06/14 14:45:31 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/unsyn.scm,v 14.3 1988/08/05 20:49:43 cph Rel $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -76,13 +76,10 @@ MIT in each case. |#
 	    (unsyntax-objects (cdr objects)))))
 
 (define (unsyntax-error keyword message . irritants)
-  (error (string-append "UNSYNTAX: "
-			(symbol->string keyword)
-			": "
-			message)
-	 (cond ((null? irritants) *the-non-printing-object*)
-	       ((null? (cdr irritants)) (car irritants))
-	       (else irritants))))
+  (error-procedure
+   (string-append "UNSYNTAX: " (symbol->string keyword) ": " message)
+   irritants
+   system-global-environment))
 
 ;;;; Unsyntax Quanta
 
@@ -319,17 +316,23 @@ MIT in each case. |#
 (define (unsyntax-error-like-form operands name)
   (cons* name
 	 (unsyntax-object (first operands))
-	 (let ((operand (second operands)))
-	   (cond ((absolute-reference-to? operand '*THE-NON-PRINTING-OBJECT*)
-		  '())
-		 ((combination? operand)
-		  (combination-components operand
-		    (lambda (operator operands)
-		      (if (absolute-reference-to? operator 'LIST)
-			  (unsyntax-objects operands)
-			  `(,(unsyntax-object operand))))))
-		 (else
-		  `(,(unsyntax-object operand)))))))
+	 (unsyntax-objects
+	  (let loop ((irritants (cadr operands)))
+	    (cond ((null? irritants) '())
+		  ((and (combination? irritants)
+			(absolute-reference-to?
+			 (combination-operator irritants)
+			 'LIST))
+		   (combination-operands irritants))
+		  ((and (combination? irritants)
+			(eq? (combination-operator irritants) cons))
+		   (let ((operands (combination-operands irritants)))
+		     (cons (car operands)
+			   (loop (cadr operands)))))
+		  (else
+		   ;; Actually, this is an error.  But do something useful
+		   ;; here just in case it actually happens.
+		   (list irritants)))))))
 
 (define (unsyntax/fluid-let names values body if-malformed)
   (combination-components body
diff --git a/v7/src/runtime/where.scm b/v7/src/runtime/where.scm
index e4a87b669..407a1c385 100644
--- a/v7/src/runtime/where.scm
+++ b/v7/src/runtime/where.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/where.scm,v 14.3 1988/08/01 23:09:58 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/where.scm,v 14.4 1988/08/05 20:49:51 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -93,7 +93,7 @@ MIT in each case. |#
 	(begin (show-frame env depth)
 	       (if (environment-has-parent? env)
 		   (s1 (environment-parent env) (1+ depth))))))
-  *the-non-printing-object*)
+  unspecific)
 
 ;;;; Motion Commands
 
diff --git a/v8/src/runtime/global.scm b/v8/src/runtime/global.scm
index e7cbdad16..e041c4203 100644
--- a/v8/src/runtime/global.scm
+++ b/v8/src/runtime/global.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.4 1988/08/05 20:15:45 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.5 1988/08/05 20:47:24 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -176,7 +176,7 @@ MIT in each case. |#
 
 (define (quit)
   (with-absolutely-no-interrupts (ucode-primitive halt))
-  *the-non-printing-object*)
+  unspecific)
 
 (define syntaxer/default-environment
   (let () (the-environment)))
diff --git a/v8/src/runtime/infutl.scm b/v8/src/runtime/infutl.scm
index a8a700dee..da5deddfa 100644
--- a/v8/src/runtime/infutl.scm
+++ b/v8/src/runtime/infutl.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infutl.scm,v 1.2 1988/06/16 06:31:04 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/infutl.scm,v 1.3 1988/08/05 20:47:32 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -370,7 +370,7 @@ MIT in each case. |#
 	  (procedure (vector-ref vector index))
 	  (if (< index high)
 	      (loop (1+ index))))))
-    (lambda () *the-non-printing-object*)))
+    (lambda () unspecific)))
 
 (define (vector-binary-search-range vector key key=? compare if-found
 				    if-not-found)
diff --git a/v8/src/runtime/load.scm b/v8/src/runtime/load.scm
index 21cddeddb..0cd85c806 100644
--- a/v8/src/runtime/load.scm
+++ b/v8/src/runtime/load.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/load.scm,v 14.3 1988/07/14 07:40:16 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/load.scm,v 14.4 1988/08/05 20:47:59 cph Exp $
 
 Copyright (c) 1988 Massachusetts Institute of Technology
 
@@ -80,7 +80,7 @@ MIT in each case. |#
   (let ((truename (init-file-truename)))
     (if truename
 	(load truename user-initial-environment)))
-  *the-non-printing-object*)
+  unspecific)
 
 ;;; This is careful to do the minimum number of file existence probes
 ;;; before opening the input file.
@@ -185,4 +185,4 @@ MIT in each case. |#
 	(if (stream-pair? stream)
 	    (begin (write value)
 		   (loop (stream-car stream) (stream-cdr stream)))	    value))
-      *the-non-printing-object*))
\ No newline at end of file
+      unspecific))
\ No newline at end of file
-- 
2.25.1