diff --git a/library/FILEBROWSER b/library/FILEBROWSER
index d1e3c02b..6bccb058 100644
--- a/library/FILEBROWSER
+++ b/library/FILEBROWSER
@@ -1,11 +1,11 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10 FORMAT XCCS)
-(FILECREATED " 9-Jul-2021 23:09:57" 
-|{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.;4| 262331 
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
+(FILECREATED "21-Aug-2021 23:33:58" 
+|{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.;9| 263236 
 
-      |changes| |to:|  (FNS FB.EDITCOMMAND.ONEFILE)
+      |changes| |to:|  (FNS FB.FIX-DIRECTORY-DATES)
 
-      |previous| |date:| "27-Feb-2021 20:08:26" 
-|{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.;2|)
+      |previous| |date:| "21-Aug-2021 23:08:34" 
+|{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.;7|)
 
 
 ; Copyright (c) 1983-1991, 1993-1994, 1999-2001, 2021 by Venue & Xerox Corporation.
@@ -159,6 +159,10 @@ You specify how many versions to keep.")))
                                                               )
                                                        ("Shape to Fit" FB.SHAPECOMMAND 
                                      "Widen or narrow the browser so that all information is visible"
+                                                              )
+                                                       ("Fix directory dates" FB.FIX-DIRECTORY-DATES
+                                                              
+                                                "Ensure that directory dates match FILECREATED dates"
                                                               )))
                                          (|Sort| FB.SORTCOMMAND 
                                  "Sorts all the files in the browser by the attribute of your choice"
@@ -188,8 +192,8 @@ You specify how many versions to keep.")))
               (FNS FB.EDITCOMMAND FB.EDITCOMMAND.ONEFILE FB.EDITLISPFILE FB.BROWSECOMMAND)
               (FNS FB.FASTSEECOMMAND FB.FASTSEE.ONEFILE FB.SEEFULLFN FB.SEEBUTTONFN)
               (FNS FB.LOADCOMMAND FB.COMPILECOMMAND FB.OPERATE.ON.FILES)
-              (FNS FB.UPDATECOMMAND FB.MAYBE.EXPUNGE FB.UPDATEBROWSERITEMS FB.DATE 
-                   FB.ADJUST.DATE.WIDTH FB.SET.BROWSER.TITLE FB.MAYBE.WIDEN.NAMES 
+              (FNS FB.UPDATECOMMAND FB.FIX-DIRECTORY-DATES FB.MAYBE.EXPUNGE FB.UPDATEBROWSERITEMS 
+                   FB.DATE FB.ADJUST.DATE.WIDTH FB.SET.BROWSER.TITLE FB.MAYBE.WIDEN.NAMES 
                    FB.SET.DEFAULT.NAME.WIDTH FB.CREATE.FILEBUCKET FB.CHECK.NAME.LENGTH 
                    FB.ADD.FILEGROUP FB.INSERT.DIRECTORY FB.MAKE.SUBDIRECTORY.ITEM FB.ADD.FILE 
                    FB.INSERT.FILE FB.ANALYZE.PATTERN FB.CANONICALIZE.PATTERN FB.GETALLFILEINFO)
@@ -382,7 +386,9 @@ You specify how many versions to keep.")))
          "Change the depth to which future Recomputes will enumerate the directory (NS servers only)"
                               )
                        ("Shape to Fit" FB.SHAPECOMMAND 
-                              "Widen or narrow the browser so that all information is visible")))
+                              "Widen or narrow the browser so that all information is visible")
+                       ("Fix directory dates" FB.FIX-DIRECTORY-DATES 
+                              "Ensure that directory dates match FILECREATED dates")))
          (|Sort| FB.SORTCOMMAND "Sorts all the files in the browser by the attribute of your choice")
          ))
 
@@ -1678,8 +1684,8 @@ Your deletions are thus ignored.")))
                ELSE (FB.FASTSEECOMMAND BROWSER KEY ITEM MENU)))))
 
 (FB.EDITCOMMAND.ONEFILE
-  (LAMBDA (BROWSER FILE OPTION ITEM MENU)              (* \; "Edited  9-Jul-2021 23:08 by rmk:")
-                                                           (* \; "Edited 27-Feb-2021 20:07 by rmk:")
+  (LAMBDA (BROWSER FILE OPTION ITEM MENU)              (* \; "Edited  8-Aug-2021 11:16 by rmk:")
+                                                           (* \; "Edited 27-Feb-2021 20:07 by rmk:")
                                                              (* \; "Edited  1-Feb-88 19:00 by bvm:")
 
     (* |;;| "Called when we know that FILE is a file, not a directory, and that TEDIT exists.  If OPTION is READONLY, we don't want to edit, just view.  If FILE is a lisp sourcefile, we execute the font changes by COPY.TEXT.TO.IMAGE.")
@@ -1707,9 +1713,7 @@ Your deletions are thus ignored.")))
                                       (CL:WITH-OPEN-FILE
                                        (STREAM FILE :DIRECTION :INPUT)
                                        (LET ((NSTR (OPENTEXTSTREAM)))
-                                            (\\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT
-                                                                                 REFORMAT)
-                                                                        OF ENV))
+                                            (\\EXTERNALFORMAT STREAM ENV)
                                             (COPY.TEXT.TO.IMAGE STREAM NSTR)
 
                                  (* |;;| "Unshade the item before we create the TEDIT window, and tell FB.FINISH.COMMAND that we did that.  That way, the FB window won't pop up on top.")
@@ -2088,6 +2092,15 @@ Your deletions are thus ignored.")))
        ((FB.MAYBE.EXPUNGE BROWSER '|Recompute|)
         (FB.UPDATEBROWSERITEMS BROWSER)))))
 
+(FB.FIX-DIRECTORY-DATES
+  (LAMBDA (BROWSER)                                    (* \; "Edited 21-Aug-2021 23:33 by rmk:")
+    (FOR F FD CHANGE IN (FILDIR (FETCH (FILEBROWSER PATTERN) OF BROWSER))
+       WHEN (SETQ FD (FILEDATE F)) UNLESS (IEQP (SETQ FD (IDATE FD))
+                                                        (GETFILEINFO F 'ICREATIONDATE))
+       DO (SETQ CHANGE T)
+             (SETFILEINFO F 'ICREATIONDATE FD) FINALLY (CL:WHEN CHANGE (FB.UPDATECOMMAND
+                                                                            BROWSER)))))
+
 (FB.MAYBE.EXPUNGE
   (LAMBDA (BROWSER COMMAND)                            (* \; "Edited 22-Feb-2021 12:33 by rmk:")
                                                              (* |bvm:| "27-Sep-85 12:30")
@@ -4224,50 +4237,51 @@ then click Recompute"))))
 (PUTPROPS FILEBROWSER COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 
 1991 1993 1994 1999 2000 2001 2021))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (28124 50760 (FB 28134 . 29090) (FB.COPYBINARYCOMMAND 29092 . 29438) (FB.COPYTEXTCOMMAND
- 29440 . 29782) (FILEBROWSER 29784 . 42890) (FB.TABLEBROWSER 42892 . 43109) (FB.SELECTEDFILES 43111 . 
-43748) (FB.FETCHFILENAME 43750 . 44142) (FB.DIRECTORYP 44144 . 44472) (FB.PROMPTWPRINT 44474 . 45520) 
-(FB.PROMPTW.FORMAT 45522 . 46259) (FB.PROMPTFORINPUT 46261 . 48513) (FB.YES-OR-NO-P 48515 . 49549) (
-FB.ALLOW.ABORT 49551 . 50405) (\\FB.HARDCOPY.TOFILE.EXTENSION 50407 . 50758)) (50784 51737 (FB.STARTUP
- 50794 . 51309) (FB.MAKERIGIDWINDOW 51311 . 51735)) (51738 57110 (FB.PRINTFN 51748 . 56901) (FB.COPYFN
- 56903 . 57108)) (57160 63202 (FB.MENU.WHENSELECTEDFN 57170 . 57528) (FB.COMMANDSELECTEDFN 57530 . 
-59069) (FB.SUBITEMP 59071 . 59506) (FB.MAKE.BROWSER.BUSY 59508 . 60246) (FB.FINISH.COMMAND 60248 . 
-62213) (FB.HANDLE.ABORT.BUTTON 62215 . 63200)) (63203 68719 (FB.DELETECOMMAND 63213 . 63494) (
-FB.DELVERCOMMAND 63496 . 66689) (FB.IS.NOT.SUBDIRECTORY.ITEM 66691 . 66872) (FB.DELVER.FILES 66874 . 
-67963) (FB.DELETE.FILE 67965 . 68717)) (68720 70045 (FB.UNDELETECOMMAND 68730 . 69015) (
-FB.UNDELETEALLCOMMAND 69017 . 69296) (FB.UNDELETE.FILE 69298 . 70043)) (70046 94227 (FB.COPYCOMMAND 
-70056 . 70325) (FB.RENAMECOMMAND 70327 . 70602) (FB.COPY/RENAME.COMMAND 70604 . 71527) (
-FB.COPY/RENAME.ONE 71529 . 73851) (FB.COPY/RENAME.MANY 73853 . 80073) (FB.MERGE.DIRECTORIES 80075 . 
-80493) (FB.GREATEST.PREFIX 80495 . 81851) (FB.MAYBE.INSERT.FILE 81853 . 89293) (FB.GET.NEW.FILE.SPEC 
-89295 . 93126) (FB.CANONICAL.DIRECTORY 93128 . 94225)) (94228 102012 (FB.HARDCOPYCOMMAND 94238 . 95368
-) (FB.HARDCOPY.TOFILE 95370 . 102010)) (102013 114649 (FB.EDITCOMMAND 102023 . 102824) (
-FB.EDITCOMMAND.ONEFILE 102826 . 108865) (FB.EDITLISPFILE 108867 . 109906) (FB.BROWSECOMMAND 109908 . 
-114647)) (114650 126443 (FB.FASTSEECOMMAND 114660 . 118110) (FB.FASTSEE.ONEFILE 118112 . 121141) (
-FB.SEEFULLFN 121143 . 125274) (FB.SEEBUTTONFN 125276 . 126441)) (126444 128190 (FB.LOADCOMMAND 126454
- . 126961) (FB.COMPILECOMMAND 126963 . 127501) (FB.OPERATE.ON.FILES 127503 . 128188)) (128191 175240 (
-FB.UPDATECOMMAND 128201 . 128426) (FB.MAYBE.EXPUNGE 128428 . 129423) (FB.UPDATEBROWSERITEMS 129425 . 
-142640) (FB.DATE 142642 . 143383) (FB.ADJUST.DATE.WIDTH 143385 . 146353) (FB.SET.BROWSER.TITLE 146355
- . 147212) (FB.MAYBE.WIDEN.NAMES 147214 . 149333) (FB.SET.DEFAULT.NAME.WIDTH 149335 . 150699) (
-FB.CREATE.FILEBUCKET 150701 . 157921) (FB.CHECK.NAME.LENGTH 157923 . 160344) (FB.ADD.FILEGROUP 160346
- . 161873) (FB.INSERT.DIRECTORY 161875 . 162113) (FB.MAKE.SUBDIRECTORY.ITEM 162115 . 163524) (
-FB.ADD.FILE 163526 . 164139) (FB.INSERT.FILE 164141 . 167553) (FB.ANALYZE.PATTERN 167555 . 172819) (
-FB.CANONICALIZE.PATTERN 172821 . 174133) (FB.GETALLFILEINFO 174135 . 175238)) (175241 183400 (
-FB.SORT.VERSIONS 175251 . 178022) (FB.DECREASING.VERSION 178024 . 178693) (FB.INCREASING.VERSION 
-178695 . 179316) (FB.NAMES.DECREASING.VERSION 179318 . 180353) (FB.NAMES.INCREASING.VERSION 180355 . 
-181352) (FB.DECREASING.NUMERIC.ATTR 181354 . 182034) (FB.INCREASING.NUMERIC.ATTR 182036 . 182710) (
-FB.ALPHABETIC.ATTR 182712 . 183398)) (183401 193243 (FB.SORTCOMMAND 183411 . 190241) (
-FB.INSERT.SUBDIRECTORIES 190243 . 191040) (FB.GET.SORT.MENU 191042 . 193241)) (193244 209333 (
-FB.EXPUNGECOMMAND 193254 . 195773) (FB.NEWPATTERNCOMMAND 195775 . 196173) (FB.NEWINFOCOMMAND 196175 . 
-198941) (FB.DEPTHCOMMAND 198943 . 200718) (FB.SHAPECOMMAND 200720 . 204062) (FB.REMOVE.FILE 204064 . 
-205885) (FB.COUNT.FILE.CHANGE 205887 . 207332) (FB.SETNEWPATTERN 207334 . 208504) (FB.GET.NEWPATTERN 
-208506 . 209090) (FB.OPTIONSCOMMAND 209092 . 209331)) (209368 210380 (
-FB.INFOMENU.SHADEINITIALSELECTIONS 209378 . 210025) (FB.INFO.ITEM.NAMED 210027 . 210378)) (210381 
-219847 (FB.MAKECOUNTERWINDOW 210391 . 211853) (FB.COUNTERW.REDISPLAYFN 211855 . 212442) (
-FB.UPDATE.COUNTERS 212444 . 214516) (FB.DISPLAY.COUNTERS 214518 . 219578) (FB.COUNTER.STRING 219580 . 
-219845)) (219848 224491 (FB.MAKEHEADINGWINDOW 219858 . 221406) (FB.HEADINGW.REDISPLAYFN 221408 . 
-221674) (FB.HEADINGW.RESHAPEFN 221676 . 222052) (FB.HEADINGW.DISPLAY 222054 . 224489)) (224492 228675 
-(FB.ICONFN 224502 . 224849) (FB.INFOMENU.WHENSELECTEDFN 224851 . 225581) (FB.CLOSEFN 225583 . 226786) 
-(FB.EXPUNGE?.MENU 226788 . 227200) (FB.AFTERCLOSEFN 227202 . 227563) (FB.CLOSE&EXPUNGE 227565 . 228673
-)) (228676 240734 (FB.HARDCOPY.DIRECTORY 228686 . 239043) (FB.HARDCOPY.PRINT.TITLE 239045 . 239371) (
-FB.HARDCOPY.MAXWIDTH 239373 . 240732)))))
+  (FILEMAP (NIL (28618 51254 (FB 28628 . 29584) (FB.COPYBINARYCOMMAND 29586 . 29932) (FB.COPYTEXTCOMMAND
+ 29934 . 30276) (FILEBROWSER 30278 . 43384) (FB.TABLEBROWSER 43386 . 43603) (FB.SELECTEDFILES 43605 . 
+44242) (FB.FETCHFILENAME 44244 . 44636) (FB.DIRECTORYP 44638 . 44966) (FB.PROMPTWPRINT 44968 . 46014) 
+(FB.PROMPTW.FORMAT 46016 . 46753) (FB.PROMPTFORINPUT 46755 . 49007) (FB.YES-OR-NO-P 49009 . 50043) (
+FB.ALLOW.ABORT 50045 . 50899) (\\FB.HARDCOPY.TOFILE.EXTENSION 50901 . 51252)) (51278 52231 (FB.STARTUP
+ 51288 . 51803) (FB.MAKERIGIDWINDOW 51805 . 52229)) (52232 57604 (FB.PRINTFN 52242 . 57395) (FB.COPYFN
+ 57397 . 57602)) (57654 63696 (FB.MENU.WHENSELECTEDFN 57664 . 58022) (FB.COMMANDSELECTEDFN 58024 . 
+59563) (FB.SUBITEMP 59565 . 60000) (FB.MAKE.BROWSER.BUSY 60002 . 60740) (FB.FINISH.COMMAND 60742 . 
+62707) (FB.HANDLE.ABORT.BUTTON 62709 . 63694)) (63697 69213 (FB.DELETECOMMAND 63707 . 63988) (
+FB.DELVERCOMMAND 63990 . 67183) (FB.IS.NOT.SUBDIRECTORY.ITEM 67185 . 67366) (FB.DELVER.FILES 67368 . 
+68457) (FB.DELETE.FILE 68459 . 69211)) (69214 70539 (FB.UNDELETECOMMAND 69224 . 69509) (
+FB.UNDELETEALLCOMMAND 69511 . 69790) (FB.UNDELETE.FILE 69792 . 70537)) (70540 94721 (FB.COPYCOMMAND 
+70550 . 70819) (FB.RENAMECOMMAND 70821 . 71096) (FB.COPY/RENAME.COMMAND 71098 . 72021) (
+FB.COPY/RENAME.ONE 72023 . 74345) (FB.COPY/RENAME.MANY 74347 . 80567) (FB.MERGE.DIRECTORIES 80569 . 
+80987) (FB.GREATEST.PREFIX 80989 . 82345) (FB.MAYBE.INSERT.FILE 82347 . 89787) (FB.GET.NEW.FILE.SPEC 
+89789 . 93620) (FB.CANONICAL.DIRECTORY 93622 . 94719)) (94722 102506 (FB.HARDCOPYCOMMAND 94732 . 95862
+) (FB.HARDCOPY.TOFILE 95864 . 102504)) (102507 114945 (FB.EDITCOMMAND 102517 . 103318) (
+FB.EDITCOMMAND.ONEFILE 103320 . 109161) (FB.EDITLISPFILE 109163 . 110202) (FB.BROWSECOMMAND 110204 . 
+114943)) (114946 126739 (FB.FASTSEECOMMAND 114956 . 118406) (FB.FASTSEE.ONEFILE 118408 . 121437) (
+FB.SEEFULLFN 121439 . 125570) (FB.SEEBUTTONFN 125572 . 126737)) (126740 128486 (FB.LOADCOMMAND 126750
+ . 127257) (FB.COMPILECOMMAND 127259 . 127797) (FB.OPERATE.ON.FILES 127799 . 128484)) (128487 176145 (
+FB.UPDATECOMMAND 128497 . 128722) (FB.FIX-DIRECTORY-DATES 128724 . 129331) (FB.MAYBE.EXPUNGE 129333 . 
+130328) (FB.UPDATEBROWSERITEMS 130330 . 143545) (FB.DATE 143547 . 144288) (FB.ADJUST.DATE.WIDTH 144290
+ . 147258) (FB.SET.BROWSER.TITLE 147260 . 148117) (FB.MAYBE.WIDEN.NAMES 148119 . 150238) (
+FB.SET.DEFAULT.NAME.WIDTH 150240 . 151604) (FB.CREATE.FILEBUCKET 151606 . 158826) (
+FB.CHECK.NAME.LENGTH 158828 . 161249) (FB.ADD.FILEGROUP 161251 . 162778) (FB.INSERT.DIRECTORY 162780
+ . 163018) (FB.MAKE.SUBDIRECTORY.ITEM 163020 . 164429) (FB.ADD.FILE 164431 . 165044) (FB.INSERT.FILE 
+165046 . 168458) (FB.ANALYZE.PATTERN 168460 . 173724) (FB.CANONICALIZE.PATTERN 173726 . 175038) (
+FB.GETALLFILEINFO 175040 . 176143)) (176146 184305 (FB.SORT.VERSIONS 176156 . 178927) (
+FB.DECREASING.VERSION 178929 . 179598) (FB.INCREASING.VERSION 179600 . 180221) (
+FB.NAMES.DECREASING.VERSION 180223 . 181258) (FB.NAMES.INCREASING.VERSION 181260 . 182257) (
+FB.DECREASING.NUMERIC.ATTR 182259 . 182939) (FB.INCREASING.NUMERIC.ATTR 182941 . 183615) (
+FB.ALPHABETIC.ATTR 183617 . 184303)) (184306 194148 (FB.SORTCOMMAND 184316 . 191146) (
+FB.INSERT.SUBDIRECTORIES 191148 . 191945) (FB.GET.SORT.MENU 191947 . 194146)) (194149 210238 (
+FB.EXPUNGECOMMAND 194159 . 196678) (FB.NEWPATTERNCOMMAND 196680 . 197078) (FB.NEWINFOCOMMAND 197080 . 
+199846) (FB.DEPTHCOMMAND 199848 . 201623) (FB.SHAPECOMMAND 201625 . 204967) (FB.REMOVE.FILE 204969 . 
+206790) (FB.COUNT.FILE.CHANGE 206792 . 208237) (FB.SETNEWPATTERN 208239 . 209409) (FB.GET.NEWPATTERN 
+209411 . 209995) (FB.OPTIONSCOMMAND 209997 . 210236)) (210273 211285 (
+FB.INFOMENU.SHADEINITIALSELECTIONS 210283 . 210930) (FB.INFO.ITEM.NAMED 210932 . 211283)) (211286 
+220752 (FB.MAKECOUNTERWINDOW 211296 . 212758) (FB.COUNTERW.REDISPLAYFN 212760 . 213347) (
+FB.UPDATE.COUNTERS 213349 . 215421) (FB.DISPLAY.COUNTERS 215423 . 220483) (FB.COUNTER.STRING 220485 . 
+220750)) (220753 225396 (FB.MAKEHEADINGWINDOW 220763 . 222311) (FB.HEADINGW.REDISPLAYFN 222313 . 
+222579) (FB.HEADINGW.RESHAPEFN 222581 . 222957) (FB.HEADINGW.DISPLAY 222959 . 225394)) (225397 229580 
+(FB.ICONFN 225407 . 225754) (FB.INFOMENU.WHENSELECTEDFN 225756 . 226486) (FB.CLOSEFN 226488 . 227691) 
+(FB.EXPUNGE?.MENU 227693 . 228105) (FB.AFTERCLOSEFN 228107 . 228468) (FB.CLOSE&EXPUNGE 228470 . 229578
+)) (229581 241639 (FB.HARDCOPY.DIRECTORY 229591 . 239948) (FB.HARDCOPY.PRINT.TITLE 239950 . 240276) (
+FB.HARDCOPY.MAXWIDTH 240278 . 241637)))))
 STOP
diff --git a/library/FILEBROWSER.LCOM b/library/FILEBROWSER.LCOM
index 3589a143..eb9ea818 100644
Binary files a/library/FILEBROWSER.LCOM and b/library/FILEBROWSER.LCOM differ
diff --git a/library/RDSYS b/library/RDSYS
index 97035771..d828697b 100644
--- a/library/RDSYS
+++ b/library/RDSYS
@@ -1,5 +1,9 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10 FORMAT XCCS)
-(FILECREATED "30-Jul-2021 13:12:07" |{DSK}<Users>kaplan>Local>medley3.5>git-medley>tmp>RDSYS.;8|
+<<<<<<< Updated upstream
+(FILECREATED "19-Aug-2021 12:07:05" |{DSK}<Users>kaplan>Local>medley3.5>git-medley>tmp>RDSYS.;68|
+=======
+(FILECREATED " 5-Aug-2021 21:03:51" |{DSK}<Users>kaplan>Local>medley3.5>git-medley>tmp>RDSYS.;17|
+>>>>>>> Stashed changes
 )
 
 
diff --git a/library/RDSYS.LCOM b/library/RDSYS.LCOM
index f23c347a..95ad836f 100644
Binary files a/library/RDSYS.LCOM and b/library/RDSYS.LCOM differ
diff --git a/library/TEDITFNKEYS b/library/TEDITFNKEYS
index 63c4242f..55d7a95e 100644
--- a/library/TEDITFNKEYS
+++ b/library/TEDITFNKEYS
@@ -1,16 +1,15 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED " 6-May-2018 17:15:13" 
-{DSK}<Users>kaplan>Local>medley3.5>lispcore>library>TEDITFNKEYS.;10 30302  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
+(FILECREATED " 8-Aug-2021 21:28:17" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFNKEYS.;2 30663  
 
       changes to%:  (VARS TEDITFNKEYSCOMS)
-                    (FNS \TEDIT.FIND \TEDIT.FINDAGAIN)
 
-      previous date%: " 6-May-2018 17:07:57" 
-{DSK}<Users>kaplan>Local>medley3.5>lispcore>library>TEDITFNKEYS.;9)
+      previous date%: " 6-May-2018 17:15:13" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFNKEYS.;1)
 
 
 (* ; "
-Copyright (c) 1985, 1986, 1987, 1990, 1991, 1994, 2018 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1985-1987, 1990-1991, 1994, 2018, 2021 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT TEDITFNKEYSCOMS)
@@ -41,48 +40,48 @@ Copyright (c) 1985, 1986, 1987, 1990, 1991, 1994, 2018 by Venue & Xerox Corporat
                                               "little selection utilities etc., for building hacks")
               (FNS \SEL.LIMIT \SEL.LINEDESC \TK.DESCRIBEFONT \PARAS.IN.SEL))
         [VARS (TEDIT.FNKEY.VERBOSE T)
-              (\TEDIT.KEYS '(("2,4" UNDO)
-                             ("2,44" UNDO)
-                             ("2,3" FN \TEDIT.FIND)
-                             ("2,43" FN \TEDIT.FIND)
-                             ("2,10" REDO)
-                             ("2,50" REDO)
-                             ("2,22" NEXT)
-                             ("2,62" NEXT)
-                             (ESC EXPAND)
-                             ("2,24" EXPAND)
-                             ("2,101" FN \TEDIT.CENTER.SEL)
-                             ("2,141" FN \TEDIT.CENTER.SEL.REV)
-                             ("2,102" FN \TEDIT.BOLD.SEL.ON)
-                             ("2,142" FN \TEDIT.BOLD.SEL.OFF)
-                             ("2,103" FN \TEDIT.ITALIC.SEL.ON)
-                             ("2,143" FN \TEDIT.ITALIC.SEL.OFF)
-                             ("2,104" FN \TEDIT.UCASE.SEL)
-                             ("2,144" FN \TEDIT.LCASE.SEL)
-                             ("2,105" FN \TEDIT.STRIKEOUT.SEL.ON)
-                             ("2,145" FN \TEDIT.STRIKEOUT.SEL.OFF)
-                             ("2,106" FN \TEDIT.UNDERLINE.SEL.ON)
-                             ("2,146" FN \TEDIT.UNDERLINE.SEL.OFF)
-                             ("2,107" FN \TEDIT.SUBSCRIPTSEL)
-                             ("2,147" FN \TEDIT.SUPERSCRIPTSEL)
-                             ("2,110" FN \TEDIT.SMALLERSEL)
-                             ("2,150" FN \TEDIT.LARGERSEL)
-                             ("2,113" FN \TEDIT.SUPERSCRIPTSEL)
-                             ("2,153" FN \TEDIT.SUBSCRIPTSEL)
-                             ("2,114" FN \TEDIT.SUBSCRIPTSEL)
-                             ("2,154" FN \TEDIT.SUPERSCRIPTSEL)
-                             ("2,115" FN \TEDIT.DEFAULTSSEL)
-                             ("2,155" FN \TEDIT.SETDEFAULT.FROM.SEL)
-                             ("2,1" FN \TEDIT.SHOWCARETLOOKS)
-                             ("1,U" UNDO)
-                             ("1,u" UNDO)
-                             ("1,z" UNDO)
-                             ("1,Z" UNDO)
-                             ("1,F" FN \TEDIT.FIND)
-                             ("1,f" FN \TEDIT.FIND)
-                             ("1,a" FN \TEDIT.SELECT.ALL)
-                             ("1,A" FN \TEDIT.SELECT.ALL)
-                             ("1,g" FN \TEDIT.FINDAGAIN]
+              (\TEDIT.KEYS '(("Function,^D" UNDO)
+                             ("Function,$" UNDO)
+                             ("Function,^C" FN \TEDIT.FIND)
+                             ("Function,#" FN \TEDIT.FIND)
+                             ("Function,Bs" REDO)
+                             ("Function,(" REDO)
+                             ("Function,^R" NEXT)
+                             ("Function,62" NEXT)
+                             ("Esc" EXPAND)
+                             ("Function,^T" EXPAND)
+                             ("Function,A" FN \TEDIT.CENTER.SEL)
+                             ("Function,a" FN \TEDIT.CENTER.SEL.REV)
+                             ("Function,B" FN \TEDIT.BOLD.SEL.ON)
+                             ("Function,b" FN \TEDIT.BOLD.SEL.OFF)
+                             ("Function,C" FN \TEDIT.ITALIC.SEL.ON)
+                             ("Function,c" FN \TEDIT.ITALIC.SEL.OFF)
+                             ("Function,D" FN \TEDIT.UCASE.SEL)
+                             ("Function,d" FN \TEDIT.LCASE.SEL)
+                             ("Function,E" FN \TEDIT.STRIKEOUT.SEL.ON)
+                             ("Function,e" FN \TEDIT.STRIKEOUT.SEL.OFF)
+                             ("Function,F" FN \TEDIT.UNDERLINE.SEL.ON)
+                             ("Function,f" FN \TEDIT.UNDERLINE.SEL.OFF)
+                             ("Function,G" FN \TEDIT.SUBSCRIPTSEL)
+                             ("Function,g" FN \TEDIT.SUPERSCRIPTSEL)
+                             ("Function,H" FN \TEDIT.SMALLERSEL)
+                             ("Function,h" FN \TEDIT.LARGERSEL)
+                             ("Function,K" FN \TEDIT.SUPERSCRIPTSEL)
+                             ("Function,k" FN \TEDIT.SUBSCRIPTSEL)
+                             ("Function,L" FN \TEDIT.SUBSCRIPTSEL)
+                             ("Function,l" FN \TEDIT.SUPERSCRIPTSEL)
+                             ("Function,M" FN \TEDIT.DEFAULTSSEL)
+                             ("Function,m" FN \TEDIT.SETDEFAULT.FROM.SEL)
+                             ("Function,^A" FN \TEDIT.SHOWCARETLOOKS)
+                             ("Meta,U" UNDO)
+                             ("Meta,u" UNDO)
+                             ("Meta,z" UNDO)
+                             ("Meta,Z" UNDO)
+                             ("Meta,F" FN \TEDIT.FIND)
+                             ("Meta,f" FN \TEDIT.FIND)
+                             ("Meta,a" FN \TEDIT.SELECT.ALL)
+                             ("Meta,A" FN \TEDIT.SELECT.ALL)
+                             ("Meta,g" FN \TEDIT.FINDAGAIN]
         [P (MAPC \TEDIT.KEYS (FUNCTION (LAMBDA (ENTRY)
                                               (SELECTQ (CADR ENTRY)
                                                      (FN (TEDIT.SETFUNCTION (CAR ENTRY)
@@ -565,48 +564,48 @@ Copyright (c) 1985, 1986, 1987, 1990, 1991, 1994, 2018 by Venue & Xerox Corporat
 (RPAQQ TEDIT.FNKEY.VERBOSE T)
 
 (RPAQQ \TEDIT.KEYS
-       (("2,4" UNDO)
-        ("2,44" UNDO)
-        ("2,3" FN \TEDIT.FIND)
-        ("2,43" FN \TEDIT.FIND)
-        ("2,10" REDO)
-        ("2,50" REDO)
-        ("2,22" NEXT)
-        ("2,62" NEXT)
-        (ESC EXPAND)
-        ("2,24" EXPAND)
-        ("2,101" FN \TEDIT.CENTER.SEL)
-        ("2,141" FN \TEDIT.CENTER.SEL.REV)
-        ("2,102" FN \TEDIT.BOLD.SEL.ON)
-        ("2,142" FN \TEDIT.BOLD.SEL.OFF)
-        ("2,103" FN \TEDIT.ITALIC.SEL.ON)
-        ("2,143" FN \TEDIT.ITALIC.SEL.OFF)
-        ("2,104" FN \TEDIT.UCASE.SEL)
-        ("2,144" FN \TEDIT.LCASE.SEL)
-        ("2,105" FN \TEDIT.STRIKEOUT.SEL.ON)
-        ("2,145" FN \TEDIT.STRIKEOUT.SEL.OFF)
-        ("2,106" FN \TEDIT.UNDERLINE.SEL.ON)
-        ("2,146" FN \TEDIT.UNDERLINE.SEL.OFF)
-        ("2,107" FN \TEDIT.SUBSCRIPTSEL)
-        ("2,147" FN \TEDIT.SUPERSCRIPTSEL)
-        ("2,110" FN \TEDIT.SMALLERSEL)
-        ("2,150" FN \TEDIT.LARGERSEL)
-        ("2,113" FN \TEDIT.SUPERSCRIPTSEL)
-        ("2,153" FN \TEDIT.SUBSCRIPTSEL)
-        ("2,114" FN \TEDIT.SUBSCRIPTSEL)
-        ("2,154" FN \TEDIT.SUPERSCRIPTSEL)
-        ("2,115" FN \TEDIT.DEFAULTSSEL)
-        ("2,155" FN \TEDIT.SETDEFAULT.FROM.SEL)
-        ("2,1" FN \TEDIT.SHOWCARETLOOKS)
-        ("1,U" UNDO)
-        ("1,u" UNDO)
-        ("1,z" UNDO)
-        ("1,Z" UNDO)
-        ("1,F" FN \TEDIT.FIND)
-        ("1,f" FN \TEDIT.FIND)
-        ("1,a" FN \TEDIT.SELECT.ALL)
-        ("1,A" FN \TEDIT.SELECT.ALL)
-        ("1,g" FN \TEDIT.FINDAGAIN)))
+       (("Function,^D" UNDO)
+        ("Function,$" UNDO)
+        ("Function,^C" FN \TEDIT.FIND)
+        ("Function,#" FN \TEDIT.FIND)
+        ("Function,Bs" REDO)
+        ("Function,(" REDO)
+        ("Function,^R" NEXT)
+        ("Function,62" NEXT)
+        ("Esc" EXPAND)
+        ("Function,^T" EXPAND)
+        ("Function,A" FN \TEDIT.CENTER.SEL)
+        ("Function,a" FN \TEDIT.CENTER.SEL.REV)
+        ("Function,B" FN \TEDIT.BOLD.SEL.ON)
+        ("Function,b" FN \TEDIT.BOLD.SEL.OFF)
+        ("Function,C" FN \TEDIT.ITALIC.SEL.ON)
+        ("Function,c" FN \TEDIT.ITALIC.SEL.OFF)
+        ("Function,D" FN \TEDIT.UCASE.SEL)
+        ("Function,d" FN \TEDIT.LCASE.SEL)
+        ("Function,E" FN \TEDIT.STRIKEOUT.SEL.ON)
+        ("Function,e" FN \TEDIT.STRIKEOUT.SEL.OFF)
+        ("Function,F" FN \TEDIT.UNDERLINE.SEL.ON)
+        ("Function,f" FN \TEDIT.UNDERLINE.SEL.OFF)
+        ("Function,G" FN \TEDIT.SUBSCRIPTSEL)
+        ("Function,g" FN \TEDIT.SUPERSCRIPTSEL)
+        ("Function,H" FN \TEDIT.SMALLERSEL)
+        ("Function,h" FN \TEDIT.LARGERSEL)
+        ("Function,K" FN \TEDIT.SUPERSCRIPTSEL)
+        ("Function,k" FN \TEDIT.SUBSCRIPTSEL)
+        ("Function,L" FN \TEDIT.SUBSCRIPTSEL)
+        ("Function,l" FN \TEDIT.SUPERSCRIPTSEL)
+        ("Function,M" FN \TEDIT.DEFAULTSSEL)
+        ("Function,m" FN \TEDIT.SETDEFAULT.FROM.SEL)
+        ("Function,^A" FN \TEDIT.SHOWCARETLOOKS)
+        ("Meta,U" UNDO)
+        ("Meta,u" UNDO)
+        ("Meta,z" UNDO)
+        ("Meta,Z" UNDO)
+        ("Meta,F" FN \TEDIT.FIND)
+        ("Meta,f" FN \TEDIT.FIND)
+        ("Meta,a" FN \TEDIT.SELECT.ALL)
+        ("Meta,A" FN \TEDIT.SELECT.ALL)
+        ("Meta,g" FN \TEDIT.FINDAGAIN)))
 
 [MAPC \TEDIT.KEYS (FUNCTION (LAMBDA (ENTRY)
                               (SELECTQ (CADR ENTRY)
@@ -626,22 +625,22 @@ Copyright (c) 1985, 1986, 1987, 1990, 1991, 1994, 2018 by Venue & Xerox Corporat
 
 (* ; "Changed by yabu.fx, for SUNLOADUP without DWIM.")
 
-(PUTPROPS TEDITFNKEYS COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990 1991 1994 2018))
+(PUTPROPS TEDITFNKEYS COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990 1991 1994 2018 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5707 18741 (\TEDIT.BOLD.SEL.OFF 5717 . 6056) (\TEDIT.BOLD.SEL.ON 6058 . 6387) (
-\TEDIT.CENTER.SEL 6389 . 7444) (\TEDIT.CENTER.SEL.REV 7446 . 8526) (\TEDIT.DEFAULTS.CARET 8528 . 8812)
- (\TEDIT.DEFAULTSSEL 8814 . 9137) (\TEDIT.SETDEFAULT.FROM.SEL 9139 . 9578) (\TEDIT.FIND 9580 . 12943) 
-(\TEDIT.FINDAGAIN 12945 . 13119) (\TEDIT.ITALIC.SEL.OFF 13121 . 13363) (\TEDIT.ITALIC.SEL.ON 13365 . 
-13548) (\TEDIT.LARGERSEL 13550 . 13845) (\TEDIT.LCASE.SEL 13847 . 14598) (\TEDIT.SHOWCARETLOOKS 14600
- . 16240) (\TEDIT.SMALLERSEL 16242 . 16540) (\TEDIT.SUBSCRIPTSEL 16542 . 16746) (\TEDIT.SUPERSCRIPTSEL
- 16748 . 16953) (\TEDIT.UCASE.SEL 16955 . 17762) (\TEDIT.UNDERLINE.SEL.OFF 17764 . 17952) (
-\TEDIT.UNDERLINE.SEL.ON 17954 . 18140) (\TEDIT.STRIKEOUT.SEL.ON 18142 . 18328) (
-\TEDIT.STRIKEOUT.SEL.OFF 18330 . 18518) (\TEDIT.SELECT.ALL 18520 . 18739)) (18813 24253 (
-\TEDIT.BOLD.CARET.OFF 18823 . 19271) (\TEDIT.BOLD.CARET.ON 19273 . 19718) (\TEDIT.ITALIC.CARET.OFF 
-19720 . 20170) (\TEDIT.ITALIC.CARET.ON 20172 . 20620) (\TEDIT.LARGER.CARET 20622 . 21070) (
-\TEDIT.SMALLER.CARET 21072 . 21522) (\TEDIT.SUBSCRIPT.CARET 21524 . 21978) (\TEDIT.SUPERSCRIPT.CARET 
-21980 . 22435) (\TEDIT.UNDERLINE.CARET.OFF 22437 . 22890) (\TEDIT.UNDERLINE.CARET.ON 22892 . 23343) (
-\TEDIT.STRIKEOUT.CARET.OFF 23345 . 23798) (\TEDIT.STRIKEOUT.CARET.ON 23800 . 24251)) (24322 28070 (
-\SEL.LIMIT 24332 . 24770) (\SEL.LINEDESC 24772 . 25368) (\TK.DESCRIBEFONT 25370 . 26085) (
-\PARAS.IN.SEL 26087 . 28068)))))
+  (FILEMAP (NIL (5854 18888 (\TEDIT.BOLD.SEL.OFF 5864 . 6203) (\TEDIT.BOLD.SEL.ON 6205 . 6534) (
+\TEDIT.CENTER.SEL 6536 . 7591) (\TEDIT.CENTER.SEL.REV 7593 . 8673) (\TEDIT.DEFAULTS.CARET 8675 . 8959)
+ (\TEDIT.DEFAULTSSEL 8961 . 9284) (\TEDIT.SETDEFAULT.FROM.SEL 9286 . 9725) (\TEDIT.FIND 9727 . 13090) 
+(\TEDIT.FINDAGAIN 13092 . 13266) (\TEDIT.ITALIC.SEL.OFF 13268 . 13510) (\TEDIT.ITALIC.SEL.ON 13512 . 
+13695) (\TEDIT.LARGERSEL 13697 . 13992) (\TEDIT.LCASE.SEL 13994 . 14745) (\TEDIT.SHOWCARETLOOKS 14747
+ . 16387) (\TEDIT.SMALLERSEL 16389 . 16687) (\TEDIT.SUBSCRIPTSEL 16689 . 16893) (\TEDIT.SUPERSCRIPTSEL
+ 16895 . 17100) (\TEDIT.UCASE.SEL 17102 . 17909) (\TEDIT.UNDERLINE.SEL.OFF 17911 . 18099) (
+\TEDIT.UNDERLINE.SEL.ON 18101 . 18287) (\TEDIT.STRIKEOUT.SEL.ON 18289 . 18475) (
+\TEDIT.STRIKEOUT.SEL.OFF 18477 . 18665) (\TEDIT.SELECT.ALL 18667 . 18886)) (18960 24400 (
+\TEDIT.BOLD.CARET.OFF 18970 . 19418) (\TEDIT.BOLD.CARET.ON 19420 . 19865) (\TEDIT.ITALIC.CARET.OFF 
+19867 . 20317) (\TEDIT.ITALIC.CARET.ON 20319 . 20767) (\TEDIT.LARGER.CARET 20769 . 21217) (
+\TEDIT.SMALLER.CARET 21219 . 21669) (\TEDIT.SUBSCRIPT.CARET 21671 . 22125) (\TEDIT.SUPERSCRIPT.CARET 
+22127 . 22582) (\TEDIT.UNDERLINE.CARET.OFF 22584 . 23037) (\TEDIT.UNDERLINE.CARET.ON 23039 . 23490) (
+\TEDIT.STRIKEOUT.CARET.OFF 23492 . 23945) (\TEDIT.STRIKEOUT.CARET.ON 23947 . 24398)) (24469 28217 (
+\SEL.LIMIT 24479 . 24917) (\SEL.LINEDESC 24919 . 25515) (\TK.DESCRIBEFONT 25517 . 26232) (
+\PARAS.IN.SEL 26234 . 28215)))))
 STOP
diff --git a/library/TEDITFNKEYS.LCOM b/library/TEDITFNKEYS.LCOM
index 57058fb8..626820ac 100644
Binary files a/library/TEDITFNKEYS.LCOM and b/library/TEDITFNKEYS.LCOM differ
diff --git a/library/UNICODE b/library/UNICODE
index 81a05d26..ad9e3b1c 100644
--- a/library/UNICODE
+++ b/library/UNICODE
@@ -1,11 +1,11 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED " 8-Aug-2021 13:10:17" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.;191 64912  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "21-Aug-2021 13:13:04" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.;193 64903  
 
-      changes to%:  (FNS UTF8.OUTCHARFN UTF16BE.OUTCHARFN)
+      changes to%:  (FNS MAKE-UNICODE-TRANSLATION-TABLES)
 
-      previous date%: " 7-Aug-2021 13:56:58" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.;190)
+      previous date%: " 8-Aug-2021 13:10:17" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.;192)
 
 
 (PRETTYCOMPRINT UNICODECOMS)
@@ -736,7 +736,7 @@
 (DEFINEQ
 
 (MAKE-UNICODE-TRANSLATION-TABLES
-  [LAMBDA (MAPPING LTORVAR RTOLVAR)                     (* ; "Edited 17-May-2021 22:24 by rmk:")
+  [LAMBDA (MAPPING LTORVAR RTOLVAR)                     (* ; "Edited 21-Aug-2021 13:12 by rmk:")
                                                             (* ; "Edited 17-Aug-2020 08:46 by rmk:")
 
     (* ;; "MAPPING is the list of numeric code correspondence pairs constructed by applying READ-UNICODE-MAPPING to a Unicode mapping file.")
@@ -859,9 +859,9 @@
                       (CHARCODE.DECODE "5,0")))
          (CL:SETF (CL:SVREF RTOLARRAY N-TRANSLATION-SEGMENTS)
                 (LIST (HASHARRAY 10)
-                      (CHARCODE.DECODE "E000")
-                      (CHARCODE.DECODE "F8FF")
-                      (CHARCODE.DECODE "E000")))
+                      (CHARCODE.DECODE "U+E000")
+                      (CHARCODE.DECODE "U+F8FF")
+                      (CHARCODE.DECODE "U+E000")))
 
          (* ;; "Now put in the inverse unmapped hash arrays")
 
@@ -1100,15 +1100,15 @@
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4120 17800 (UTF8.OUTCHARFN 4130 . 6961) (UTF8.INCCODEFN 6963 . 12453) (UTF8.PEEKCCODEFN
- 12455 . 17229) (\UTF8.BACKCCODEFN 17231 . 17798)) (17801 21127 (UTF16BE.OUTCHARFN 17811 . 18635) (
-UTF16BE.INCCODEFN 18637 . 19536) (UTF16BE.PEEKCCODEFN 19538 . 20609) (\UTF16.BACKCCODEFN 20611 . 21125
-)) (21157 22965 (MAKE-UNICODE-FORMATS 21167 . 22963)) (23062 24368 (UNICODE.UNMAPPED 23072 . 24366)) (
-24369 24905 (XCCS-UTF8-AFTER-OPEN 24379 . 24903)) (25975 26324 (XTOUCODE 25985 . 26153) (UTOXCODE 
-26155 . 26322)) (26364 42547 (READ-UNICODE-MAPPING-FILENAMES 26374 . 27536) (READ-UNICODE-MAPPING 
-27538 . 30836) (WRITE-UNICODE-MAPPING 30838 . 35055) (WRITE-UNICODE-INCLUDED 35057 . 39779) (
-WRITE-UNICODE-MAPPING-HEADER 39781 . 41013) (WRITE-UNICODE-MAPPING-FILENAME 41015 . 42545)) (45884 
-54357 (MAKE-UNICODE-TRANSLATION-TABLES 45894 . 54355)) (54778 62682 (HEXSTRING 54788 . 55949) (
-UTF8HEXSTRING 55951 . 58156) (NUTF8CODEBYTES 58158 . 58821) (NUTF8STRINGBYTES 58823 . 59304) (
-XTOUSTRING 59306 . 62317) (XCCSSTRING 62319 . 62680)) (62683 64152 (SHOWCHARS 62693 . 64150)))))
+  (FILEMAP (NIL (4105 17785 (UTF8.OUTCHARFN 4115 . 6946) (UTF8.INCCODEFN 6948 . 12438) (UTF8.PEEKCCODEFN
+ 12440 . 17214) (\UTF8.BACKCCODEFN 17216 . 17783)) (17786 21112 (UTF16BE.OUTCHARFN 17796 . 18620) (
+UTF16BE.INCCODEFN 18622 . 19521) (UTF16BE.PEEKCCODEFN 19523 . 20594) (\UTF16.BACKCCODEFN 20596 . 21110
+)) (21142 22950 (MAKE-UNICODE-FORMATS 21152 . 22948)) (23047 24353 (UNICODE.UNMAPPED 23057 . 24351)) (
+24354 24890 (XCCS-UTF8-AFTER-OPEN 24364 . 24888)) (25960 26309 (XTOUCODE 25970 . 26138) (UTOXCODE 
+26140 . 26307)) (26349 42532 (READ-UNICODE-MAPPING-FILENAMES 26359 . 27521) (READ-UNICODE-MAPPING 
+27523 . 30821) (WRITE-UNICODE-MAPPING 30823 . 35040) (WRITE-UNICODE-INCLUDED 35042 . 39764) (
+WRITE-UNICODE-MAPPING-HEADER 39766 . 40998) (WRITE-UNICODE-MAPPING-FILENAME 41000 . 42530)) (45869 
+54348 (MAKE-UNICODE-TRANSLATION-TABLES 45879 . 54346)) (54769 62673 (HEXSTRING 54779 . 55940) (
+UTF8HEXSTRING 55942 . 58147) (NUTF8CODEBYTES 58149 . 58812) (NUTF8STRINGBYTES 58814 . 59295) (
+XTOUSTRING 59297 . 62308) (XCCSSTRING 62310 . 62671)) (62674 64143 (SHOWCHARS 62684 . 64141)))))
 STOP
diff --git a/library/UNICODE.LCOM b/library/UNICODE.LCOM
index 2ed2e52c..4f7ba73a 100644
Binary files a/library/UNICODE.LCOM and b/library/UNICODE.LCOM differ
diff --git a/library/exports.all b/library/exports.all
index 9c7d82b7..4f07e7e6 100644
--- a/library/exports.all
+++ b/library/exports.all
@@ -1,19 +1,25 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10 FORMAT XCCS)
+<<<<<<< Updated upstream
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 (LISPXPRIN1 "EXPORTS GATHERED FROM {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources> ON 
-30-Jul-2021 13:12:33"  T)
+19-Aug-2021 12:07:30"  T)
+=======
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
+(LISPXPRIN1 "EXPORTS GATHERED FROM {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources> ON 
+ 5-Aug-2021 21:04:18"  T)
+>>>>>>> Stashed changes
 (LISPXTERPRI T)
 (RPAQQ MODARITHMACROS (CEIL FLOOR FOLDHI FOLDLO MODUP UNFOLD MOD))
 (PUTPROPS CEIL MACRO ((X N) (FLOOR (IPLUS X (CONSTANT (SUB1 N))) N)))
 (PUTPROPS FLOOR MACRO ((X N) (LOGAND X (CONSTANT (LOGXOR (SUB1 N) -1)))))
 (PUTPROPS FOLDHI MACRO (X (PROG ((FORM (CAR X)) (DIVISOR (CAR (CONSTANTEXPRESSIONP (CADR X))))) (OR (
-AND DIVISOR (POWEROFTWOP DIVISOR)) (\\ILLEGAL.ARG (CADR X))) (RETURN (LIST (QUOTE LRSH) (LIST (QUOTE 
+AND DIVISOR (POWEROFTWOP DIVISOR)) (\ILLEGAL.ARG (CADR X))) (RETURN (LIST (QUOTE LRSH) (LIST (QUOTE 
 IPLUS) FORM (SUB1 DIVISOR)) (SUB1 (INTEGERLENGTH DIVISOR)))))))
 (PUTPROPS FOLDLO MACRO (X (PROG ((FORM (CAR X)) (DIVISOR (CAR (CONSTANTEXPRESSIONP (CADR X))))) (OR (
-AND DIVISOR (POWEROFTWOP DIVISOR)) (\\ILLEGAL.ARG (CADR X))) (RETURN (LIST (QUOTE LRSH) FORM (SUB1 (
+AND DIVISOR (POWEROFTWOP DIVISOR)) (\ILLEGAL.ARG (CADR X))) (RETURN (LIST (QUOTE LRSH) FORM (SUB1 (
 INTEGERLENGTH DIVISOR)))))))
 (PUTPROPS MODUP MACRO (OPENLAMBDA (X N) (IDIFFERENCE (SUB1 N) (IMOD (SUB1 X) N))))
 (PUTPROPS UNFOLD MACRO (X (PROG ((FORM (CAR X)) (DIVISOR (CAR (CONSTANTEXPRESSIONP (CADR X))))) (OR (
-AND DIVISOR (POWEROFTWOP DIVISOR)) (\\ILLEGAL.ARG (CADR X))) (RETURN (LIST (QUOTE LLSH) FORM (SUB1 (
+AND DIVISOR (POWEROFTWOP DIVISOR)) (\ILLEGAL.ARG (CADR X))) (RETURN (LIST (QUOTE LLSH) FORM (SUB1 (
 INTEGERLENGTH DIVISOR)))))))
 (PUTPROPS MOD MACRO (= . IMOD))
 (RPAQQ BITSPERNIBBLE 4)
@@ -57,190 +63,181 @@ SUB1 FIXP.LENGTH)) (SUB1 (LSH 1 (SUB1 FIXP.LENGTH))))) (MIN.FIXP (IDIFFERENCE -1
 
 (RPAQQ WINDFLG T)
 (CONSTANTS (WINDFLG T))
-(RPAQQ INITCONSTANTS ((* |;;;| "(LISPNAME VALUE BCPLNAME UCODENAME)") (CDRCODING 1 T T) (* \; 
-"IF CDRCODING=0, CDR CODING IS OFF, OTHERWISE ON") (* |;;| "type numbers -- repeated on LLBASIC too") 
-(\\SMALLP 1 SMALLTYPE |SmallType|) (\\FIXP 2 INTEGERTYPE |FixpType|) (\\FLOATP 3 FLTPTTYPE 
-|FloatpType|) (\\LITATOM 4 ATOMTYPE |AtomType|) (\\LISTP 5 LISTTYPE |ListType|) (\\ARRAYP 6 
-ARRAYPTRTYPE |ArrayType|) (\\STRINGP 7 STRINGPTRTYPE) (\\STACKP 8) (\\CHARACTERP 9) (\\VMEMPAGEP 10 
-NIL |VMemPagePType|) (\\STREAM 11 NIL STREAMTYPE) (* |;;| 
-"TYPE TABLE CONSTANTS - - - - - - - - - - - - - - - - - - - - - -") (\\TT.TYPEMASK 2047 |TTTypeMask| T
-) (\\TT.NOREF 32768 NIL T) (\\TT.SYMBOLP 16384 NIL T) (\\TT.FIXP 8192) (\\TT.NUMBERP 4096) (\\TT.ATOM 
-2048) (* |;;| "page map - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -") 
-(|\\PMblockSize| 32 PMBLOCKSIZE) (|\\STATSsize| 8 T) (|\\NumPMTpages| 8) (|\\EmptyPMTEntry| 65535 T) (
-|\\FirstVmemBlock| 2 T) (\\MAXVMPAGE 131069) (\\MAXVMSEGMENT 255) (* |;;| "interface page") (
-|\\IFPValidKey| 5603 T) (* |;;| "MDS") (|\\FirstMDSPage| 32766) (* \; "Was 37776Q pre 16-meg intiial")
- (|\\MaxMDSPage| 524285) (|\\DefaultSecondMDSPage| 65532) (|\\MDSIncrement| 512) (|\\PagesPerMDSUnit| 
-2) (* \; "(FOLDLO \\MDSIncrement WORDSPERPAGE)") (* |;;| "arrays") (\\ARRAYSPACE (46 0)) (
-|\\FirstArraySegment| 46) (|\\FirstArrayPage| 11776) (\\ARRAYSPACE2 (64 0)) (
-|\\DefaultSecondArrayPage| 32768) (* \; "Was 40000Q before 16meg initial") (* |;;| 
-"stack block constants") (|\\StackMask| 57344 T T) (|\\FxtnBlock| 49152 T T) (|\\GuardBlock| 57344 T T
-) (|\\BFBlock| 32768 T T) (|\\FreeStackBlock| 40960 T T) (|\\NotStackBlock| 0) (* \; 
-"none of the above") (|\\MinExtraStackWords| 32 T T) (* |;;| "backspace kludge") (ERASECHARCODE 0 T) (
-* |;;| "GC constants") (\\HT1CNT 1024 NIL T) (\\HTSTKBIT 512 NIL T) (\\HTCNTMASK 64512 NIL T) (
-\\HTMAINSIZE 65536 NIL T) (\\HTCOLLSIZE 1048576 NIL T) (* \; "HTCOLL size in words") (\\HTENDFREE 1 
-NIL T) (\\HTFREEPTR 0 NIL T) (* |;;| "pointers and lengths of various data spaces") (\\ATOMSPACE (0 0)
- (|ATOMspace| NIL) (|atomHiVal| NIL)) (|\\AtomHI| 0) (\\CHARHI 7) (* \; 
-"overlap character space and the atom hash table space") (|\\AtomHashTable| (21 0) (|AHTspace| 
-|AHTbase|)) (|\\AtomHTpages| 256 AHTSIZE) (|\\LastAtomPage| 255) (|\\MaxAtomFrLst| 65535) (
-\\SMALLPOSPSPACE (14 0)) (|\\SmallPosHi| 14 |SMALLPOSspace| |smallpl|) (\\SMALLNEGSPACE (15 0)) (
-|\\SmallNegHi| 15 |SMALLNEGspace| |smallneg|) (|\\NumSmallPages| 512) (* |;;| 
-"PNAME SPACEin the old world; used for initial atoms now.") (\\PNPSPACE (8 0) (|PNPspace| |PNPbase|)) 
-(\\PNAME.HI 8) (\\OLDATOMSPACE (44 0)) (* \; "NEW ATOM SPACE") (\\ATOM.HI 44) (* \; 
-"HI PART OF NEW ATOM SPACE") (* |;;| "Definitions in old atom world") (\\DEFSPACE (10 0) (|DEFspace| 
-|DEFbase|) (|DEFspace| |DEFbase|)) (\\DEF.HI 10) (\\VALSPACE (12 0) (|TOPVALspace| |TOPVALbase|) (
-|VALspace| |VALbase|)) (\\VAL.HI 12) (\\PLISTSPACE (2 0) (|PLISTspace| |PLISTbase|)) (\\PLIST.HI 2) (
-\\PAGEMAP (5 0) (|PAGEMAPspace| |PAGEMAPbase|)) (|\\NumPageMapPages| 256) (|\\PageMapTBL| (20 512) (
-|PMTspace| |PMTbase|)) (|\\InterfacePage| (20 0) (|INTERFACEspace| |INTERFACEbase|) (|INTERFACEspace| 
-|INTERFACEbase|)) (\\IOPAGE (0 65280)) (|\\DoveIORegion| (0 16384)) (\\IOCBPAGE (0 256)) (\\FPTOVP (2 
-0)) (|\\MDSTypeTable| (24 0) (|MDSTYPEspace| |MDSTYPEbase|) (|MDSTYPEspace| |MDSTYPEbase|)) (
-|\\MDSTTsize| 1024 T) (* \; "in Pages") (\\MISCSTATS (20 2560) (|STATSspace| |MISCSTATSbase|)) (
-|\\UFNTable| (20 3072) NIL (|STATSspace| |UFNTablebase|)) (|\\UFNTableSize| 2) (|\\DTDSpaceBase| (20 
-4096) (|DTDspace| |DTDbase|) (|DTDspace| |DTDbase|)) (|\\DTDSize| 18 T) (\\LISTPDTD (20 4186)) (
-|\\EndTypeNumber| 2047) (\\LOCKEDPAGETABLE (20 28672)) (|\\NumLPTPages| 16) (\\STACKSPACE (1 0) (
-|STACKspace| NIL) (|STACKspace| NIL)) (|\\GuardStackAddr| 61440) (|\\LastStackAddr| 65534) (\\STACKHI 
-1 T T) (\\HTMAIN (22 0) (|HTMAINspace| |HTMAINbase|) (|HTMAINspace| |HTMAINbase|)) (|\\HTMAINnpages| 
-256 T) (\\HTOVERFLOW (23 0) NIL (NIL |HTOVERFLOWbase|)) (\\HTBIGCOUNT (23 32768)) (\\HTCOLL (28 0) NIL
- (|HTCOLLspace| |HTCOLLbase|)) (\\DISPLAYREGION (18 0)) (|\\D1BCPLspace| 0 T |LEmubrHiVal|) (
-|\\D0BCPLspace| 0 T) (* |;;| "Interface Page locations") (|\\CurrentFXP| 0 T T) (|\\ResetFXP| 1 T T) (
-|\\SubovFXP| 2 T T) (|\\KbdFXP| 3 T T) (|\\HardReturnFXP| 4 T T) (\\GCFXP 5) (\\FAULTFXP 6 T T) (
-|\\MiscFXP| 14 T T) (|\\TeleRaidFXP| 24 T T) (* |;;| "emulator segment locations") (DCB.EM 272) (
-DISPINTERRUPT.EM 273) (CURSORBITMAP.EM 281) (KBDAD0.EM 65052) (KBDAD1.EM 65053) (KBDAD2.EM 65054) (
-KBDAD3.EM 65055) (UTILIN.EM 65048) (CURSORX.EM 278) (CURSORY.EM 279) (MOUSEX.EM 276) (MOUSEY.EM 277) (
-|\\LispKeyMask| 8192 T T) (|\\BcplKeyMask| 4352 T T) (* \; "Machine types") (\\MAIKO 3) (\\DOLPHIN 4) 
-(\\DORADO 5) (\\DANDELION 6) (\\DAYBREAK 8) (* |;;| "FOR DLION (AND DAYBREAK)") (\\VP.DISPLAY 4608) (
-\\NP.DISPLAY 202) (* \; "for Dorado display 1024x808 pixels / (16 pixels/word x 256 words/page)") (
-\\NP.WIDEDOVEDISPLAY 243) (* \; "Wide Dove display 1152x864 pixels") (\\WIDEDOVEDISPLAYWIDTH 1152) (
-\\RP.AFTERDISPLAY 206) (* \; "Includes 4 pages for cursor") (\\RP.AFTERDOVEDISPLAY 243) (* \; 
-"if big screen") (\\RP.DISPLAY 0) (\\RP.TEMPDISPLAY 2561) (\\RP.MISCLOCKED 2804) (* \; 
-"(+ \\RP.TEMPDISPLAY \\NP.WIDEDOVEDISPLAY)") (\\RP.STACK 768) (\\VP.STACK 256) (\\RP.MAP 256) (
-\\NP.MAP 256) (\\RP.IOPAGE 512) (* \; 
-"The DOVE IOCBPAGE can go anywhere, but should be under the 1mbyte range") (\\RP.DOVEIOCBPAGE 543) (
-\\RP.DOVEIORGN 544) (\\VP.DOVEIORGN 64) (\\DOVEIORGNSIZE 64) (\\VP.IOPAGE 255) (\\VP.IFPAGE 5120) (
-\\VP.FPTOVP 512) (\\NP.FPTOVP 4096) (\\RP.FPTOVP 1024) (\\RP.STARTBUFFERS 640) (\\VP.TYPETABLE 6144) (
-\\NP.TYPETABLE 1024) (\\RP.TYPETABLE 5120) (\\VP.GCTABLE 5632) (\\NP.GCTABLE 256) (\\RP.GCTABLE 6144) 
-(\\VP.GCOVERFLOW 5888) (\\NP.GCOVERFLOW 1) (\\RP.GCOVERFLOW 6400) (\\FP.IFPAGE 2) (\\VP.IOCBS 1) (
-\\VP.PRIMARYMAP 5122) (\\VP.SECONDARYMAP 1280) (\\VP.LPT 5232) (\\VP.INITSCRATCH 8) (\\VP.RPT 128) (
-\\VP.BUFFERS 218) (* \; "DLion processor commands") (\\DL.PROCESSORBUSY 32768) (\\DL.SETTOD 32769) (
-\\DL.READTOD 32770) (\\DL.READPID 32771) (\\DL.BOOTBUTTON 32772)))
-(RPAQQ MISCSTATSLAYOUT ((STARTTIME FIXP |MSstrtTime|) (TOTALTIME FIXP) (SWAPWAITTIME FIXP T) (
-PAGEFAULTS FIXP T) (SWAPWRITES FIXP T) (DISKIOTIME FIXP T) (DISKOPS FIXP T) (KEYBOARDWAITTIME FIXP T) 
-(GCTIME FIXP T) (NETIOTIME FIXP T) (NETIOOPS FIXP T) (SWAPTEMP0 FIXP) (SWAPTEMP1 FIXP) (RCLKSECOND 
-FIXP) (SECONDSCLOCK FIXP) (MILLISECONDSCLOCK FIXP) (BASECLOCK FIXP) (RCLKTEMP0 FIXP) (SECONDSTMP FIXP)
- (MILLISECONDSTMP FIXP) (BASETMP FIXP) (EXCESSTIMETMP FIXP) (CLOCKTEMP0 FIXP) (DISKTEMP0 FIXP) (
+(RPAQQ INITCONSTANTS ((* ;;; "(LISPNAME VALUE BCPLNAME UCODENAME)") (CDRCODING 1 T T) (* ; 
+"IF CDRCODING=0, CDR CODING IS OFF, OTHERWISE ON") (* ;; "type numbers -- repeated on LLBASIC too") (
+\SMALLP 1 SMALLTYPE SmallType) (\FIXP 2 INTEGERTYPE FixpType) (\FLOATP 3 FLTPTTYPE FloatpType) (
+\LITATOM 4 ATOMTYPE AtomType) (\LISTP 5 LISTTYPE ListType) (\ARRAYP 6 ARRAYPTRTYPE ArrayType) (
+\STRINGP 7 STRINGPTRTYPE) (\STACKP 8) (\CHARACTERP 9) (\VMEMPAGEP 10 NIL VMemPagePType) (\STREAM 11 
+NIL STREAMTYPE) (* ;; "TYPE TABLE CONSTANTS - - - - - - - - - - - - - - - - - - - - - -") (
+\TT.TYPEMASK 2047 TTTypeMask T) (\TT.NOREF 32768 NIL T) (\TT.SYMBOLP 16384 NIL T) (\TT.FIXP 8192) (
+\TT.NUMBERP 4096) (\TT.ATOM 2048) (* ;; 
+"page map - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -") (\PMblockSize 
+32 PMBLOCKSIZE) (\STATSsize 8 T) (\NumPMTpages 8) (\EmptyPMTEntry 65535 T) (\FirstVmemBlock 2 T) (
+\MAXVMPAGE 131069) (\MAXVMSEGMENT 255) (* ;; "interface page") (\IFPValidKey 5603 T) (* ;; "MDS") (
+\FirstMDSPage 32766) (* ; "Was 37776Q pre 16-meg intiial") (\MaxMDSPage 524285) (\DefaultSecondMDSPage
+ 65532) (\MDSIncrement 512) (\PagesPerMDSUnit 2) (* ; "(FOLDLO \MDSIncrement WORDSPERPAGE)") (* ;; 
+"arrays") (\ARRAYSPACE (46 0)) (\FirstArraySegment 46) (\FirstArrayPage 11776) (\ARRAYSPACE2 (64 0)) (
+\DefaultSecondArrayPage 32768) (* ; "Was 40000Q before 16meg initial") (* ;; "stack block constants") 
+(\StackMask 57344 T T) (\FxtnBlock 49152 T T) (\GuardBlock 57344 T T) (\BFBlock 32768 T T) (
+\FreeStackBlock 40960 T T) (\NotStackBlock 0) (* ; "none of the above") (\MinExtraStackWords 32 T T) (
+* ;; "backspace kludge") (ERASECHARCODE 0 T) (* ;; "GC constants") (\HT1CNT 1024 NIL T) (\HTSTKBIT 512
+ NIL T) (\HTCNTMASK 64512 NIL T) (\HTMAINSIZE 65536 NIL T) (\HTCOLLSIZE 1048576 NIL T) (* ; 
+"HTCOLL size in words") (\HTENDFREE 1 NIL T) (\HTFREEPTR 0 NIL T) (* ;; 
+"pointers and lengths of various data spaces") (\ATOMSPACE (0 0) (ATOMspace NIL) (atomHiVal NIL)) (
+\AtomHI 0) (\CHARHI 7) (* ; "overlap character space and the atom hash table space") (\AtomHashTable (
+21 0) (AHTspace AHTbase)) (\AtomHTpages 256 AHTSIZE) (\LastAtomPage 255) (\MaxAtomFrLst 65535) (
+\SMALLPOSPSPACE (14 0)) (\SmallPosHi 14 SMALLPOSspace smallpl) (\SMALLNEGSPACE (15 0)) (\SmallNegHi 15
+ SMALLNEGspace smallneg) (\NumSmallPages 512) (* ;; 
+"PNAME SPACEin the old world; used for initial atoms now.") (\PNPSPACE (8 0) (PNPspace PNPbase)) (
+\PNAME.HI 8) (\OLDATOMSPACE (44 0)) (* ; "NEW ATOM SPACE") (\ATOM.HI 44) (* ; 
+"HI PART OF NEW ATOM SPACE") (* ;; "Definitions in old atom world") (\DEFSPACE (10 0) (DEFspace 
+DEFbase) (DEFspace DEFbase)) (\DEF.HI 10) (\VALSPACE (12 0) (TOPVALspace TOPVALbase) (VALspace VALbase
+)) (\VAL.HI 12) (\PLISTSPACE (2 0) (PLISTspace PLISTbase)) (\PLIST.HI 2) (\PAGEMAP (5 0) (PAGEMAPspace
+ PAGEMAPbase)) (\NumPageMapPages 256) (\PageMapTBL (20 512) (PMTspace PMTbase)) (\InterfacePage (20 0)
+ (INTERFACEspace INTERFACEbase) (INTERFACEspace INTERFACEbase)) (\IOPAGE (0 65280)) (\DoveIORegion (0 
+16384)) (\IOCBPAGE (0 256)) (\FPTOVP (2 0)) (\MDSTypeTable (24 0) (MDSTYPEspace MDSTYPEbase) (
+MDSTYPEspace MDSTYPEbase)) (\MDSTTsize 1024 T) (* ; "in Pages") (\MISCSTATS (20 2560) (STATSspace 
+MISCSTATSbase)) (\UFNTable (20 3072) NIL (STATSspace UFNTablebase)) (\UFNTableSize 2) (\DTDSpaceBase (
+20 4096) (DTDspace DTDbase) (DTDspace DTDbase)) (\DTDSize 18 T) (\LISTPDTD (20 4186)) (\EndTypeNumber 
+2047) (\LOCKEDPAGETABLE (20 28672)) (\NumLPTPages 16) (\STACKSPACE (1 0) (STACKspace NIL) (STACKspace 
+NIL)) (\GuardStackAddr 61440) (\LastStackAddr 65534) (\STACKHI 1 T T) (\HTMAIN (22 0) (HTMAINspace 
+HTMAINbase) (HTMAINspace HTMAINbase)) (\HTMAINnpages 256 T) (\HTOVERFLOW (23 0) NIL (NIL 
+HTOVERFLOWbase)) (\HTBIGCOUNT (23 32768)) (\HTCOLL (28 0) NIL (HTCOLLspace HTCOLLbase)) (
+\DISPLAYREGION (18 0)) (\D1BCPLspace 0 T LEmubrHiVal) (\D0BCPLspace 0 T) (* ;; 
+"Interface Page locations") (\CurrentFXP 0 T T) (\ResetFXP 1 T T) (\SubovFXP 2 T T) (\KbdFXP 3 T T) (
+\HardReturnFXP 4 T T) (\GCFXP 5) (\FAULTFXP 6 T T) (\MiscFXP 14 T T) (\TeleRaidFXP 24 T T) (* ;; 
+"emulator segment locations") (DCB.EM 272) (DISPINTERRUPT.EM 273) (CURSORBITMAP.EM 281) (KBDAD0.EM 
+65052) (KBDAD1.EM 65053) (KBDAD2.EM 65054) (KBDAD3.EM 65055) (UTILIN.EM 65048) (CURSORX.EM 278) (
+CURSORY.EM 279) (MOUSEX.EM 276) (MOUSEY.EM 277) (\LispKeyMask 8192 T T) (\BcplKeyMask 4352 T T) (* ; 
+"Machine types") (\MAIKO 3) (\DOLPHIN 4) (\DORADO 5) (\DANDELION 6) (\DAYBREAK 8) (* ;; 
+"FOR DLION (AND DAYBREAK)") (\VP.DISPLAY 4608) (\NP.DISPLAY 202) (* ; 
+"for Dorado display 1024x808 pixels / (16 pixels/word x 256 words/page)") (\NP.WIDEDOVEDISPLAY 243) (*
+ ; "Wide Dove display 1152x864 pixels") (\WIDEDOVEDISPLAYWIDTH 1152) (\RP.AFTERDISPLAY 206) (* ; 
+"Includes 4 pages for cursor") (\RP.AFTERDOVEDISPLAY 243) (* ; "if big screen") (\RP.DISPLAY 0) (
+\RP.TEMPDISPLAY 2561) (\RP.MISCLOCKED 2804) (* ; "(+ \RP.TEMPDISPLAY \NP.WIDEDOVEDISPLAY)") (\RP.STACK
+ 768) (\VP.STACK 256) (\RP.MAP 256) (\NP.MAP 256) (\RP.IOPAGE 512) (* ; 
+"The DOVE IOCBPAGE can go anywhere, but should be under the 1mbyte range") (\RP.DOVEIOCBPAGE 543) (
+\RP.DOVEIORGN 544) (\VP.DOVEIORGN 64) (\DOVEIORGNSIZE 64) (\VP.IOPAGE 255) (\VP.IFPAGE 5120) (
+\VP.FPTOVP 512) (\NP.FPTOVP 4096) (\RP.FPTOVP 1024) (\RP.STARTBUFFERS 640) (\VP.TYPETABLE 6144) (
+\NP.TYPETABLE 1024) (\RP.TYPETABLE 5120) (\VP.GCTABLE 5632) (\NP.GCTABLE 256) (\RP.GCTABLE 6144) (
+\VP.GCOVERFLOW 5888) (\NP.GCOVERFLOW 1) (\RP.GCOVERFLOW 6400) (\FP.IFPAGE 2) (\VP.IOCBS 1) (
+\VP.PRIMARYMAP 5122) (\VP.SECONDARYMAP 1280) (\VP.LPT 5232) (\VP.INITSCRATCH 8) (\VP.RPT 128) (
+\VP.BUFFERS 218) (* ; "DLion processor commands") (\DL.PROCESSORBUSY 32768) (\DL.SETTOD 32769) (
+\DL.READTOD 32770) (\DL.READPID 32771) (\DL.BOOTBUTTON 32772)))
+(RPAQQ MISCSTATSLAYOUT ((STARTTIME FIXP MSstrtTime) (TOTALTIME FIXP) (SWAPWAITTIME FIXP T) (PAGEFAULTS
+ FIXP T) (SWAPWRITES FIXP T) (DISKIOTIME FIXP T) (DISKOPS FIXP T) (KEYBOARDWAITTIME FIXP T) (GCTIME 
+FIXP T) (NETIOTIME FIXP T) (NETIOOPS FIXP T) (SWAPTEMP0 FIXP) (SWAPTEMP1 FIXP) (RCLKSECOND FIXP) (
+SECONDSCLOCK FIXP) (MILLISECONDSCLOCK FIXP) (BASECLOCK FIXP) (RCLKTEMP0 FIXP) (SECONDSTMP FIXP) (
+MILLISECONDSTMP FIXP) (BASETMP FIXP) (EXCESSTIMETMP FIXP) (CLOCKTEMP0 FIXP) (DISKTEMP0 FIXP) (
 DISKTEMP1 FIXP) (TELERAIDTEMP1 FIXP) (TELERAIDTEMP2 FIXP) (TELERAIDTEMP3 FIXP) (LASTUSERACTION FIXP) (
 DLMOUSETIMER FIXP) (DLMOUSETEMP FIXP)))
-(RPAQQ IFPAGELAYOUT ((|CurrentFXP| WORD) (* \; 
-"First 7 items are FX values for user and 6 system contexts.") (|ResetFXP| WORD) (|SubovFXP| WORD) (
-|KbdFXP| WORD) (|HardReturnFXP| WORD) (GCFXP WORD) (FAULTFXP WORD) (|EndOfStack| WORD) (* \; 
-"Stack high-water mark: address of guard block at current end of stack") (|LVersion| WORD) (* \; 
-"Lisp version, followed by min versions of microcode and Bcpl compatible with this Lisp") (
-|MinRVersion| WORD) (|MinBVersion| WORD) (|RVersion| WORD) (* \; 
-"Bcpl fills in the actual microcode, Bcpl versions.") (|BVersion| WORD) (|MachineType| WORD) (
-|MiscFXP| WORD) (* \; "FX for MISC context") (|Key| WORD) (* \; "= IFPValidKey if vmem consistent.") (
-|SerialNumber| WORD) (* \; "Pup host number (Dorado/Dolphin)") (|EmulatorSpace| WORD) (* \; 
-"Hiloc of bcpl space (always zero now)") (|ScreenWidth| WORD) (|NxtPMAddr| WORD) (* \; 
-"Next page to be allocated in secondary page map table") (|NActivePages| WORD) (* \; 
-"Length of vmem in use") (|NDirtyPages| WORD) (* \; "not used, but maintained as = NActivePages") (
-|filePnPMP0| WORD) (* \; 
-"Sysout page number of first page of secondary page map table (\\PAGEMAP), which is where the secondary map pages themselves live"
-) (|filePnPMT0| WORD) (* \; "Sysout page number of first page of primary page map table") (TELERAIDFXP
- WORD) (* \; "FX for TeleRaid server context") (NATIVE-START-MEM-PAGE WORD) (* \; 
-"Unix page where native code starts") (NATIVE-LENGTH-PAGE WORD) (* \; 
-"Unix page length of native code") (NATIVE-PAGE-OFFSET WORD) (* \; 
-"Lisp Disk Page offset  of native code") (|UserNameAddr| WORD) (* \; 
-"Addresses in bcpl space (seg 0) of global user name and password") (|UserPswdAddr| WORD) (|StackBase|
- WORD) (* \; "Stack address where user stack starts") (FAULTHI WORD) (* \; 
+(RPAQQ IFPAGELAYOUT ((CurrentFXP WORD) (* ; 
+"First 7 items are FX values for user and 6 system contexts.") (ResetFXP WORD) (SubovFXP WORD) (KbdFXP
+ WORD) (HardReturnFXP WORD) (GCFXP WORD) (FAULTFXP WORD) (EndOfStack WORD) (* ; 
+"Stack high-water mark: address of guard block at current end of stack") (LVersion WORD) (* ; 
+"Lisp version, followed by min versions of microcode and Bcpl compatible with this Lisp") (MinRVersion
+ WORD) (MinBVersion WORD) (RVersion WORD) (* ; "Bcpl fills in the actual microcode, Bcpl versions.") (
+BVersion WORD) (MachineType WORD) (MiscFXP WORD) (* ; "FX for MISC context") (Key WORD) (* ; 
+"= IFPValidKey if vmem consistent.") (SerialNumber WORD) (* ; "Pup host number (Dorado/Dolphin)") (
+EmulatorSpace WORD) (* ; "Hiloc of bcpl space (always zero now)") (ScreenWidth WORD) (NxtPMAddr WORD) 
+(* ; "Next page to be allocated in secondary page map table") (NActivePages WORD) (* ; 
+"Length of vmem in use") (NDirtyPages WORD) (* ; "not used, but maintained as = NActivePages") (
+filePnPMP0 WORD) (* ; 
+"Sysout page number of first page of secondary page map table (\PAGEMAP), which is where the secondary map pages themselves live"
+) (filePnPMT0 WORD) (* ; "Sysout page number of first page of primary page map table") (TELERAIDFXP 
+WORD) (* ; "FX for TeleRaid server context") (NATIVE-START-MEM-PAGE WORD) (* ; 
+"Unix page where native code starts") (NATIVE-LENGTH-PAGE WORD) (* ; "Unix page length of native code"
+) (NATIVE-PAGE-OFFSET WORD) (* ; "Lisp Disk Page offset  of native code") (UserNameAddr WORD) (* ; 
+"Addresses in bcpl space (seg 0) of global user name and password") (UserPswdAddr WORD) (StackBase 
+WORD) (* ; "Stack address where user stack starts") (FAULTHI WORD) (* ; 
 "Microcode for page fault stores fault address here, then does context switch to FAULTFXP") (FAULTLO 
-WORD) (DEVCONFIG WORD) (* \; "IT'S FOR KB,DISP TYPE") (* \; 
-"Formerly REALPAGETABLE, back when it was always in Bcpl space.") (RPTSIZE WORD) (* \; 
-"Number of entries in Real Page Table") (RPOFFSET WORD) (* \; "RP-RPOFFSET => index in table") (
-MAXETHERBYTES WORD) (* \; "Number of bytes available in a pbi, not counting encapsulation (Dorado)") (
-EMBUFVP WORD) (* \; "VP of a one-page emulator buffer") (|NSHost0| WORD) (* \; 
+WORD) (DEVCONFIG WORD) (* ; "IT'S FOR KB,DISP TYPE") (* ; 
+"Formerly REALPAGETABLE, back when it was always in Bcpl space.") (RPTSIZE WORD) (* ; 
+"Number of entries in Real Page Table") (RPOFFSET WORD) (* ; "RP-RPOFFSET => index in table") (
+MAXETHERBYTES WORD) (* ; "Number of bytes available in a pbi, not counting encapsulation (Dorado)") (
+EMBUFVP WORD) (* ; "VP of a one-page emulator buffer") (NSHost0 WORD) (* ; 
 "Machine's 48-bit NS host number.  Lisp manages to compute this on all machines except Dolphin, where Bcpl fills it in."
-) (|NSHost1| WORD) (|NSHost2| WORD) (|MDSZone| WORD) (* \; 
-"Obsolete -- was used by Dolphin 10MB network code.") (|MDSZoneLength| WORD) (EMUBUFFERS WORD) (* \; 
-"Buffer space in segment 0 for swapping/disk activity") (EMUBUFLENGTH WORD) (* \; 
-"Number of words of said space") (LASTNUMCHARS WORD) (* \; "No longer used?") (SYSDISK WORD) (* \; 
-"Address of sysDisk in Bcpl space -- disk obj for boot partition.") (ISFMAP WORD) (* |;;| 
-"The following 4 are for \\MISCAPPLY* -- note that they are not ref counted, so don't pass the only pointer to something this way!"
+) (NSHost1 WORD) (NSHost2 WORD) (MDSZone WORD) (* ; 
+"Obsolete -- was used by Dolphin 10MB network code.") (MDSZoneLength WORD) (EMUBUFFERS WORD) (* ; 
+"Buffer space in segment 0 for swapping/disk activity") (EMUBUFLENGTH WORD) (* ; 
+"Number of words of said space") (LASTNUMCHARS WORD) (* ; "No longer used?") (SYSDISK WORD) (* ; 
+"Address of sysDisk in Bcpl space -- disk obj for boot partition.") (ISFMAP WORD) (* ;; 
+"The following 4 are for \MISCAPPLY* -- note that they are not ref counted, so don't pass the only pointer to something this way!"
 ) (MISCSTACKFN FULLXPOINTER) (MISCSTACKARG1 FULLXPOINTER) (MISCSTACKARG2 FULLXPOINTER) (
-MISCSTACKRESULT FULLXPOINTER) (|NRealPages| WORD) (* \; "Number pages of real memory") (
-|LastLockedFilePage| WORD) (* \; 
-"Last page of vmem that is locked--booting has to load at least that far.") (|LastDominoFilePage| WORD
-) (* \; "Last sysout page reserved for Dandelion microcode") (|FPTOVPStart| WORD) (* \; 
-"Sysout page where FPTOVP starts") (FAKEMOUSEBITS WORD) (* \; 
-"Used to implement fake middle button on 2-button Dandelion.") (|DL24BitAddressable| WORD) (* \; 
-"non-zero if DLion capable of addressing 32MB virtual memory") (REALPAGETABLEPTR FULLXPOINTER) (* \; 
-"Address of real page table, set up by Bcpl (but not chained together)") (|DLLastVmemPage| WORD) (* \;
- "DLion booting microcode puts length of vmem file here.") (|FullSpaceUsed| WORD) (* \; 
-"Non-zero if vmem beyond initial 8MB has been allocated.") (FAKEKBDAD4 WORD) (FAKEKBDAD5 WORD) (* |;;|
- 
+MISCSTACKRESULT FULLXPOINTER) (NRealPages WORD) (* ; "Number pages of real memory") (
+LastLockedFilePage WORD) (* ; 
+"Last page of vmem that is locked--booting has to load at least that far.") (LastDominoFilePage WORD) 
+(* ; "Last sysout page reserved for Dandelion microcode") (FPTOVPStart WORD) (* ; 
+"Sysout page where FPTOVP starts") (FAKEMOUSEBITS WORD) (* ; 
+"Used to implement fake middle button on 2-button Dandelion.") (DL24BitAddressable WORD) (* ; 
+"non-zero if DLion capable of addressing 32MB virtual memory") (REALPAGETABLEPTR FULLXPOINTER) (* ; 
+"Address of real page table, set up by Bcpl (but not chained together)") (DLLastVmemPage WORD) (* ; 
+"DLion booting microcode puts length of vmem file here.") (FullSpaceUsed WORD) (* ; 
+"Non-zero if vmem beyond initial 8MB has been allocated.") (FAKEKBDAD4 WORD) (FAKEKBDAD5 WORD) (* ;; 
 "The following 9 items (6 words and 3 pointers) are 3 3-element vectors for the Dorado extended virtual memory code--indexed by 0,1,2 according to which of up to 3 virtual memory backing files you're working with."
-) (|XVmemFmapBase| WORD) (* \; 
+) (XVmemFmapBase WORD) (* ; 
 "Bcpl stores isf map pointer to each partition here.  First is redundant with ISFMAP field above.") (
-NIL WORD) (NIL WORD) (|XVmemFmapHighBase| WORD) (* \; 
+NIL WORD) (NIL WORD) (XVmemFmapHighBase WORD) (* ; 
 "Bcpl stores the highest vm page contained in this or earlier partition.") (NIL WORD) (NIL WORD) (
-|XVmemDiskBase| FULLXPOINTER) (* \; 
+XVmemDiskBase FULLXPOINTER) (* ; 
 "Lisp stores disk objects here (just a convenient non-faulting contiguous block of storage).") (NIL 
 FULLXPOINTER) (NIL FULLXPOINTER)))
-(RPAQQ MAIKO.IFPAGELAYOUT ((|CurrentFXP| WORD) (* \; 
-"First 7 items are FX values for user and 6 system contexts.") (|ResetFXP| WORD) (|SubovFXP| WORD) (
-|KbdFXP| WORD) (|HardReturnFXP| WORD) (GCFXP WORD) (FAULTFXP WORD) (|EndOfStack| WORD) (* \; 
-"Stack high-water mark: address of guard block at current end of stack") (|LVersion| WORD) (* \; 
-"Lisp version, followed by min versions of microcode and Bcpl compatible with this Lisp") (
-|MinRVersion| WORD) (|MinBVersion| WORD) (|RVersion| WORD) (* \; 
-"Bcpl fills in the actual microcode, Bcpl versions.") (|BVersion| WORD) (|MachineType| WORD) (
-|MiscFXP| WORD) (* \; "FX for MISC context") (|Key| WORD) (* \; "= IFPValidKey if vmem consistent.") (
-|SerialNumber| WORD) (* \; "Pup host number (Dorado/Dolphin)") (|EmulatorSpace| WORD) (* \; 
-"Hiloc of bcpl space (always zero now)") (|ScreenWidth| WORD) (|NxtPMAddr| WORD) (* \; 
-"Next page to be allocated in secondary page map table") (NIL WORD) (* \; 
-"WAS NActivePages, Length of vmem in use") (NIL WORD) (* \; 
-"WAS NDirtyPages, not used, but maintained as = NActivePages") (|filePnPMP0| WORD) (* \; 
-"Sysout page number of first page of secondary page map table (\\PAGEMAP), which is where the secondary map pages themselves live"
-) (|filePnPMT0| WORD) (* \; "Sysout page number of first page of primary page map table") (TELERAIDFXP
- WORD) (* \; "FX for TeleRaid server context") (NATIVE-START-MEM-PAGE WORD) (* \; 
-"Unix page where native code starts") (NATIVE-LENGTH-PAGE WORD) (* \; 
-"Unix page length of native code") (NATIVE-PAGE-OFFSET WORD) (* \; 
-"Lisp Disk Page offset  of native code") (|UserNameAddr| WORD) (* \; 
-"Addresses in bcpl space (seg 0) of global user name and password") (|UserPswdAddr| WORD) (|StackBase|
- WORD) (* \; "Stack address where user stack starts") (FAULTHI WORD) (* \; 
+(RPAQQ MAIKO.IFPAGELAYOUT ((CurrentFXP WORD) (* ; 
+"First 7 items are FX values for user and 6 system contexts.") (ResetFXP WORD) (SubovFXP WORD) (KbdFXP
+ WORD) (HardReturnFXP WORD) (GCFXP WORD) (FAULTFXP WORD) (EndOfStack WORD) (* ; 
+"Stack high-water mark: address of guard block at current end of stack") (LVersion WORD) (* ; 
+"Lisp version, followed by min versions of microcode and Bcpl compatible with this Lisp") (MinRVersion
+ WORD) (MinBVersion WORD) (RVersion WORD) (* ; "Bcpl fills in the actual microcode, Bcpl versions.") (
+BVersion WORD) (MachineType WORD) (MiscFXP WORD) (* ; "FX for MISC context") (Key WORD) (* ; 
+"= IFPValidKey if vmem consistent.") (SerialNumber WORD) (* ; "Pup host number (Dorado/Dolphin)") (
+EmulatorSpace WORD) (* ; "Hiloc of bcpl space (always zero now)") (ScreenWidth WORD) (NxtPMAddr WORD) 
+(* ; "Next page to be allocated in secondary page map table") (NIL WORD) (* ; 
+"WAS NActivePages, Length of vmem in use") (NIL WORD) (* ; 
+"WAS NDirtyPages, not used, but maintained as = NActivePages") (filePnPMP0 WORD) (* ; 
+"Sysout page number of first page of secondary page map table (\PAGEMAP), which is where the secondary map pages themselves live"
+) (filePnPMT0 WORD) (* ; "Sysout page number of first page of primary page map table") (TELERAIDFXP 
+WORD) (* ; "FX for TeleRaid server context") (NATIVE-START-MEM-PAGE WORD) (* ; 
+"Unix page where native code starts") (NATIVE-LENGTH-PAGE WORD) (* ; "Unix page length of native code"
+) (NATIVE-PAGE-OFFSET WORD) (* ; "Lisp Disk Page offset  of native code") (UserNameAddr WORD) (* ; 
+"Addresses in bcpl space (seg 0) of global user name and password") (UserPswdAddr WORD) (StackBase 
+WORD) (* ; "Stack address where user stack starts") (FAULTHI WORD) (* ; 
 "Microcode for page fault stores fault address here, then does context switch to FAULTFXP") (FAULTLO 
-WORD) (DEVCONFIG WORD) (* \; "IT'S FOR KB,DISP TYPE") (* \; 
-"Formerly REALPAGETABLE, back when it was always in Bcpl space.") (RPTSIZE WORD) (* \; 
-"Number of entries in Real Page Table") (RPOFFSET WORD) (* \; "RP-RPOFFSET => index in table") (
-MAXETHERBYTES WORD) (* \; "Number of bytes available in a pbi, not counting encapsulation (Dorado)") (
-EMBUFVP WORD) (* \; "VP of a one-page emulator buffer") (|NSHost0| WORD) (* \; 
+WORD) (DEVCONFIG WORD) (* ; "IT'S FOR KB,DISP TYPE") (* ; 
+"Formerly REALPAGETABLE, back when it was always in Bcpl space.") (RPTSIZE WORD) (* ; 
+"Number of entries in Real Page Table") (RPOFFSET WORD) (* ; "RP-RPOFFSET => index in table") (
+MAXETHERBYTES WORD) (* ; "Number of bytes available in a pbi, not counting encapsulation (Dorado)") (
+EMBUFVP WORD) (* ; "VP of a one-page emulator buffer") (NSHost0 WORD) (* ; 
 "Machine's 48-bit NS host number.  Lisp manages to compute this on all machines except Dolphin, where Bcpl fills it in."
-) (|NSHost1| WORD) (|NSHost2| WORD) (|MDSZone| WORD) (* \; 
-"Obsolete -- was used by Dolphin 10MB network code.") (|MDSZoneLength| WORD) (EMUBUFFERS WORD) (* \; 
-"Buffer space in segment 0 for swapping/disk activity") (EMUBUFLENGTH WORD) (* \; 
-"Number of words of said space") (* |;;| 
-"The following 2 are available if NEW_STOARGE is specified in C") (|ProcessSize| WORD) (* \; 
-"Process size for which can be use as LISP space") (|StorageFullState| WORD) (* \; 
-"Save last storage state") (ISFMAP WORD) (* |;;| 
-"The following 4 are for \\MISCAPPLY* -- note that they are not ref counted, so don't pass the only pointer to something this way!"
+) (NSHost1 WORD) (NSHost2 WORD) (MDSZone WORD) (* ; 
+"Obsolete -- was used by Dolphin 10MB network code.") (MDSZoneLength WORD) (EMUBUFFERS WORD) (* ; 
+"Buffer space in segment 0 for swapping/disk activity") (EMUBUFLENGTH WORD) (* ; 
+"Number of words of said space") (* ;; 
+"The following 2 are available if NEW_STOARGE is specified in C") (ProcessSize WORD) (* ; 
+"Process size for which can be use as LISP space") (StorageFullState WORD) (* ; 
+"Save last storage state") (ISFMAP WORD) (* ;; 
+"The following 4 are for \MISCAPPLY* -- note that they are not ref counted, so don't pass the only pointer to something this way!"
 ) (MISCSTACKFN FULLXPOINTER) (MISCSTACKARG1 FULLXPOINTER) (MISCSTACKARG2 FULLXPOINTER) (
-MISCSTACKRESULT FULLXPOINTER) (|NRealPages| WORD) (* \; "Number pages of real memory") (
-|LastLockedFilePage| WORD) (* \; 
-"Last page of vmem that is locked--booting has to load at least that far.") (|LastDominoFilePage| WORD
-) (* \; "Last sysout page reserved for Dandelion microcode") (|FPTOVPStart| WORD) (* \; 
-"Sysout page where FPTOVP starts") (FAKEMOUSEBITS WORD) (* \; 
-"Used to implement fake middle button on 2-button Dandelion.") (|DL24BitAddressable| WORD) (* \; 
-"non-zero if DLion capable of addressing 32MB virtual memory") (REALPAGETABLEPTR FULLXPOINTER) (* \; 
-"Address of real page table, set up by Bcpl (but not chained together)") (SYSDISK WORD) (* \; 
-"WAS DLLastVmemPage, DLion booting microcode puts length of vmem file here.") (|FullSpaceUsed| WORD) (
-* \; "Non-zero if vmem beyond initial 8MB has been allocated.") (FAKEKBDAD4 WORD) (FAKEKBDAD5 WORD) (*
- |;;| 
+MISCSTACKRESULT FULLXPOINTER) (NRealPages WORD) (* ; "Number pages of real memory") (
+LastLockedFilePage WORD) (* ; 
+"Last page of vmem that is locked--booting has to load at least that far.") (LastDominoFilePage WORD) 
+(* ; "Last sysout page reserved for Dandelion microcode") (FPTOVPStart WORD) (* ; 
+"Sysout page where FPTOVP starts") (FAKEMOUSEBITS WORD) (* ; 
+"Used to implement fake middle button on 2-button Dandelion.") (DL24BitAddressable WORD) (* ; 
+"non-zero if DLion capable of addressing 32MB virtual memory") (REALPAGETABLEPTR FULLXPOINTER) (* ; 
+"Address of real page table, set up by Bcpl (but not chained together)") (SYSDISK WORD) (* ; 
+"WAS DLLastVmemPage, DLion booting microcode puts length of vmem file here.") (FullSpaceUsed WORD) (* 
+; "Non-zero if vmem beyond initial 8MB has been allocated.") (FAKEKBDAD4 WORD) (FAKEKBDAD5 WORD) (* ;;
+ 
 "The following 9 items (6 words and 3 pointers) are 3 3-element vectors for the Dorado extended virtual memory code--indexed by 0,1,2 according to which of up to 3 virtual memory backing files you're working with."
-) (|XVmemFmapBase| WORD) (* \; 
+) (XVmemFmapBase WORD) (* ; 
 "Bcpl stores isf map pointer to each partition here.  First is redundant with ISFMAP field above.") (
-NIL WORD) (NIL WORD) (|XVmemFmapHighBase| WORD) (* \; 
+NIL WORD) (NIL WORD) (XVmemFmapHighBase WORD) (* ; 
 "Bcpl stores the highest vm page contained in this or earlier partition.") (NIL WORD) (NIL WORD) (
-|XVmemDiskBase| FULLXPOINTER) (* \; 
+XVmemDiskBase FULLXPOINTER) (* ; 
 "Lisp stores disk objects here (just a convenient non-faulting contiguous block of storage).") (NIL 
-FULLXPOINTER) (NIL FULLXPOINTER) (|DLLastVmemPage| FIXP) (* \; 
-"DLion booting microcode puts length of vmem file here.") (|NActivePages| FIXP) (* \; 
-"Length of vmem in use") (|NDirtyPages| FIXP) (* \; "not used, but maintained as = NActivePages")))
+FULLXPOINTER) (NIL FULLXPOINTER) (DLLastVmemPage FIXP) (* ; 
+"DLion booting microcode puts length of vmem file here.") (NActivePages FIXP) (* ; 
+"Length of vmem in use") (NDirtyPages FIXP) (* ; "not used, but maintained as = NActivePages")))
 (RPAQQ IOPAGELAYOUT ((NIL 18 WORD) (DLMAINTPANEL WORD NIL T) (DLFLOPPYCMD WORD) (DLTTYPORTCMD WORD) (
 DLPROCESSORCMD WORD) (NEWMOUSESTATE WORD) (DLBEEPCMD WORD) (DLRS232CMISCCOMMAND WORD) (DLRS232CPUTFLAG
  WORD) (DLRS232CGETFLAG WORD) (NIL 6 WORD) (DLFLOPPY WORD) (DLTTYOUT WORD) (NIL 1 WORD) (DLTTYIN WORD)
@@ -256,88 +253,88 @@ DLRS232CSETRS366STATUS.11 14 WORD) (NIL 60 WORD) (DLMAGTAPE 4 WORD) (DLETHERNET
  WORD) (DLDISPINTERRUPT WORD NIL T) (DLDISPCONTROL WORD) (DLDISPBORDER WORD) (DLCURSORX WORD NIL T) (
 DLCURSORY WORD NIL T) (DLCURSORBITMAP 16 WORD NIL T)))
 (RPAQQ CDRCODING 1)
-(RPAQQ \\SMALLP 1)
-(RPAQQ \\FIXP 2)
-(RPAQQ \\FLOATP 3)
-(RPAQQ \\LITATOM 4)
-(RPAQQ \\LISTP 5)
-(RPAQQ \\ARRAYP 6)
-(RPAQQ \\STRINGP 7)
-(RPAQQ \\STACKP 8)
-(RPAQQ \\CHARACTERP 9)
-(RPAQQ \\VMEMPAGEP 10)
-(RPAQQ \\STREAM 11)
-(RPAQQ \\TT.TYPEMASK 2047)
-(RPAQQ \\TT.NOREF 32768)
-(RPAQQ \\TT.SYMBOLP 16384)
-(RPAQQ \\TT.FIXP 8192)
-(RPAQQ \\TT.NUMBERP 4096)
-(RPAQQ \\TT.ATOM 2048)
-(RPAQQ |\\PMblockSize| 32)
-(RPAQQ |\\STATSsize| 8)
-(RPAQQ |\\NumPMTpages| 8)
-(RPAQQ |\\EmptyPMTEntry| 65535)
-(RPAQQ |\\FirstVmemBlock| 2)
-(RPAQQ \\MAXVMPAGE 131069)
-(RPAQQ \\MAXVMSEGMENT 255)
-(RPAQQ |\\IFPValidKey| 5603)
-(RPAQQ |\\FirstMDSPage| 32766)
-(RPAQQ |\\MaxMDSPage| 524285)
-(RPAQQ |\\DefaultSecondMDSPage| 65532)
-(RPAQQ |\\MDSIncrement| 512)
-(RPAQQ |\\PagesPerMDSUnit| 2)
-(RPAQQ |\\FirstArraySegment| 46)
-(RPAQQ |\\FirstArrayPage| 11776)
-(RPAQQ |\\DefaultSecondArrayPage| 32768)
-(RPAQQ |\\StackMask| 57344)
-(RPAQQ |\\FxtnBlock| 49152)
-(RPAQQ |\\GuardBlock| 57344)
-(RPAQQ |\\BFBlock| 32768)
-(RPAQQ |\\FreeStackBlock| 40960)
-(RPAQQ |\\NotStackBlock| 0)
-(RPAQQ |\\MinExtraStackWords| 32)
+(RPAQQ \SMALLP 1)
+(RPAQQ \FIXP 2)
+(RPAQQ \FLOATP 3)
+(RPAQQ \LITATOM 4)
+(RPAQQ \LISTP 5)
+(RPAQQ \ARRAYP 6)
+(RPAQQ \STRINGP 7)
+(RPAQQ \STACKP 8)
+(RPAQQ \CHARACTERP 9)
+(RPAQQ \VMEMPAGEP 10)
+(RPAQQ \STREAM 11)
+(RPAQQ \TT.TYPEMASK 2047)
+(RPAQQ \TT.NOREF 32768)
+(RPAQQ \TT.SYMBOLP 16384)
+(RPAQQ \TT.FIXP 8192)
+(RPAQQ \TT.NUMBERP 4096)
+(RPAQQ \TT.ATOM 2048)
+(RPAQQ \PMblockSize 32)
+(RPAQQ \STATSsize 8)
+(RPAQQ \NumPMTpages 8)
+(RPAQQ \EmptyPMTEntry 65535)
+(RPAQQ \FirstVmemBlock 2)
+(RPAQQ \MAXVMPAGE 131069)
+(RPAQQ \MAXVMSEGMENT 255)
+(RPAQQ \IFPValidKey 5603)
+(RPAQQ \FirstMDSPage 32766)
+(RPAQQ \MaxMDSPage 524285)
+(RPAQQ \DefaultSecondMDSPage 65532)
+(RPAQQ \MDSIncrement 512)
+(RPAQQ \PagesPerMDSUnit 2)
+(RPAQQ \FirstArraySegment 46)
+(RPAQQ \FirstArrayPage 11776)
+(RPAQQ \DefaultSecondArrayPage 32768)
+(RPAQQ \StackMask 57344)
+(RPAQQ \FxtnBlock 49152)
+(RPAQQ \GuardBlock 57344)
+(RPAQQ \BFBlock 32768)
+(RPAQQ \FreeStackBlock 40960)
+(RPAQQ \NotStackBlock 0)
+(RPAQQ \MinExtraStackWords 32)
 (RPAQQ ERASECHARCODE 0)
-(RPAQQ \\HT1CNT 1024)
-(RPAQQ \\HTSTKBIT 512)
-(RPAQQ \\HTCNTMASK 64512)
-(RPAQQ \\HTMAINSIZE 65536)
-(RPAQQ \\HTCOLLSIZE 1048576)
-(RPAQQ \\HTENDFREE 1)
-(RPAQQ \\HTFREEPTR 0)
-(RPAQQ |\\AtomHI| 0)
-(RPAQQ \\CHARHI 7)
-(RPAQQ |\\AtomHTpages| 256)
-(RPAQQ |\\LastAtomPage| 255)
-(RPAQQ |\\MaxAtomFrLst| 65535)
-(RPAQQ |\\SmallPosHi| 14)
-(RPAQQ |\\SmallNegHi| 15)
-(RPAQQ |\\NumSmallPages| 512)
-(RPAQQ \\PNAME.HI 8)
-(RPAQQ \\ATOM.HI 44)
-(RPAQQ \\DEF.HI 10)
-(RPAQQ \\VAL.HI 12)
-(RPAQQ \\PLIST.HI 2)
-(RPAQQ |\\NumPageMapPages| 256)
-(RPAQQ |\\MDSTTsize| 1024)
-(RPAQQ |\\UFNTableSize| 2)
-(RPAQQ |\\DTDSize| 18)
-(RPAQQ |\\EndTypeNumber| 2047)
-(RPAQQ |\\NumLPTPages| 16)
-(RPAQQ |\\GuardStackAddr| 61440)
-(RPAQQ |\\LastStackAddr| 65534)
-(RPAQQ \\STACKHI 1)
-(RPAQQ |\\HTMAINnpages| 256)
-(RPAQQ |\\D1BCPLspace| 0)
-(RPAQQ |\\D0BCPLspace| 0)
-(RPAQQ |\\CurrentFXP| 0)
-(RPAQQ |\\ResetFXP| 1)
-(RPAQQ |\\SubovFXP| 2)
-(RPAQQ |\\KbdFXP| 3)
-(RPAQQ |\\HardReturnFXP| 4)
-(RPAQQ \\GCFXP 5)
-(RPAQQ \\FAULTFXP 6)
-(RPAQQ |\\MiscFXP| 14)
-(RPAQQ |\\TeleRaidFXP| 24)
+(RPAQQ \HT1CNT 1024)
+(RPAQQ \HTSTKBIT 512)
+(RPAQQ \HTCNTMASK 64512)
+(RPAQQ \HTMAINSIZE 65536)
+(RPAQQ \HTCOLLSIZE 1048576)
+(RPAQQ \HTENDFREE 1)
+(RPAQQ \HTFREEPTR 0)
+(RPAQQ \AtomHI 0)
+(RPAQQ \CHARHI 7)
+(RPAQQ \AtomHTpages 256)
+(RPAQQ \LastAtomPage 255)
+(RPAQQ \MaxAtomFrLst 65535)
+(RPAQQ \SmallPosHi 14)
+(RPAQQ \SmallNegHi 15)
+(RPAQQ \NumSmallPages 512)
+(RPAQQ \PNAME.HI 8)
+(RPAQQ \ATOM.HI 44)
+(RPAQQ \DEF.HI 10)
+(RPAQQ \VAL.HI 12)
+(RPAQQ \PLIST.HI 2)
+(RPAQQ \NumPageMapPages 256)
+(RPAQQ \MDSTTsize 1024)
+(RPAQQ \UFNTableSize 2)
+(RPAQQ \DTDSize 18)
+(RPAQQ \EndTypeNumber 2047)
+(RPAQQ \NumLPTPages 16)
+(RPAQQ \GuardStackAddr 61440)
+(RPAQQ \LastStackAddr 65534)
+(RPAQQ \STACKHI 1)
+(RPAQQ \HTMAINnpages 256)
+(RPAQQ \D1BCPLspace 0)
+(RPAQQ \D0BCPLspace 0)
+(RPAQQ \CurrentFXP 0)
+(RPAQQ \ResetFXP 1)
+(RPAQQ \SubovFXP 2)
+(RPAQQ \KbdFXP 3)
+(RPAQQ \HardReturnFXP 4)
+(RPAQQ \GCFXP 5)
+(RPAQQ \FAULTFXP 6)
+(RPAQQ \MiscFXP 14)
+(RPAQQ \TeleRaidFXP 24)
 (RPAQQ DCB.EM 272)
 (RPAQQ DISPINTERRUPT.EM 273)
 (RPAQQ CURSORBITMAP.EM 281)
@@ -350,239 +347,232 @@ DLCURSORY WORD NIL T) (DLCURSORBITMAP 16 WORD NIL T)))
 (RPAQQ CURSORY.EM 279)
 (RPAQQ MOUSEX.EM 276)
 (RPAQQ MOUSEY.EM 277)
-(RPAQQ |\\LispKeyMask| 8192)
-(RPAQQ |\\BcplKeyMask| 4352)
-(RPAQQ \\MAIKO 3)
-(RPAQQ \\DOLPHIN 4)
-(RPAQQ \\DORADO 5)
-(RPAQQ \\DANDELION 6)
-(RPAQQ \\DAYBREAK 8)
-(RPAQQ \\VP.DISPLAY 4608)
-(RPAQQ \\NP.DISPLAY 202)
-(RPAQQ \\NP.WIDEDOVEDISPLAY 243)
-(RPAQQ \\WIDEDOVEDISPLAYWIDTH 1152)
-(RPAQQ \\RP.AFTERDISPLAY 206)
-(RPAQQ \\RP.AFTERDOVEDISPLAY 243)
-(RPAQQ \\RP.DISPLAY 0)
-(RPAQQ \\RP.TEMPDISPLAY 2561)
-(RPAQQ \\RP.MISCLOCKED 2804)
-(RPAQQ \\RP.STACK 768)
-(RPAQQ \\VP.STACK 256)
-(RPAQQ \\RP.MAP 256)
-(RPAQQ \\NP.MAP 256)
-(RPAQQ \\RP.IOPAGE 512)
-(RPAQQ \\RP.DOVEIOCBPAGE 543)
-(RPAQQ \\RP.DOVEIORGN 544)
-(RPAQQ \\VP.DOVEIORGN 64)
-(RPAQQ \\DOVEIORGNSIZE 64)
-(RPAQQ \\VP.IOPAGE 255)
-(RPAQQ \\VP.IFPAGE 5120)
-(RPAQQ \\VP.FPTOVP 512)
-(RPAQQ \\NP.FPTOVP 4096)
-(RPAQQ \\RP.FPTOVP 1024)
-(RPAQQ \\RP.STARTBUFFERS 640)
-(RPAQQ \\VP.TYPETABLE 6144)
-(RPAQQ \\NP.TYPETABLE 1024)
-(RPAQQ \\RP.TYPETABLE 5120)
-(RPAQQ \\VP.GCTABLE 5632)
-(RPAQQ \\NP.GCTABLE 256)
-(RPAQQ \\RP.GCTABLE 6144)
-(RPAQQ \\VP.GCOVERFLOW 5888)
-(RPAQQ \\NP.GCOVERFLOW 1)
-(RPAQQ \\RP.GCOVERFLOW 6400)
-(RPAQQ \\FP.IFPAGE 2)
-(RPAQQ \\VP.IOCBS 1)
-(RPAQQ \\VP.PRIMARYMAP 5122)
-(RPAQQ \\VP.SECONDARYMAP 1280)
-(RPAQQ \\VP.LPT 5232)
-(RPAQQ \\VP.INITSCRATCH 8)
-(RPAQQ \\VP.RPT 128)
-(RPAQQ \\VP.BUFFERS 218)
-(RPAQQ \\DL.PROCESSORBUSY 32768)
-(RPAQQ \\DL.SETTOD 32769)
-(RPAQQ \\DL.READTOD 32770)
-(RPAQQ \\DL.READPID 32771)
-(RPAQQ \\DL.BOOTBUTTON 32772)
-(CONSTANTS (CDRCODING 1) (\\SMALLP 1) (\\FIXP 2) (\\FLOATP 3) (\\LITATOM 4) (\\LISTP 5) (\\ARRAYP 6) (
-\\STRINGP 7) (\\STACKP 8) (\\CHARACTERP 9) (\\VMEMPAGEP 10) (\\STREAM 11) (\\TT.TYPEMASK 2047) (
-\\TT.NOREF 32768) (\\TT.SYMBOLP 16384) (\\TT.FIXP 8192) (\\TT.NUMBERP 4096) (\\TT.ATOM 2048) (
-|\\PMblockSize| 32) (|\\STATSsize| 8) (|\\NumPMTpages| 8) (|\\EmptyPMTEntry| 65535) (
-|\\FirstVmemBlock| 2) (\\MAXVMPAGE 131069) (\\MAXVMSEGMENT 255) (|\\IFPValidKey| 5603) (
-|\\FirstMDSPage| 32766) (|\\MaxMDSPage| 524285) (|\\DefaultSecondMDSPage| 65532) (|\\MDSIncrement| 512
-) (|\\PagesPerMDSUnit| 2) (|\\FirstArraySegment| 46) (|\\FirstArrayPage| 11776) (
-|\\DefaultSecondArrayPage| 32768) (|\\StackMask| 57344) (|\\FxtnBlock| 49152) (|\\GuardBlock| 57344) (
-|\\BFBlock| 32768) (|\\FreeStackBlock| 40960) (|\\NotStackBlock| 0) (|\\MinExtraStackWords| 32) (
-ERASECHARCODE 0) (\\HT1CNT 1024) (\\HTSTKBIT 512) (\\HTCNTMASK 64512) (\\HTMAINSIZE 65536) (
-\\HTCOLLSIZE 1048576) (\\HTENDFREE 1) (\\HTFREEPTR 0) (|\\AtomHI| 0) (\\CHARHI 7) (|\\AtomHTpages| 256
-) (|\\LastAtomPage| 255) (|\\MaxAtomFrLst| 65535) (|\\SmallPosHi| 14) (|\\SmallNegHi| 15) (
-|\\NumSmallPages| 512) (\\PNAME.HI 8) (\\ATOM.HI 44) (\\DEF.HI 10) (\\VAL.HI 12) (\\PLIST.HI 2) (
-|\\NumPageMapPages| 256) (|\\MDSTTsize| 1024) (|\\UFNTableSize| 2) (|\\DTDSize| 18) (|\\EndTypeNumber|
- 2047) (|\\NumLPTPages| 16) (|\\GuardStackAddr| 61440) (|\\LastStackAddr| 65534) (\\STACKHI 1) (
-|\\HTMAINnpages| 256) (|\\D1BCPLspace| 0) (|\\D0BCPLspace| 0) (|\\CurrentFXP| 0) (|\\ResetFXP| 1) (
-|\\SubovFXP| 2) (|\\KbdFXP| 3) (|\\HardReturnFXP| 4) (\\GCFXP 5) (\\FAULTFXP 6) (|\\MiscFXP| 14) (
-|\\TeleRaidFXP| 24) (DCB.EM 272) (DISPINTERRUPT.EM 273) (CURSORBITMAP.EM 281) (KBDAD0.EM 65052) (
-KBDAD1.EM 65053) (KBDAD2.EM 65054) (KBDAD3.EM 65055) (UTILIN.EM 65048) (CURSORX.EM 278) (CURSORY.EM 
-279) (MOUSEX.EM 276) (MOUSEY.EM 277) (|\\LispKeyMask| 8192) (|\\BcplKeyMask| 4352) (\\MAIKO 3) (
-\\DOLPHIN 4) (\\DORADO 5) (\\DANDELION 6) (\\DAYBREAK 8) (\\VP.DISPLAY 4608) (\\NP.DISPLAY 202) (
-\\NP.WIDEDOVEDISPLAY 243) (\\WIDEDOVEDISPLAYWIDTH 1152) (\\RP.AFTERDISPLAY 206) (\\RP.AFTERDOVEDISPLAY
- 243) (\\RP.DISPLAY 0) (\\RP.TEMPDISPLAY 2561) (\\RP.MISCLOCKED 2804) (\\RP.STACK 768) (\\VP.STACK 256
-) (\\RP.MAP 256) (\\NP.MAP 256) (\\RP.IOPAGE 512) (\\RP.DOVEIOCBPAGE 543) (\\RP.DOVEIORGN 544) (
-\\VP.DOVEIORGN 64) (\\DOVEIORGNSIZE 64) (\\VP.IOPAGE 255) (\\VP.IFPAGE 5120) (\\VP.FPTOVP 512) (
-\\NP.FPTOVP 4096) (\\RP.FPTOVP 1024) (\\RP.STARTBUFFERS 640) (\\VP.TYPETABLE 6144) (\\NP.TYPETABLE 
-1024) (\\RP.TYPETABLE 5120) (\\VP.GCTABLE 5632) (\\NP.GCTABLE 256) (\\RP.GCTABLE 6144) (
-\\VP.GCOVERFLOW 5888) (\\NP.GCOVERFLOW 1) (\\RP.GCOVERFLOW 6400) (\\FP.IFPAGE 2) (\\VP.IOCBS 1) (
-\\VP.PRIMARYMAP 5122) (\\VP.SECONDARYMAP 1280) (\\VP.LPT 5232) (\\VP.INITSCRATCH 8) (\\VP.RPT 128) (
-\\VP.BUFFERS 218) (\\DL.PROCESSORBUSY 32768) (\\DL.SETTOD 32769) (\\DL.READTOD 32770) (\\DL.READPID 
-32771) (\\DL.BOOTBUTTON 32772))
-(RPAQQ \\MPERRORS ((\\MP.OBSOLETEVMEM 1) (\\MP.INVALIDVMEM 2 "Vmem inconsistent at startup") (
-\\MP.IOCBPAGE 3 "No place for IOCB page at startup") (\\MP.MOB 4 "Map out of bounds") (
-\\MP.INVALIDADDR 5) (\\MP.INVALIDVP 6) (\\MP.CHAIN.UNAVAIL 7 
-"Unavailable page on real page table chain") (\\MP.SELECTLOOP 8 "Loop in \\SELECTREALPAGE") (
-\\MP.NEWPAGE 9 "Attempt to allocate already existing page") (\\MP.NEWMAPPAGE 10 
-"\\DONEWPAGE failed to allocate new map page") (\\MP.BADLOCKED 11 
-"Locked page occupies a file page needed to lock another") (\\MP.CLOCK0 12 
-"Arg to CLOCK0 not an integer box") (\\MP.RESIDENT 13 "Fault on resident page") (\\MP.STACKFAULT 14 
-"Fault on stack") (\\MP.VMEMTOOLONG 16 "Attempt to extend Vmem File beyond fixed limit (8mb)") (
-\\MP.WRITING.LOCKED.PAGE 17 "Writing a locked page with UPDATEKEY = T") (\\MP.UNINTERRUPTABLE 18 
-"Error in uninterruptable system code") (\\MP.STACKFULL 19) (\\MP.MDSFULL 20) (\\MP.UNKNOWN.UFN 21) (
-\\MP.ATOMSFULL 22) (\\MP.PNAMESFULL 23) (\\MP.USECOUNTOVERFLOW 24) (\\MP.MDSFULLWARNING 25) (
-\\MP.BADMDSFREELIST 26) (\\MP.BADARRAYBLOCK 27) (\\MP.BADDELETEBLOCK 28) (\\MP.BADARRAYRECLAIM 29) (
-\\MP.BIGREFCNTMISSING 30 "PTR refcnt previously overflowed, but not found in table.") (
-\\MP.BIGREFCNTALREADYPRESENT 31 "PTR already in overflow table") (\\MP.DELREF0 32) (\\MP.PROCERROR 33)
- (\\MP.PROCNOFRAME 34 "Failed to build frame for PROCESS use") (\\MP.32MBINUSE 35) (\\MP.TOPUNWOUND 36
- "Unexpected (RETTO T)") (\\MP.STACKRELEASED 37) (\\MP.FLUSHLOCKED 38) (\\MP.MAPNOTLOCKED 39) (
-\\MP.UNLOCKINGMAP 40) (\\MP.SWAPDISKERROR 41 "Hard Disk Error in swapper") (\\MP.BADRUNTABLE 42 
+(RPAQQ \LispKeyMask 8192)
+(RPAQQ \BcplKeyMask 4352)
+(RPAQQ \MAIKO 3)
+(RPAQQ \DOLPHIN 4)
+(RPAQQ \DORADO 5)
+(RPAQQ \DANDELION 6)
+(RPAQQ \DAYBREAK 8)
+(RPAQQ \VP.DISPLAY 4608)
+(RPAQQ \NP.DISPLAY 202)
+(RPAQQ \NP.WIDEDOVEDISPLAY 243)
+(RPAQQ \WIDEDOVEDISPLAYWIDTH 1152)
+(RPAQQ \RP.AFTERDISPLAY 206)
+(RPAQQ \RP.AFTERDOVEDISPLAY 243)
+(RPAQQ \RP.DISPLAY 0)
+(RPAQQ \RP.TEMPDISPLAY 2561)
+(RPAQQ \RP.MISCLOCKED 2804)
+(RPAQQ \RP.STACK 768)
+(RPAQQ \VP.STACK 256)
+(RPAQQ \RP.MAP 256)
+(RPAQQ \NP.MAP 256)
+(RPAQQ \RP.IOPAGE 512)
+(RPAQQ \RP.DOVEIOCBPAGE 543)
+(RPAQQ \RP.DOVEIORGN 544)
+(RPAQQ \VP.DOVEIORGN 64)
+(RPAQQ \DOVEIORGNSIZE 64)
+(RPAQQ \VP.IOPAGE 255)
+(RPAQQ \VP.IFPAGE 5120)
+(RPAQQ \VP.FPTOVP 512)
+(RPAQQ \NP.FPTOVP 4096)
+(RPAQQ \RP.FPTOVP 1024)
+(RPAQQ \RP.STARTBUFFERS 640)
+(RPAQQ \VP.TYPETABLE 6144)
+(RPAQQ \NP.TYPETABLE 1024)
+(RPAQQ \RP.TYPETABLE 5120)
+(RPAQQ \VP.GCTABLE 5632)
+(RPAQQ \NP.GCTABLE 256)
+(RPAQQ \RP.GCTABLE 6144)
+(RPAQQ \VP.GCOVERFLOW 5888)
+(RPAQQ \NP.GCOVERFLOW 1)
+(RPAQQ \RP.GCOVERFLOW 6400)
+(RPAQQ \FP.IFPAGE 2)
+(RPAQQ \VP.IOCBS 1)
+(RPAQQ \VP.PRIMARYMAP 5122)
+(RPAQQ \VP.SECONDARYMAP 1280)
+(RPAQQ \VP.LPT 5232)
+(RPAQQ \VP.INITSCRATCH 8)
+(RPAQQ \VP.RPT 128)
+(RPAQQ \VP.BUFFERS 218)
+(RPAQQ \DL.PROCESSORBUSY 32768)
+(RPAQQ \DL.SETTOD 32769)
+(RPAQQ \DL.READTOD 32770)
+(RPAQQ \DL.READPID 32771)
+(RPAQQ \DL.BOOTBUTTON 32772)
+(CONSTANTS (CDRCODING 1) (\SMALLP 1) (\FIXP 2) (\FLOATP 3) (\LITATOM 4) (\LISTP 5) (\ARRAYP 6) (
+\STRINGP 7) (\STACKP 8) (\CHARACTERP 9) (\VMEMPAGEP 10) (\STREAM 11) (\TT.TYPEMASK 2047) (\TT.NOREF 
+32768) (\TT.SYMBOLP 16384) (\TT.FIXP 8192) (\TT.NUMBERP 4096) (\TT.ATOM 2048) (\PMblockSize 32) (
+\STATSsize 8) (\NumPMTpages 8) (\EmptyPMTEntry 65535) (\FirstVmemBlock 2) (\MAXVMPAGE 131069) (
+\MAXVMSEGMENT 255) (\IFPValidKey 5603) (\FirstMDSPage 32766) (\MaxMDSPage 524285) (
+\DefaultSecondMDSPage 65532) (\MDSIncrement 512) (\PagesPerMDSUnit 2) (\FirstArraySegment 46) (
+\FirstArrayPage 11776) (\DefaultSecondArrayPage 32768) (\StackMask 57344) (\FxtnBlock 49152) (
+\GuardBlock 57344) (\BFBlock 32768) (\FreeStackBlock 40960) (\NotStackBlock 0) (\MinExtraStackWords 32
+) (ERASECHARCODE 0) (\HT1CNT 1024) (\HTSTKBIT 512) (\HTCNTMASK 64512) (\HTMAINSIZE 65536) (\HTCOLLSIZE
+ 1048576) (\HTENDFREE 1) (\HTFREEPTR 0) (\AtomHI 0) (\CHARHI 7) (\AtomHTpages 256) (\LastAtomPage 255)
+ (\MaxAtomFrLst 65535) (\SmallPosHi 14) (\SmallNegHi 15) (\NumSmallPages 512) (\PNAME.HI 8) (\ATOM.HI 
+44) (\DEF.HI 10) (\VAL.HI 12) (\PLIST.HI 2) (\NumPageMapPages 256) (\MDSTTsize 1024) (\UFNTableSize 2)
+ (\DTDSize 18) (\EndTypeNumber 2047) (\NumLPTPages 16) (\GuardStackAddr 61440) (\LastStackAddr 65534) 
+(\STACKHI 1) (\HTMAINnpages 256) (\D1BCPLspace 0) (\D0BCPLspace 0) (\CurrentFXP 0) (\ResetFXP 1) (
+\SubovFXP 2) (\KbdFXP 3) (\HardReturnFXP 4) (\GCFXP 5) (\FAULTFXP 6) (\MiscFXP 14) (\TeleRaidFXP 24) (
+DCB.EM 272) (DISPINTERRUPT.EM 273) (CURSORBITMAP.EM 281) (KBDAD0.EM 65052) (KBDAD1.EM 65053) (
+KBDAD2.EM 65054) (KBDAD3.EM 65055) (UTILIN.EM 65048) (CURSORX.EM 278) (CURSORY.EM 279) (MOUSEX.EM 276)
+ (MOUSEY.EM 277) (\LispKeyMask 8192) (\BcplKeyMask 4352) (\MAIKO 3) (\DOLPHIN 4) (\DORADO 5) (
+\DANDELION 6) (\DAYBREAK 8) (\VP.DISPLAY 4608) (\NP.DISPLAY 202) (\NP.WIDEDOVEDISPLAY 243) (
+\WIDEDOVEDISPLAYWIDTH 1152) (\RP.AFTERDISPLAY 206) (\RP.AFTERDOVEDISPLAY 243) (\RP.DISPLAY 0) (
+\RP.TEMPDISPLAY 2561) (\RP.MISCLOCKED 2804) (\RP.STACK 768) (\VP.STACK 256) (\RP.MAP 256) (\NP.MAP 256
+) (\RP.IOPAGE 512) (\RP.DOVEIOCBPAGE 543) (\RP.DOVEIORGN 544) (\VP.DOVEIORGN 64) (\DOVEIORGNSIZE 64) (
+\VP.IOPAGE 255) (\VP.IFPAGE 5120) (\VP.FPTOVP 512) (\NP.FPTOVP 4096) (\RP.FPTOVP 1024) (
+\RP.STARTBUFFERS 640) (\VP.TYPETABLE 6144) (\NP.TYPETABLE 1024) (\RP.TYPETABLE 5120) (\VP.GCTABLE 5632
+) (\NP.GCTABLE 256) (\RP.GCTABLE 6144) (\VP.GCOVERFLOW 5888) (\NP.GCOVERFLOW 1) (\RP.GCOVERFLOW 6400) 
+(\FP.IFPAGE 2) (\VP.IOCBS 1) (\VP.PRIMARYMAP 5122) (\VP.SECONDARYMAP 1280) (\VP.LPT 5232) (
+\VP.INITSCRATCH 8) (\VP.RPT 128) (\VP.BUFFERS 218) (\DL.PROCESSORBUSY 32768) (\DL.SETTOD 32769) (
+\DL.READTOD 32770) (\DL.READPID 32771) (\DL.BOOTBUTTON 32772))
+(RPAQQ \MPERRORS ((\MP.OBSOLETEVMEM 1) (\MP.INVALIDVMEM 2 "Vmem inconsistent at startup") (
+\MP.IOCBPAGE 3 "No place for IOCB page at startup") (\MP.MOB 4 "Map out of bounds") (\MP.INVALIDADDR 5
+) (\MP.INVALIDVP 6) (\MP.CHAIN.UNAVAIL 7 "Unavailable page on real page table chain") (\MP.SELECTLOOP 
+8 "Loop in \SELECTREALPAGE") (\MP.NEWPAGE 9 "Attempt to allocate already existing page") (
+\MP.NEWMAPPAGE 10 "\DONEWPAGE failed to allocate new map page") (\MP.BADLOCKED 11 
+"Locked page occupies a file page needed to lock another") (\MP.CLOCK0 12 
+"Arg to CLOCK0 not an integer box") (\MP.RESIDENT 13 "Fault on resident page") (\MP.STACKFAULT 14 
+"Fault on stack") (\MP.VMEMTOOLONG 16 "Attempt to extend Vmem File beyond fixed limit (8mb)") (
+\MP.WRITING.LOCKED.PAGE 17 "Writing a locked page with UPDATEKEY = T") (\MP.UNINTERRUPTABLE 18 
+"Error in uninterruptable system code") (\MP.STACKFULL 19) (\MP.MDSFULL 20) (\MP.UNKNOWN.UFN 21) (
+\MP.ATOMSFULL 22) (\MP.PNAMESFULL 23) (\MP.USECOUNTOVERFLOW 24) (\MP.MDSFULLWARNING 25) (
+\MP.BADMDSFREELIST 26) (\MP.BADARRAYBLOCK 27) (\MP.BADDELETEBLOCK 28) (\MP.BADARRAYRECLAIM 29) (
+\MP.BIGREFCNTMISSING 30 "PTR refcnt previously overflowed, but not found in table.") (
+\MP.BIGREFCNTALREADYPRESENT 31 "PTR already in overflow table") (\MP.DELREF0 32) (\MP.PROCERROR 33) (
+\MP.PROCNOFRAME 34 "Failed to build frame for PROCESS use") (\MP.32MBINUSE 35) (\MP.TOPUNWOUND 36 
+"Unexpected (RETTO T)") (\MP.STACKRELEASED 37) (\MP.FLUSHLOCKED 38) (\MP.MAPNOTLOCKED 39) (
+\MP.UNLOCKINGMAP 40) (\MP.SWAPDISKERROR 41 "Hard Disk Error in swapper") (\MP.BADRUNTABLE 42 
 "Malformed run table for vmem file")))
-(RPAQQ \\MP.OBSOLETEVMEM 1)
-(RPAQ \\MP.INVALIDVMEM 2 "Vmem inconsistent at startup")
-(RPAQ \\MP.IOCBPAGE 3 "No place for IOCB page at startup")
-(RPAQ \\MP.MOB 4 "Map out of bounds")
-(RPAQQ \\MP.INVALIDADDR 5)
-(RPAQQ \\MP.INVALIDVP 6)
-(RPAQ \\MP.CHAIN.UNAVAIL 7 "Unavailable page on real page table chain")
-(RPAQ \\MP.SELECTLOOP 8 "Loop in \\SELECTREALPAGE")
-(RPAQ \\MP.NEWPAGE 9 "Attempt to allocate already existing page")
-(RPAQ \\MP.NEWMAPPAGE 10 "\\DONEWPAGE failed to allocate new map page")
-(RPAQ \\MP.BADLOCKED 11 "Locked page occupies a file page needed to lock another")
-(RPAQ \\MP.CLOCK0 12 "Arg to CLOCK0 not an integer box")
-(RPAQ \\MP.RESIDENT 13 "Fault on resident page")
-(RPAQ \\MP.STACKFAULT 14 "Fault on stack")
-(RPAQ \\MP.VMEMTOOLONG 16 "Attempt to extend Vmem File beyond fixed limit (8mb)")
-(RPAQ \\MP.WRITING.LOCKED.PAGE 17 "Writing a locked page with UPDATEKEY = T")
-(RPAQ \\MP.UNINTERRUPTABLE 18 "Error in uninterruptable system code")
-(RPAQQ \\MP.STACKFULL 19)
-(RPAQQ \\MP.MDSFULL 20)
-(RPAQQ \\MP.UNKNOWN.UFN 21)
-(RPAQQ \\MP.ATOMSFULL 22)
-(RPAQQ \\MP.PNAMESFULL 23)
-(RPAQQ \\MP.USECOUNTOVERFLOW 24)
-(RPAQQ \\MP.MDSFULLWARNING 25)
-(RPAQQ \\MP.BADMDSFREELIST 26)
-(RPAQQ \\MP.BADARRAYBLOCK 27)
-(RPAQQ \\MP.BADDELETEBLOCK 28)
-(RPAQQ \\MP.BADARRAYRECLAIM 29)
-(RPAQ \\MP.BIGREFCNTMISSING 30 "PTR refcnt previously overflowed, but not found in table.")
-(RPAQ \\MP.BIGREFCNTALREADYPRESENT 31 "PTR already in overflow table")
-(RPAQQ \\MP.DELREF0 32)
-(RPAQQ \\MP.PROCERROR 33)
-(RPAQ \\MP.PROCNOFRAME 34 "Failed to build frame for PROCESS use")
-(RPAQQ \\MP.32MBINUSE 35)
-(RPAQ \\MP.TOPUNWOUND 36 "Unexpected (RETTO T)")
-(RPAQQ \\MP.STACKRELEASED 37)
-(RPAQQ \\MP.FLUSHLOCKED 38)
-(RPAQQ \\MP.MAPNOTLOCKED 39)
-(RPAQQ \\MP.UNLOCKINGMAP 40)
-(RPAQ \\MP.SWAPDISKERROR 41 "Hard Disk Error in swapper")
-(RPAQ \\MP.BADRUNTABLE 42 "Malformed run table for vmem file")
-(CONSTANTS (\\MP.OBSOLETEVMEM 1) (\\MP.INVALIDVMEM 2 "Vmem inconsistent at startup") (\\MP.IOCBPAGE 3 
-"No place for IOCB page at startup") (\\MP.MOB 4 "Map out of bounds") (\\MP.INVALIDADDR 5) (
-\\MP.INVALIDVP 6) (\\MP.CHAIN.UNAVAIL 7 "Unavailable page on real page table chain") (\\MP.SELECTLOOP 
-8 "Loop in \\SELECTREALPAGE") (\\MP.NEWPAGE 9 "Attempt to allocate already existing page") (
-\\MP.NEWMAPPAGE 10 "\\DONEWPAGE failed to allocate new map page") (\\MP.BADLOCKED 11 
-"Locked page occupies a file page needed to lock another") (\\MP.CLOCK0 12 
-"Arg to CLOCK0 not an integer box") (\\MP.RESIDENT 13 "Fault on resident page") (\\MP.STACKFAULT 14 
-"Fault on stack") (\\MP.VMEMTOOLONG 16 "Attempt to extend Vmem File beyond fixed limit (8mb)") (
-\\MP.WRITING.LOCKED.PAGE 17 "Writing a locked page with UPDATEKEY = T") (\\MP.UNINTERRUPTABLE 18 
-"Error in uninterruptable system code") (\\MP.STACKFULL 19) (\\MP.MDSFULL 20) (\\MP.UNKNOWN.UFN 21) (
-\\MP.ATOMSFULL 22) (\\MP.PNAMESFULL 23) (\\MP.USECOUNTOVERFLOW 24) (\\MP.MDSFULLWARNING 25) (
-\\MP.BADMDSFREELIST 26) (\\MP.BADARRAYBLOCK 27) (\\MP.BADDELETEBLOCK 28) (\\MP.BADARRAYRECLAIM 29) (
-\\MP.BIGREFCNTMISSING 30 "PTR refcnt previously overflowed, but not found in table.") (
-\\MP.BIGREFCNTALREADYPRESENT 31 "PTR already in overflow table") (\\MP.DELREF0 32) (\\MP.PROCERROR 33)
- (\\MP.PROCNOFRAME 34 "Failed to build frame for PROCESS use") (\\MP.32MBINUSE 35) (\\MP.TOPUNWOUND 36
- "Unexpected (RETTO T)") (\\MP.STACKRELEASED 37) (\\MP.FLUSHLOCKED 38) (\\MP.MAPNOTLOCKED 39) (
-\\MP.UNLOCKINGMAP 40) (\\MP.SWAPDISKERROR 41 "Hard Disk Error in swapper") (\\MP.BADRUNTABLE 42 
+(RPAQQ \MP.OBSOLETEVMEM 1)
+(RPAQ \MP.INVALIDVMEM 2 "Vmem inconsistent at startup")
+(RPAQ \MP.IOCBPAGE 3 "No place for IOCB page at startup")
+(RPAQ \MP.MOB 4 "Map out of bounds")
+(RPAQQ \MP.INVALIDADDR 5)
+(RPAQQ \MP.INVALIDVP 6)
+(RPAQ \MP.CHAIN.UNAVAIL 7 "Unavailable page on real page table chain")
+(RPAQ \MP.SELECTLOOP 8 "Loop in \SELECTREALPAGE")
+(RPAQ \MP.NEWPAGE 9 "Attempt to allocate already existing page")
+(RPAQ \MP.NEWMAPPAGE 10 "\DONEWPAGE failed to allocate new map page")
+(RPAQ \MP.BADLOCKED 11 "Locked page occupies a file page needed to lock another")
+(RPAQ \MP.CLOCK0 12 "Arg to CLOCK0 not an integer box")
+(RPAQ \MP.RESIDENT 13 "Fault on resident page")
+(RPAQ \MP.STACKFAULT 14 "Fault on stack")
+(RPAQ \MP.VMEMTOOLONG 16 "Attempt to extend Vmem File beyond fixed limit (8mb)")
+(RPAQ \MP.WRITING.LOCKED.PAGE 17 "Writing a locked page with UPDATEKEY = T")
+(RPAQ \MP.UNINTERRUPTABLE 18 "Error in uninterruptable system code")
+(RPAQQ \MP.STACKFULL 19)
+(RPAQQ \MP.MDSFULL 20)
+(RPAQQ \MP.UNKNOWN.UFN 21)
+(RPAQQ \MP.ATOMSFULL 22)
+(RPAQQ \MP.PNAMESFULL 23)
+(RPAQQ \MP.USECOUNTOVERFLOW 24)
+(RPAQQ \MP.MDSFULLWARNING 25)
+(RPAQQ \MP.BADMDSFREELIST 26)
+(RPAQQ \MP.BADARRAYBLOCK 27)
+(RPAQQ \MP.BADDELETEBLOCK 28)
+(RPAQQ \MP.BADARRAYRECLAIM 29)
+(RPAQ \MP.BIGREFCNTMISSING 30 "PTR refcnt previously overflowed, but not found in table.")
+(RPAQ \MP.BIGREFCNTALREADYPRESENT 31 "PTR already in overflow table")
+(RPAQQ \MP.DELREF0 32)
+(RPAQQ \MP.PROCERROR 33)
+(RPAQ \MP.PROCNOFRAME 34 "Failed to build frame for PROCESS use")
+(RPAQQ \MP.32MBINUSE 35)
+(RPAQ \MP.TOPUNWOUND 36 "Unexpected (RETTO T)")
+(RPAQQ \MP.STACKRELEASED 37)
+(RPAQQ \MP.FLUSHLOCKED 38)
+(RPAQQ \MP.MAPNOTLOCKED 39)
+(RPAQQ \MP.UNLOCKINGMAP 40)
+(RPAQ \MP.SWAPDISKERROR 41 "Hard Disk Error in swapper")
+(RPAQ \MP.BADRUNTABLE 42 "Malformed run table for vmem file")
+(CONSTANTS (\MP.OBSOLETEVMEM 1) (\MP.INVALIDVMEM 2 "Vmem inconsistent at startup") (\MP.IOCBPAGE 3 
+"No place for IOCB page at startup") (\MP.MOB 4 "Map out of bounds") (\MP.INVALIDADDR 5) (
+\MP.INVALIDVP 6) (\MP.CHAIN.UNAVAIL 7 "Unavailable page on real page table chain") (\MP.SELECTLOOP 8 
+"Loop in \SELECTREALPAGE") (\MP.NEWPAGE 9 "Attempt to allocate already existing page") (\MP.NEWMAPPAGE
+ 10 "\DONEWPAGE failed to allocate new map page") (\MP.BADLOCKED 11 
+"Locked page occupies a file page needed to lock another") (\MP.CLOCK0 12 
+"Arg to CLOCK0 not an integer box") (\MP.RESIDENT 13 "Fault on resident page") (\MP.STACKFAULT 14 
+"Fault on stack") (\MP.VMEMTOOLONG 16 "Attempt to extend Vmem File beyond fixed limit (8mb)") (
+\MP.WRITING.LOCKED.PAGE 17 "Writing a locked page with UPDATEKEY = T") (\MP.UNINTERRUPTABLE 18 
+"Error in uninterruptable system code") (\MP.STACKFULL 19) (\MP.MDSFULL 20) (\MP.UNKNOWN.UFN 21) (
+\MP.ATOMSFULL 22) (\MP.PNAMESFULL 23) (\MP.USECOUNTOVERFLOW 24) (\MP.MDSFULLWARNING 25) (
+\MP.BADMDSFREELIST 26) (\MP.BADARRAYBLOCK 27) (\MP.BADDELETEBLOCK 28) (\MP.BADARRAYRECLAIM 29) (
+\MP.BIGREFCNTMISSING 30 "PTR refcnt previously overflowed, but not found in table.") (
+\MP.BIGREFCNTALREADYPRESENT 31 "PTR already in overflow table") (\MP.DELREF0 32) (\MP.PROCERROR 33) (
+\MP.PROCNOFRAME 34 "Failed to build frame for PROCESS use") (\MP.32MBINUSE 35) (\MP.TOPUNWOUND 36 
+"Unexpected (RETTO T)") (\MP.STACKRELEASED 37) (\MP.FLUSHLOCKED 38) (\MP.MAPNOTLOCKED 39) (
+\MP.UNLOCKINGMAP 40) (\MP.SWAPDISKERROR 41 "Hard Disk Error in swapper") (\MP.BADRUNTABLE 42 
 "Malformed run table for vmem file"))
-(GLOBALVARS \\ARRAYSPACE \\ARRAYSPACE2 \\ATOMSPACE |\\AtomHashTable| \\SMALLPOSPSPACE \\SMALLNEGSPACE 
-\\PNPSPACE \\OLDATOMSPACE \\DEFSPACE \\VALSPACE \\PLISTSPACE \\PAGEMAP |\\PageMapTBL| 
-|\\InterfacePage| \\IOPAGE |\\DoveIORegion| \\IOCBPAGE \\FPTOVP |\\MDSTypeTable| \\MISCSTATS 
-|\\UFNTable| |\\DTDSpaceBase| \\LISTPDTD \\LOCKEDPAGETABLE \\STACKSPACE \\HTMAIN \\HTOVERFLOW 
-\\HTBIGCOUNT \\HTCOLL \\DISPLAYREGION)
+(GLOBALVARS \ARRAYSPACE \ARRAYSPACE2 \ATOMSPACE \AtomHashTable \SMALLPOSPSPACE \SMALLNEGSPACE 
+\PNPSPACE \OLDATOMSPACE \DEFSPACE \VALSPACE \PLISTSPACE \PAGEMAP \PageMapTBL \InterfacePage \IOPAGE 
+\DoveIORegion \IOCBPAGE \FPTOVP \MDSTypeTable \MISCSTATS \UFNTable \DTDSpaceBase \LISTPDTD 
+\LOCKEDPAGETABLE \STACKSPACE \HTMAIN \HTOVERFLOW \HTBIGCOUNT \HTCOLL \DISPLAYREGION)
 (BLOCKRECORD MISCSTATS ((STARTTIME FIXP) (TOTALTIME FIXP) (SWAPWAITTIME FIXP) (PAGEFAULTS FIXP) (
 SWAPWRITES FIXP) (DISKIOTIME FIXP) (DISKOPS FIXP) (KEYBOARDWAITTIME FIXP) (GCTIME FIXP) (NETIOTIME 
 FIXP) (NETIOOPS FIXP) (SWAPTEMP0 FIXP) (SWAPTEMP1 FIXP) (RCLKSECOND FIXP) (SECONDSCLOCK FIXP) (
 MILLISECONDSCLOCK FIXP) (BASECLOCK FIXP) (RCLKTEMP0 FIXP) (SECONDSTMP FIXP) (MILLISECONDSTMP FIXP) (
 BASETMP FIXP) (EXCESSTIMETMP FIXP) (CLOCKTEMP0 FIXP) (DISKTEMP0 FIXP) (DISKTEMP1 FIXP) (TELERAIDTEMP1 
 FIXP) (TELERAIDTEMP2 FIXP) (TELERAIDTEMP3 FIXP) (LASTUSERACTION FIXP) (DLMOUSETIMER FIXP) (DLMOUSETEMP
- FIXP)) (CREATE (\\ALLOCBLOCK 31)))
-(BLOCKRECORD IFPAGE ((|CurrentFXP| WORD) (* \; 
-"First 7 items are FX values for user and 6 system contexts.") (|ResetFXP| WORD) (|SubovFXP| WORD) (
-|KbdFXP| WORD) (|HardReturnFXP| WORD) (GCFXP WORD) (FAULTFXP WORD) (|EndOfStack| WORD) (* \; 
-"Stack high-water mark: address of guard block at current end of stack") (|LVersion| WORD) (* \; 
-"Lisp version, followed by min versions of microcode and Bcpl compatible with this Lisp") (
-|MinRVersion| WORD) (|MinBVersion| WORD) (|RVersion| WORD) (* \; 
-"Bcpl fills in the actual microcode, Bcpl versions.") (|BVersion| WORD) (|MachineType| WORD) (
-|MiscFXP| WORD) (* \; "FX for MISC context") (|Key| WORD) (* \; "= IFPValidKey if vmem consistent.") (
-|SerialNumber| WORD) (* \; "Pup host number (Dorado/Dolphin)") (|EmulatorSpace| WORD) (* \; 
-"Hiloc of bcpl space (always zero now)") (|ScreenWidth| WORD) (|NxtPMAddr| WORD) (* \; 
-"Next page to be allocated in secondary page map table") (NIL WORD) (* \; 
-"WAS NActivePages, Length of vmem in use") (NIL WORD) (* \; 
-"WAS NDirtyPages, not used, but maintained as = NActivePages") (|filePnPMP0| WORD) (* \; 
-"Sysout page number of first page of secondary page map table (\\PAGEMAP), which is where the secondary map pages themselves live"
-) (|filePnPMT0| WORD) (* \; "Sysout page number of first page of primary page map table") (TELERAIDFXP
- WORD) (* \; "FX for TeleRaid server context") (NATIVE-START-MEM-PAGE WORD) (* \; 
-"Unix page where native code starts") (NATIVE-LENGTH-PAGE WORD) (* \; 
-"Unix page length of native code") (NATIVE-PAGE-OFFSET WORD) (* \; 
-"Lisp Disk Page offset  of native code") (|UserNameAddr| WORD) (* \; 
-"Addresses in bcpl space (seg 0) of global user name and password") (|UserPswdAddr| WORD) (|StackBase|
- WORD) (* \; "Stack address where user stack starts") (FAULTHI WORD) (* \; 
+ FIXP)) (CREATE (\ALLOCBLOCK 31)))
+(BLOCKRECORD IFPAGE ((CurrentFXP WORD) (* ; 
+"First 7 items are FX values for user and 6 system contexts.") (ResetFXP WORD) (SubovFXP WORD) (KbdFXP
+ WORD) (HardReturnFXP WORD) (GCFXP WORD) (FAULTFXP WORD) (EndOfStack WORD) (* ; 
+"Stack high-water mark: address of guard block at current end of stack") (LVersion WORD) (* ; 
+"Lisp version, followed by min versions of microcode and Bcpl compatible with this Lisp") (MinRVersion
+ WORD) (MinBVersion WORD) (RVersion WORD) (* ; "Bcpl fills in the actual microcode, Bcpl versions.") (
+BVersion WORD) (MachineType WORD) (MiscFXP WORD) (* ; "FX for MISC context") (Key WORD) (* ; 
+"= IFPValidKey if vmem consistent.") (SerialNumber WORD) (* ; "Pup host number (Dorado/Dolphin)") (
+EmulatorSpace WORD) (* ; "Hiloc of bcpl space (always zero now)") (ScreenWidth WORD) (NxtPMAddr WORD) 
+(* ; "Next page to be allocated in secondary page map table") (NIL WORD) (* ; 
+"WAS NActivePages, Length of vmem in use") (NIL WORD) (* ; 
+"WAS NDirtyPages, not used, but maintained as = NActivePages") (filePnPMP0 WORD) (* ; 
+"Sysout page number of first page of secondary page map table (\PAGEMAP), which is where the secondary map pages themselves live"
+) (filePnPMT0 WORD) (* ; "Sysout page number of first page of primary page map table") (TELERAIDFXP 
+WORD) (* ; "FX for TeleRaid server context") (NATIVE-START-MEM-PAGE WORD) (* ; 
+"Unix page where native code starts") (NATIVE-LENGTH-PAGE WORD) (* ; "Unix page length of native code"
+) (NATIVE-PAGE-OFFSET WORD) (* ; "Lisp Disk Page offset  of native code") (UserNameAddr WORD) (* ; 
+"Addresses in bcpl space (seg 0) of global user name and password") (UserPswdAddr WORD) (StackBase 
+WORD) (* ; "Stack address where user stack starts") (FAULTHI WORD) (* ; 
 "Microcode for page fault stores fault address here, then does context switch to FAULTFXP") (FAULTLO 
-WORD) (DEVCONFIG WORD) (* \; "IT'S FOR KB,DISP TYPE") (* \; 
-"Formerly REALPAGETABLE, back when it was always in Bcpl space.") (RPTSIZE WORD) (* \; 
-"Number of entries in Real Page Table") (RPOFFSET WORD) (* \; "RP-RPOFFSET => index in table") (
-MAXETHERBYTES WORD) (* \; "Number of bytes available in a pbi, not counting encapsulation (Dorado)") (
-EMBUFVP WORD) (* \; "VP of a one-page emulator buffer") (|NSHost0| WORD) (* \; 
+WORD) (DEVCONFIG WORD) (* ; "IT'S FOR KB,DISP TYPE") (* ; 
+"Formerly REALPAGETABLE, back when it was always in Bcpl space.") (RPTSIZE WORD) (* ; 
+"Number of entries in Real Page Table") (RPOFFSET WORD) (* ; "RP-RPOFFSET => index in table") (
+MAXETHERBYTES WORD) (* ; "Number of bytes available in a pbi, not counting encapsulation (Dorado)") (
+EMBUFVP WORD) (* ; "VP of a one-page emulator buffer") (NSHost0 WORD) (* ; 
 "Machine's 48-bit NS host number.  Lisp manages to compute this on all machines except Dolphin, where Bcpl fills it in."
-) (|NSHost1| WORD) (|NSHost2| WORD) (|MDSZone| WORD) (* \; 
-"Obsolete -- was used by Dolphin 10MB network code.") (|MDSZoneLength| WORD) (EMUBUFFERS WORD) (* \; 
-"Buffer space in segment 0 for swapping/disk activity") (EMUBUFLENGTH WORD) (* \; 
-"Number of words of said space") (* |;;| 
-"The following 2 are available if NEW_STOARGE is specified in C") (|ProcessSize| WORD) (* \; 
-"Process size for which can be use as LISP space") (|StorageFullState| WORD) (* \; 
-"Save last storage state") (ISFMAP WORD) (* |;;| 
-"The following 4 are for \\MISCAPPLY* -- note that they are not ref counted, so don't pass the only pointer to something this way!"
+) (NSHost1 WORD) (NSHost2 WORD) (MDSZone WORD) (* ; 
+"Obsolete -- was used by Dolphin 10MB network code.") (MDSZoneLength WORD) (EMUBUFFERS WORD) (* ; 
+"Buffer space in segment 0 for swapping/disk activity") (EMUBUFLENGTH WORD) (* ; 
+"Number of words of said space") (* ;; 
+"The following 2 are available if NEW_STOARGE is specified in C") (ProcessSize WORD) (* ; 
+"Process size for which can be use as LISP space") (StorageFullState WORD) (* ; 
+"Save last storage state") (ISFMAP WORD) (* ;; 
+"The following 4 are for \MISCAPPLY* -- note that they are not ref counted, so don't pass the only pointer to something this way!"
 ) (MISCSTACKFN FULLXPOINTER) (MISCSTACKARG1 FULLXPOINTER) (MISCSTACKARG2 FULLXPOINTER) (
-MISCSTACKRESULT FULLXPOINTER) (|NRealPages| WORD) (* \; "Number pages of real memory") (
-|LastLockedFilePage| WORD) (* \; 
-"Last page of vmem that is locked--booting has to load at least that far.") (|LastDominoFilePage| WORD
-) (* \; "Last sysout page reserved for Dandelion microcode") (|FPTOVPStart| WORD) (* \; 
-"Sysout page where FPTOVP starts") (FAKEMOUSEBITS WORD) (* \; 
-"Used to implement fake middle button on 2-button Dandelion.") (|DL24BitAddressable| WORD) (* \; 
-"non-zero if DLion capable of addressing 32MB virtual memory") (REALPAGETABLEPTR FULLXPOINTER) (* \; 
-"Address of real page table, set up by Bcpl (but not chained together)") (SYSDISK WORD) (* \; 
-"WAS DLLastVmemPage, DLion booting microcode puts length of vmem file here.") (|FullSpaceUsed| WORD) (
-* \; "Non-zero if vmem beyond initial 8MB has been allocated.") (FAKEKBDAD4 WORD) (FAKEKBDAD5 WORD) (*
- |;;| 
+MISCSTACKRESULT FULLXPOINTER) (NRealPages WORD) (* ; "Number pages of real memory") (
+LastLockedFilePage WORD) (* ; 
+"Last page of vmem that is locked--booting has to load at least that far.") (LastDominoFilePage WORD) 
+(* ; "Last sysout page reserved for Dandelion microcode") (FPTOVPStart WORD) (* ; 
+"Sysout page where FPTOVP starts") (FAKEMOUSEBITS WORD) (* ; 
+"Used to implement fake middle button on 2-button Dandelion.") (DL24BitAddressable WORD) (* ; 
+"non-zero if DLion capable of addressing 32MB virtual memory") (REALPAGETABLEPTR FULLXPOINTER) (* ; 
+"Address of real page table, set up by Bcpl (but not chained together)") (SYSDISK WORD) (* ; 
+"WAS DLLastVmemPage, DLion booting microcode puts length of vmem file here.") (FullSpaceUsed WORD) (* 
+; "Non-zero if vmem beyond initial 8MB has been allocated.") (FAKEKBDAD4 WORD) (FAKEKBDAD5 WORD) (* ;;
+ 
 "The following 9 items (6 words and 3 pointers) are 3 3-element vectors for the Dorado extended virtual memory code--indexed by 0,1,2 according to which of up to 3 virtual memory backing files you're working with."
-) (|XVmemFmapBase| WORD) (* \; 
+) (XVmemFmapBase WORD) (* ; 
 "Bcpl stores isf map pointer to each partition here.  First is redundant with ISFMAP field above.") (
-NIL WORD) (NIL WORD) (|XVmemFmapHighBase| WORD) (* \; 
+NIL WORD) (NIL WORD) (XVmemFmapHighBase WORD) (* ; 
 "Bcpl stores the highest vm page contained in this or earlier partition.") (NIL WORD) (NIL WORD) (
-|XVmemDiskBase| FULLXPOINTER) (* \; 
+XVmemDiskBase FULLXPOINTER) (* ; 
 "Lisp stores disk objects here (just a convenient non-faulting contiguous block of storage).") (NIL 
-FULLXPOINTER) (NIL FULLXPOINTER) (|DLLastVmemPage| FIXP) (* \; 
-"DLion booting microcode puts length of vmem file here.") (|NActivePages| FIXP) (* \; 
-"Length of vmem in use") (|NDirtyPages| FIXP) (* \; "not used, but maintained as = NActivePages")) (
-CREATE (\\ALLOCBLOCK 43)))
+FULLXPOINTER) (NIL FULLXPOINTER) (DLLastVmemPage FIXP) (* ; 
+"DLion booting microcode puts length of vmem file here.") (NActivePages FIXP) (* ; 
+"Length of vmem in use") (NDirtyPages FIXP) (* ; "not used, but maintained as = NActivePages")) (
+CREATE (\ALLOCBLOCK 43)))
 (BLOCKRECORD IOPAGE ((NIL 18 WORD) (DLMAINTPANEL WORD) (DLFLOPPYCMD WORD) (DLTTYPORTCMD WORD) (
 DLPROCESSORCMD WORD) (NEWMOUSESTATE WORD) (DLBEEPCMD WORD) (DLRS232CMISCCOMMAND WORD) (DLRS232CPUTFLAG
  WORD) (DLRS232CGETFLAG WORD) (NIL 6 WORD) (DLFLOPPY WORD) (DLTTYOUT WORD) (NIL 1 WORD) (DLTTYIN WORD)
@@ -596,148 +586,145 @@ DLLSEPIMAGECSB 32 WORD) (DLIOPHARDWARECONFIG WORD) (NIL 11 WORD) (DLRS232CPARAME
 DLRS232CPARAMETERCSBHI.11 WORD) (DLRS232CSETRS366STATUS.11 14 WORD) (NIL 60 WORD) (DLMAGTAPE 4 WORD) (
 DLETHERNET 12 WORD) (NIL 31 WORD) (DLDISPINTERRUPT WORD) (DLDISPCONTROL WORD) (DLDISPBORDER WORD) (
 DLCURSORX WORD) (DLCURSORY WORD) (DLCURSORBITMAP 16 WORD)) (ACCESSFNS IOPAGE ((DLCURSORBITMAPPTR (
-\\ADDBASE DATUM 240)) (DLCURSORYPTR (\\ADDBASE DATUM 239)) (DLCURSORXPTR (\\ADDBASE DATUM 238)) (
-DLDISPINTERRUPTPTR (\\ADDBASE DATUM 235)) (DLETHERNETPTR (\\ADDBASE DATUM 192)) (DLKBDAD5PTR (
-\\ADDBASE DATUM 67)) (DLKBDAD4PTR (\\ADDBASE DATUM 66)) (DLKBDAD3PTR (\\ADDBASE DATUM 65)) (
-DLKBDAD2PTR (\\ADDBASE DATUM 64)) (DLKBDAD1PTR (\\ADDBASE DATUM 63)) (DLKBDAD0PTR (\\ADDBASE DATUM 62)
-) (DLUTILINPTR (\\ADDBASE DATUM 61)) (DLMOUSEYPTR (\\ADDBASE DATUM 60)) (DLMOUSEXPTR (\\ADDBASE DATUM 
-59)) (DLTODLOPTR (\\ADDBASE DATUM 56)) (DLMAINTPANELPTR (\\ADDBASE DATUM 18)))) (CREATE (\\ALLOCBLOCK 
-128)))
-(PUTPROPS EMADDRESS MACRO (ARGS ((LAMBDA (ADDR) (COND ((EQ |\\D1BCPLspace| |\\D0BCPLspace|) (LIST (
-LIST (QUOTE OPCODES) (QUOTE GCONST) 0 0 (LRSH ADDR 8) (LOGAND ADDR 255)))) (T (BQUOTE (\\VAG2 (|fetch|
- |EmulatorSpace| |of| |\\InterfacePage|) \, ADDR))))) (EVAL (CAR ARGS)))))
-(PUTPROPS EMGETBASE MACRO ((OFFSET) (\\GETBASE (EMADDRESS OFFSET) 0)))
-(PUTPROPS EMPUTBASE MACRO ((OFFSET VAL) (\\PUTBASE (EMADDRESS OFFSET) 0 VAL)))
-(PUTPROPS EMULATORSEGMENT MACRO (NIL (|fetch| |EmulatorSpace| |of| |\\InterfacePage|)))
-(PUTPROPS EMPOINTER MACRO (X (COND ((NEQ |\\D1BCPLspace| |\\D0BCPLspace|) (LIST (QUOTE \\VAG2) (QUOTE 
-(|fetch| (IFPAGE |EmulatorSpace|) |of| |\\InterfacePage|)) (CAR X))) ((ZEROP (CAR X)) NIL) (T (LIST (
-QUOTE \\VAG2) |\\D0BCPLspace| (CAR X))))))
-(PUTPROPS EMADDRESSP MACRO (X (LIST (QUOTE EQ) (LIST (QUOTE \\HILOC) (CAR X)) (COND ((EQ 
-|\\D1BCPLspace| |\\D0BCPLspace|) |\\D0BCPLspace|) (T (QUOTE (|fetch| (IFPAGE |EmulatorSpace|) |of| 
-|\\InterfacePage|)))))))
+\ADDBASE DATUM 240)) (DLCURSORYPTR (\ADDBASE DATUM 239)) (DLCURSORXPTR (\ADDBASE DATUM 238)) (
+DLDISPINTERRUPTPTR (\ADDBASE DATUM 235)) (DLETHERNETPTR (\ADDBASE DATUM 192)) (DLKBDAD5PTR (\ADDBASE 
+DATUM 67)) (DLKBDAD4PTR (\ADDBASE DATUM 66)) (DLKBDAD3PTR (\ADDBASE DATUM 65)) (DLKBDAD2PTR (\ADDBASE 
+DATUM 64)) (DLKBDAD1PTR (\ADDBASE DATUM 63)) (DLKBDAD0PTR (\ADDBASE DATUM 62)) (DLUTILINPTR (\ADDBASE 
+DATUM 61)) (DLMOUSEYPTR (\ADDBASE DATUM 60)) (DLMOUSEXPTR (\ADDBASE DATUM 59)) (DLTODLOPTR (\ADDBASE 
+DATUM 56)) (DLMAINTPANELPTR (\ADDBASE DATUM 18)))) (CREATE (\ALLOCBLOCK 128)))
+(PUTPROPS EMADDRESS MACRO (ARGS ((LAMBDA (ADDR) (COND ((EQ \D1BCPLspace \D0BCPLspace) (LIST (LIST (
+QUOTE OPCODES) (QUOTE GCONST) 0 0 (LRSH ADDR 8) (LOGAND ADDR 255)))) (T (BQUOTE (\VAG2 (fetch 
+EmulatorSpace of \InterfacePage) %, ADDR))))) (EVAL (CAR ARGS)))))
+(PUTPROPS EMGETBASE MACRO ((OFFSET) (\GETBASE (EMADDRESS OFFSET) 0)))
+(PUTPROPS EMPUTBASE MACRO ((OFFSET VAL) (\PUTBASE (EMADDRESS OFFSET) 0 VAL)))
+(PUTPROPS EMULATORSEGMENT MACRO (NIL (fetch EmulatorSpace of \InterfacePage)))
+(PUTPROPS EMPOINTER MACRO (X (COND ((NEQ \D1BCPLspace \D0BCPLspace) (LIST (QUOTE \VAG2) (QUOTE (fetch 
+(IFPAGE EmulatorSpace) of \InterfacePage)) (CAR X))) ((ZEROP (CAR X)) NIL) (T (LIST (QUOTE \VAG2) 
+\D0BCPLspace (CAR X))))))
+(PUTPROPS EMADDRESSP MACRO (X (LIST (QUOTE EQ) (LIST (QUOTE \HILOC) (CAR X)) (COND ((EQ \D1BCPLspace 
+\D0BCPLspace) \D0BCPLspace) (T (QUOTE (fetch (IFPAGE EmulatorSpace) of \InterfacePage)))))))
 (PUTPROP (QUOTE LLPARAMS) (QUOTE IMPORTDATE) (IDATE " 7-Feb-2021 11:52:02"))
 
 (DATATYPE COMPILED-CLOSURE (FNHEADER ENVIRONMENT))
-(RPAQQ \\COMPILED-CLOSURE 13)
-(CONSTANTS \\COMPILED-CLOSURE)
-(PUTPROPS \\EXTENDED.EQP MACRO (OPENLAMBDA (X Y) (COND ((EQ (NTYPX X) (NTYPX Y)) (SELECTC (NTYPX X) (
-\\STACKP (EQ (|fetch| (STACKP EDFXP) |of| X) (|fetch| (STACKP EDFXP) |of| Y))) (\\COMPILED-CLOSURE (
-EQDEFP X Y)) NIL)))))
+(RPAQQ \COMPILED-CLOSURE 13)
+(CONSTANTS \COMPILED-CLOSURE)
+(PUTPROPS \EXTENDED.EQP MACRO (OPENLAMBDA (X Y) (COND ((EQ (NTYPX X) (NTYPX Y)) (SELECTC (NTYPX X) (
+\STACKP (EQ (fetch (STACKP EDFXP) of X) (fetch (STACKP EDFXP) of Y))) (\COMPILED-CLOSURE (EQDEFP X Y))
+ NIL)))))
 (PUTPROPS DPUTCODE MACRO ((FN CA SIZE) (SELECTQ (SYSTEMTYPE) (D (DEFC FN CA)) (/PUTPROP FN (QUOTE 
 DCODE) CA))))
 (PUTPROPS MCODEP MACRO ((X) (OR (ARRAYP X) (AND (LITATOM X) (ARRAYP (SELECTQ (SYSTEMTYPE) (D (GETD X))
  (GETPROP X (QUOTE DCODE))))))))
-(PUTPROPS CODELT MACRO ((CA N) (\\BYTELT CA N)))
+(PUTPROPS CODELT MACRO ((CA N) (\BYTELT CA N)))
 (PUTPROPS CODELT2 MACRO (OPENLAMBDA (DEF LC) (LOGOR (LLSH (CODELT DEF LC) BITSPERBYTE) (CODELT DEF (
 ADD1 LC)))))
 (PUTPROPS CODESETA2 MACRO (OPENLAMBDA (DEF LC VALUE) (CODESETA DEF LC (LRSH VALUE BITSPERBYTE)) (
 CODESETA DEF (ADD1 LC) (IMOD VALUE (CONSTANT (LLSH 1 BITSPERBYTE))))))
-(PUTPROPS CODESETA MACRO ((CA N NV) (\\BYTESETA CA N NV)))
+(PUTPROPS CODESETA MACRO ((CA N NV) (\BYTESETA CA N NV)))
 (PUTPROPS BYTESPERNAMEENTRY MACRO (NIL (UNFOLD (CONSTANT (WORDSPERNAMEENTRY)) BYTESPERWORD)))
 (PUTPROPS BYTESPERNTOFFSETENTRY MACRO (NIL (UNFOLD (WORDSPERNAMEENTRY) BYTESPERWORD)))
-(PUTPROPS GETNAMEENTRY MACRO (OPENLAMBDA (DEF LC) (LET ((NUMBER 0)) (* |;;| 
+(PUTPROPS GETNAMEENTRY MACRO (OPENLAMBDA (DEF LC) (LET ((NUMBER 0)) (* ;; 
 "Must ALWAYS be called with DEF really being either a FNHEADER or a nametable pseudo-fnheader.  Never use addbase to offset from it.  This is because CODEBASEELT checks the BYTESWAPPED flag in the fnheader...."
 ) (FOR I FROM 0 TO (CONSTANT (SUB1 (BYTESPERNAMEENTRY))) DO (SETQ NUMBER (LOGOR (LLSH NUMBER 
 BITSPERBYTE) (CODEBASELT DEF (IPLUS LC I))))) NUMBER)))
 (PUTPROPS GETNTFLAGS MACRO (OPENLAMBDA (DEF LC) (CODEBASELT DEF LC)))
 (PUTPROPS GETNTOFFSET MACRO (OPENLAMBDA (DEF LC) (NTSLOT-OFFSET (GETNTOFFSETENTRY DEF LC))))
-(PUTPROPS GETNTOFFSETENTRY MACRO (OPENLAMBDA (DEF LC) (LET ((NUMBER 0)) (|for| I |from| 0 |to| (
-CONSTANT (SUB1 (BYTESPERNTOFFSETENTRY))) |do| (SETQ NUMBER (LOGOR (LLSH NUMBER BITSPERBYTE) (
-CODEBASELT DEF (IPLUS LC I))))) NUMBER)))
+(PUTPROPS GETNTOFFSETENTRY MACRO (OPENLAMBDA (DEF LC) (LET ((NUMBER 0)) (for I from 0 to (CONSTANT (
+SUB1 (BYTESPERNTOFFSETENTRY))) do (SETQ NUMBER (LOGOR (LLSH NUMBER BITSPERBYTE) (CODEBASELT DEF (IPLUS
+ LC I))))) NUMBER)))
 (PUTPROPS GETNTTAG MACRO (OPENLAMBDA (DEF LC) (CODEBASELT DEF (ADD1 LC))))
 (PUTPROPS SETNAMEENTRY MACRO (OPENLAMBDA (DEF LC VALUE) (FOR I FROM (CONSTANT (SUB1 (BYTESPERNAMEENTRY
 ))) TO 0 BY -1 DO (CODEBASESETA DEF (IPLUS LC I) (LOGAND VALUE (CONSTANT (SUB1 (LLSH 1 BITSPERBYTE))))
 ) (SETQ VALUE (LRSH VALUE BITSPERBYTE)))))
 (PUTPROPS WORDSPERNTOFFSETENTRY MACRO (NIL (WORDSPERNAMEENTRY)))
 (PUTPROPS NTSLOT-OFFSET MACRO ((X) (LOGAND 255 X)))
-(DEFMACRO NEW-SYMBOL-CODE (NEW-SYMBOL-FORM OLD-SYMBOL-FORM) (* |;;| 
+(DEFMACRO NEW-SYMBOL-CODE (NEW-SYMBOL-FORM OLD-SYMBOL-FORM) (* ;; 
 "Use one form or another, depending on whether we're compiling for new 3-byte atoms or old 2-byte atom numbers."
-) (COND ((FMEMB :3-BYTE COMPILER::*TARGET-ARCHITECTURE*) (* \; "NEW ATOMS") (BQUOTE (\\\, 
-NEW-SYMBOL-FORM))) (T (BQUOTE (\\\, OLD-SYMBOL-FORM)))))
-(DEFOPTIMIZER BIG-VMEM-CODE (NEW-SYMBOL-FORM OLD-SYMBOL-FORM &ENVIRONMENT ENV) (* |;;| 
+) (COND ((FMEMB :3-BYTE COMPILER::*TARGET-ARCHITECTURE*) (* ; "NEW ATOMS") (BQUOTE (\, NEW-SYMBOL-FORM
+))) (T (BQUOTE (\, OLD-SYMBOL-FORM)))))
+(DEFOPTIMIZER BIG-VMEM-CODE (NEW-SYMBOL-FORM OLD-SYMBOL-FORM &ENVIRONMENT ENV) (* ;; 
 "Allow for differences between 4-byte pointers and 3-byte pointers..") (COND ((FMEMB :4-BYTE (
-COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\\\, NEW-SYMBOL-FORM))) (T (BQUOTE (\\\, 
-OLD-SYMBOL-FORM)))))
-(DEFOPTIMIZER SETSTKNAMEENTRY (CODEARRAY OFFSET VAL &ENVIRONMENT ENV) (* |;;| 
+COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\, NEW-SYMBOL-FORM))) (T (BQUOTE (\, OLD-SYMBOL-FORM)
+))))
+(DEFOPTIMIZER SETSTKNAMEENTRY (CODEARRAY OFFSET VAL &ENVIRONMENT ENV) (* ;; 
 "Set the name entry for a name-table entry.") (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE
- ENV)) (BQUOTE (LET ((BASE (|fetch| (ARRAYP BASE) |of| (\\\, CODEARRAY))) (VALUE (\\\, VAL))) (COND ((
-FIXP VALUE) (* \; "A 20-byte atom #.  Make it an atom.") (\\PUTBASEPTR BASE (\\\, OFFSET) (\\VAG2 
-|\\AtomHI| VALUE))) (T (* \; "A 3-byte atom.  Just use it.") (\\PUTBASEPTR BASE (\\\, OFFSET) VALUE)))
-))) (T (BQUOTE (LET ((BASE (|fetch| (ARRAYP BASE) |of| (\\\, CODEARRAY)))) (\\PUTBASE BASE (\\\, 
-OFFSET) (\\\, VAL)))))))
-(DEFOPTIMIZER SETSTKNTOFFSETENTRY (BASE OFFSET VAL &ENVIRONMENT ENV) (* |;;| 
+ ENV)) (BQUOTE (LET ((BASE (fetch (ARRAYP BASE) of (\, CODEARRAY))) (VALUE (\, VAL))) (COND ((FIXP 
+VALUE) (* ; "A 20-byte atom #.  Make it an atom.") (\PUTBASEPTR BASE (\, OFFSET) (\VAG2 \AtomHI VALUE)
+)) (T (* ; "A 3-byte atom.  Just use it.") (\PUTBASEPTR BASE (\, OFFSET) VALUE)))))) (T (BQUOTE (LET (
+(BASE (fetch (ARRAYP BASE) of (\, CODEARRAY)))) (\PUTBASE BASE (\, OFFSET) (\, VAL)))))))
+(DEFOPTIMIZER SETSTKNTOFFSETENTRY (BASE OFFSET VAL &ENVIRONMENT ENV) (* ;; 
 "Set the offset entry for a name-table entry.") (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE
- ENV)) (BQUOTE (\\PUTBASEFIXP (\\\, BASE) (\\\, OFFSET) (\\\, VAL)))) (T (BQUOTE (\\PUTBASE (\\\, BASE
-) (\\\, OFFSET) (\\\, VAL))))))
-(DEFOPTIMIZER GETSTKNAMEENTRY (BASE OFFSET &ENVIRONMENT ENV) (* |;;| 
+ ENV)) (BQUOTE (\PUTBASEFIXP (\, BASE) (\, OFFSET) (\, VAL)))) (T (BQUOTE (\PUTBASE (\, BASE) (\, 
+OFFSET) (\, VAL))))))
+(DEFOPTIMIZER GETSTKNAMEENTRY (BASE OFFSET &ENVIRONMENT ENV) (* ;; 
 "Get a name entry out of a name table.  BASE is the start of the name table; OFFSET is in words, not bytes or name entries."
-) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\\GETBASEPTR (\\\, BASE) (
-\\\, OFFSET)))) (T (BQUOTE (\\GETBASE (\\\, BASE) (\\\, OFFSET))))))
+) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\GETBASEPTR (\, BASE) (\, 
+OFFSET)))) (T (BQUOTE (\GETBASE (\, BASE) (\, OFFSET))))))
 (DEFOPTIMIZER GETSTKNTOFFSETENTRY (BASE OFFSET &ENVIRONMENT ENV) (COND ((FMEMB :3-BYTE (
-COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\\GETBASEFIXP (\\\, BASE) (\\\, OFFSET)))) (T (BQUOTE
- (\\GETBASE (\\\, BASE) (\\\, OFFSET))))))
-(DEFOPTIMIZER WORDSPERNAMEENTRY (&ENVIRONMENT ENV) (* |;;| 
-"Number of words in a name-table \"Name\" entry--the space for the symbol.  1 for old symbol systems, 2 for 3-byte-atom systesm."
+COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\GETBASEFIXP (\, BASE) (\, OFFSET)))) (T (BQUOTE (
+\GETBASE (\, BASE) (\, OFFSET))))))
+(DEFOPTIMIZER WORDSPERNAMEENTRY (&ENVIRONMENT ENV) (* ;; 
+"Number of words in a name-table %"Name%" entry--the space for the symbol.  1 for old symbol systems, 2 for 3-byte-atom systesm."
 ) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (PROGN 2))) ((AND 
 CROSSCOMPILING (FMEMB :3-BYTE-INIT (COMPILER::ENV-TARGET-ARCHITECTURE ENV))) (BQUOTE (PROGN 2))) (T (
 BQUOTE (PROGN 1)))))
-(DEFOPTIMIZER SETSTKNTOFFSET (BASE OFFSET TYPE VAL &ENVIRONMENT ENV) (* |;;| 
+(DEFOPTIMIZER SETSTKNTOFFSET (BASE OFFSET TYPE VAL &ENVIRONMENT ENV) (* ;; 
 "Set the offset entry for a name-table entry, from the symbol to fill in plus the variable-type marker value SHIFTED LEFT 14 BITS ALREADY."
-) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (PROGN (\\FIXCODENUM (\\\, 
-BASE) (IDIFFERENCE (\\\, OFFSET) BYTESPERWORD) (\\\, TYPE)) (\\FIXCODENUM (\\\, BASE) (\\\, OFFSET) (
-\\\, VAL))))) (T (BQUOTE (\\FIXCODENUM (\\\, BASE) (\\\, OFFSET) (IPLUS (\\\, TYPE) (\\\, VAL)))))))
-(DEFOPTIMIZER SETSTKNAME-RAW (BASE OFFSET VAL &ENVIRONMENT ENV) (* |;;| 
+) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (PROGN (\FIXCODENUM (\, BASE)
+ (IDIFFERENCE (\, OFFSET) BYTESPERWORD) (\, TYPE)) (\FIXCODENUM (\, BASE) (\, OFFSET) (\, VAL))))) (T 
+(BQUOTE (\FIXCODENUM (\, BASE) (\, OFFSET) (IPLUS (\, TYPE) (\, VAL)))))))
+(DEFOPTIMIZER SETSTKNAME-RAW (BASE OFFSET VAL &ENVIRONMENT ENV) (* ;; 
 "Set the name entry for a name-table entry. This version works with raw storage, as opposed to SETSTKNAMEENTRY, which works on an ARRAYP."
-) (* |;;| "If this optimizer changes, change SETSTKNAMEENTRY as well.") (COND ((FMEMB :3-BYTE (
-COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (LET ((VALUE (\\\, VAL))) (COND ((FIXP VALUE) (* \; 
-"A 20-byte atom #.  Make it an atom.") (\\PUTBASEPTR (\\\, BASE) (\\\, OFFSET) (\\VAG2 |\\AtomHI| 
-VALUE))) (T (* \; "A 3-byte atom.  Just use it.") (\\PUTBASEPTR (\\\, BASE) (\\\, OFFSET) VALUE)))))) 
-(T (BQUOTE (\\PUTBASE (\\\, BASE) (\\\, OFFSET) (\\\, VAL))))))
-(DEFOPTIMIZER SETSTKNTOFFSET-RAW (BASE OFFSET TYPE VAL &ENVIRONMENT ENV) (* |;;| 
+) (* ;; "If this optimizer changes, change SETSTKNAMEENTRY as well.") (COND ((FMEMB :3-BYTE (
+COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (LET ((VALUE (\, VAL))) (COND ((FIXP VALUE) (* ; 
+"A 20-byte atom #.  Make it an atom.") (\PUTBASEPTR (\, BASE) (\, OFFSET) (\VAG2 \AtomHI VALUE))) (T (
+* ; "A 3-byte atom.  Just use it.") (\PUTBASEPTR (\, BASE) (\, OFFSET) VALUE)))))) (T (BQUOTE (
+\PUTBASE (\, BASE) (\, OFFSET) (\, VAL))))))
+(DEFOPTIMIZER SETSTKNTOFFSET-RAW (BASE OFFSET TYPE VAL &ENVIRONMENT ENV) (* ;; 
 "Set the offset entry for a name-table entry.  This version works on raw storage, vs SETSTKNAMEOFFSETENTRY, which is supposed to work on codearrays.  Any changes here should be made there, as well.  TYPE must already be shifted left by 14 bits."
-) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (PROGN (\\PUTBASE (\\\, BASE)
- (\\\, OFFSET) (\\\, TYPE)) (\\PUTBASE (\\\, BASE) (IPLUS (\\\, OFFSET) 1) (\\\, VAL))))) (T (BQUOTE (
-\\PUTBASE (\\\, BASE) (\\\, OFFSET) (IPLUS (\\\, TYPE) (\\\, VAL)))))))
-(DEFOPTIMIZER NEW-SYMBOL-CODE (NEW-SYMBOL-FORM OLD-SYMBOL-FORM &ENVIRONMENT ENV) (* |;;| 
+) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (PROGN (\PUTBASE (\, BASE) (
+\, OFFSET) (\, TYPE)) (\PUTBASE (\, BASE) (IPLUS (\, OFFSET) 1) (\, VAL))))) (T (BQUOTE (\PUTBASE (\, 
+BASE) (\, OFFSET) (IPLUS (\, TYPE) (\, VAL)))))))
+(DEFOPTIMIZER NEW-SYMBOL-CODE (NEW-SYMBOL-FORM OLD-SYMBOL-FORM &ENVIRONMENT ENV) (* ;; 
 "Allow for differences between 3-byte atoms and 2-byte atoms.") (COND ((FMEMB :3-BYTE (
-COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\\\, NEW-SYMBOL-FORM))) (T (BQUOTE (\\\, 
-OLD-SYMBOL-FORM)))))
+COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (\, NEW-SYMBOL-FORM))) (T (BQUOTE (\, OLD-SYMBOL-FORM)
+))))
 (DEFOPTIMIZER MAKE-NTENTRY (TYPE OFFSET &ENVIRONMENT ENV) (COND ((FMEMB :3-BYTE (
-COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (IPLUS (CONSTANT (LLSH (\\\, TYPE) 16)) (\\\, OFFSET))
-)) (T (BQUOTE (IPLUS (CONSTANT (\\\, TYPE)) (\\\, OFFSET))))))
-(DEFOPTIMIZER NULL-NTENTRY (VALUE &ENVIRONMENT ENV) (* |;;| 
+COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (IPLUS (CONSTANT (LLSH (\, TYPE) 16)) (\, OFFSET)))) (
+T (BQUOTE (IPLUS (CONSTANT (\, TYPE)) (\, OFFSET))))))
+(DEFOPTIMIZER NULL-NTENTRY (VALUE &ENVIRONMENT ENV) (* ;; 
 "Predicate:  Is  VALUE a null entry in a name table?  I.e., does it result from fetching the entry at the end that`s all zeros?  For 2-byte atoms, that's the same as being zero.  For 3-byte atoms, it's the same as being NIL."
-) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (NULL (\\\, VALUE)))) (T (
-BQUOTE (EQ (\\\, VALUE) 0)))))
-(DEFOPTIMIZER NTSLOT-VARTYPE (X &ENVIRONMENT ENV) (* |;;| 
+) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (NULL (\, VALUE)))) (T (
+BQUOTE (EQ (\, VALUE) 0)))))
+(DEFOPTIMIZER NTSLOT-VARTYPE (X &ENVIRONMENT ENV) (* ;; 
 "Given the contents of a name-table Offset entry, return the variable-type bits at the top of the entry.  THE RESULT IS RETURNED SHEFTED LEFT 14 BITS, THE USUAL REPRESENTATION."
-) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (LOGAND 49153 (LRSH (\\\, X) 
-16)))) (T (BQUOTE (LOGAND (\\\, X) 49152)))))
+) (COND ((FMEMB :3-BYTE (COMPILER::ENV-TARGET-ARCHITECTURE ENV)) (BQUOTE (LOGAND 49153 (LRSH (\, X) 16
+)))) (T (BQUOTE (LOGAND (\, X) 49152)))))
 (ACCESSFNS CODEARRAY ((STKMIN (CODELT2 DATUM 0) (CODESETA2 DATUM 0 NEWVALUE)) (NA (SIGNED (CODELT2 
 DATUM 2) BITSPERWORD) (CODESETA2 DATUM 2 (UNSIGNED NEWVALUE BITSPERWORD))) (PV (SIGNED (CODELT2 DATUM 
 4) BITSPERWORD) (CODESETA2 DATUM 4 (UNSIGNED NEWVALUE BITSPERWORD))) (STARTPC (CODELT2 DATUM 6) (
 CODESETA2 DATUM 6 NEWVALUE)) (ARGTYPE (LOGAND (LRSH (CODELT DATUM 8) 4) 3) (CODESETA DATUM 8 (LOGOR (
-LOGAND (CODELT DATUM 8) 207) (LLSH (LOGAND NEWVALUE 3) 4)))) (FRAMENAME (\\VAG2 (LOGAND (CODELT2 DATUM
- 8) 4095) (CODELT2 DATUM 10)) (\\FIXCODEPTR DATUM 11 (EVQ NEWVALUE))) (NTSIZE (CODELT2 DATUM 12) (
+LOGAND (CODELT DATUM 8) 207) (LLSH (LOGAND NEWVALUE 3) 4)))) (FRAMENAME (\VAG2 (LOGAND (CODELT2 DATUM 
+8) 4095) (CODELT2 DATUM 10)) (\FIXCODEPTR DATUM 11 (EVQ NEWVALUE))) (NTSIZE (CODELT2 DATUM 12) (
 CODESETA2 DATUM 12 NEWVALUE)) (NLOCALS (CODELT DATUM 14) (CODESETA DATUM 14 NEWVALUE)) (FVAROFFSET (
-CODELT DATUM 15) (CODESETA DATUM 15 NEWVALUE))) (ACCESSFNS CODEARRAY ((LSTARP (ILESSP (|fetch| (
-CODEARRAY NA) |of| DATUM) 0)) (OVERHEADWORDS (PROGN 8)) (ALIGNED (IPLUS (|fetch| (CODEARRAY NTSIZE) 
-|of| DATUM) (|fetch| (CODEARRAY OVERHEADWORDS) |of| T))) (FIXED NIL (|replace| (CODEARRAY STKMIN) |of|
- DATUM |with| (\\STKMIN DATUM))) (FRAMENAME# (PROGN 8)))))
+CODELT DATUM 15) (CODESETA DATUM 15 NEWVALUE))) (ACCESSFNS CODEARRAY ((LSTARP (ILESSP (fetch (
+CODEARRAY NA) of DATUM) 0)) (OVERHEADWORDS (PROGN 8)) (ALIGNED (IPLUS (fetch (CODEARRAY NTSIZE) of 
+DATUM) (fetch (CODEARRAY OVERHEADWORDS) of T))) (FIXED NIL (replace (CODEARRAY STKMIN) of DATUM with (
+\STKMIN DATUM))) (FRAMENAME# (PROGN 8)))))
 (RECORD OPCODE (OP# OPCODENAME OPNARGS OPPRINT LEVADJ UFNFN UNIMPL))
-(GLOBALVARS \\OPCODES)
+(GLOBALVARS \OPCODES)
 (RPAQQ PVARCODE 32768)
 (RPAQQ FVARCODE 49152)
 (RPAQQ IVARCODE 0)
 (RPAQQ VARCODEMASK 49152)
 (CONSTANTS PVARCODE FVARCODE IVARCODE VARCODEMASK)
-(RPAQQ \\NT.IVARCODE 0)
-(RPAQQ \\NT.PVARCODE 2)
-(RPAQQ \\NT.FVARCODE 3)
-(CONSTANTS \\NT.IVARCODE \\NT.PVARCODE \\NT.FVARCODE)
+(RPAQQ \NT.IVARCODE 0)
+(RPAQQ \NT.PVARCODE 2)
+(RPAQQ \NT.FVARCODE 3)
+(CONSTANTS \NT.IVARCODE \NT.PVARCODE \NT.FVARCODE)
 (PUTPROP (QUOTE LLCODE) (QUOTE IMPORTDATE) (IDATE "19-Jan-1993 10:45:33"))
 
-(RPAQQ \\ERRORMESSAGELIST ("SYSTEM ERROR" " " "STACK OVERFLOW" "ILLEGAL RETURN" "ARG NOT LIST" 
+(RPAQQ \ERRORMESSAGELIST ("SYSTEM ERROR" " " "STACK OVERFLOW" "ILLEGAL RETURN" "ARG NOT LIST" 
 "HARD DISK ERROR" "ATTEMPT TO SET NIL OR T" "ATTEMPT TO RPLAC NIL" "UNDEFINED OR ILLEGAL GO" 
 "FILE WON'T OPEN" "NON-NUMERIC ARG" "ATOM TOO LONG" "ATOM HASH TABLE FULL" "FILE NOT OPEN" 
 "ARG NOT LITATOM" "! too many files open" "END OF FILE" "ERROR" "BREAK" "ILLEGAL STACK ARG" 
@@ -749,640 +736,629 @@ CODEARRAY NA) |of| DATUM) 0)) (OVERHEADWORDS (PROGN 8)) (ALIGNED (IPLUS (|fetch|
 "ILLEGAL TERMINAL TABLE" "! swapblock too big for buffer" "PROTECTION VIOLATION" "BAD FILE NAME" 
 "USER BREAK" "UNBOUND ATOM" "UNDEFINED CAR OF FORM" "UNDEFINED FUNCTION" "CONTROL-E" 
 "FLOATING UNDERFLOW" "FLOATING OVERFLOW" "OVERFLOW" "ARG NOT HARRAY" "TOO MANY ARGUMENTS"))
-(DEFOPTIMIZER LISPERROR (MESSAGE ARG) (BQUOTE (\\LISPERROR (\\\, ARG) (\\\, (CL:IF (CL:STRINGP MESSAGE
-) (FOR X IN \\ERRORMESSAGELIST AS I FROM 0 WHEN (CL:EQUAL X MESSAGE) DO (RETURN I) FINALLY (RETURN (
-HELP "Unknown error message" (LIST MESSAGE ARG)))) MESSAGE)))))
+(DEFOPTIMIZER LISPERROR (MESSAGE ARG) (BQUOTE (\LISPERROR (\, ARG) (\, (CL:IF (CL:STRINGP MESSAGE) (
+FOR X IN \ERRORMESSAGELIST AS I FROM 0 WHEN (CL:EQUAL X MESSAGE) DO (RETURN I) FINALLY (RETURN (HELP 
+"Unknown error message" (LIST MESSAGE ARG)))) MESSAGE)))))
 (PUTPROP (QUOTE AERROR) (QUOTE IMPORTDATE) (IDATE "16-May-1990 11:58:35"))
 
-(RECORD BASEBYTESTREAM STREAM (SUBRECORD STREAM) (ACCESSFNS ((BIASOFFST (|fetch| (STREAM FW6) |of| 
-DATUM) (|replace| (STREAM FW6) |of| DATUM |with| NEWVALUE)) (BBSNCHARS (|fetch| (STREAM FW7) |of| 
-DATUM) (|replace| (STREAM FW7) |of| DATUM |with| NEWVALUE)) (WRITEXTENSIONFN (|fetch| (STREAM F1) |of|
- DATUM) (|replace| (STREAM F1) |of| DATUM |with| NEWVALUE)))))
-(PUTPROPS \\INSTREAMARG MACRO ((STRM NOERRORFLG) (\\GETSTREAM STRM (QUOTE INPUT) NOERRORFLG)))
-(PUTPROPS \\OUTSTREAMARG MACRO ((STRM NOERRORFLG) (\\GETSTREAM STRM (QUOTE OUTPUT) NOERRORFLG)))
-(PUTPROPS \\STREAMARG MACRO (OPENLAMBDA (STRM NOERRORFLG) (COND (NOERRORFLG (\\GETSTREAM STRM NIL T)) 
-(T (\\DTEST STRM (QUOTE STREAM))))))
+(RECORD BASEBYTESTREAM STREAM (SUBRECORD STREAM) (ACCESSFNS ((BIASOFFST (fetch (STREAM FW6) of DATUM) 
+(replace (STREAM FW6) of DATUM with NEWVALUE)) (BBSNCHARS (fetch (STREAM FW7) of DATUM) (replace (
+STREAM FW7) of DATUM with NEWVALUE)) (WRITEXTENSIONFN (fetch (STREAM F1) of DATUM) (replace (STREAM F1
+) of DATUM with NEWVALUE)))))
+(PUTPROPS \INSTREAMARG MACRO ((STRM NOERRORFLG) (\GETSTREAM STRM (QUOTE INPUT) NOERRORFLG)))
+(PUTPROPS \OUTSTREAMARG MACRO ((STRM NOERRORFLG) (\GETSTREAM STRM (QUOTE OUTPUT) NOERRORFLG)))
+(PUTPROPS \STREAMARG MACRO (OPENLAMBDA (STRM NOERRORFLG) (COND (NOERRORFLG (\GETSTREAM STRM NIL T)) (T
+ (\DTEST STRM (QUOTE STREAM))))))
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE AOFD) (QUOTE IMPORTDATE) (IDATE "13-Aug-2021 23:55:35"))
+=======
 (PUTPROP (QUOTE AOFD) (QUOTE IMPORTDATE) (IDATE "13-Jun-2021 11:35:32"))
+>>>>>>> Stashed changes
 
-(PUTPROPS .SPACECHECK. MACRO ((STRM N) (AND \\THISFILELINELENGTH (IGREATERP (IPLUS N (|fetch| 
-CHARPOSITION |of| STRM)) \\THISFILELINELENGTH) (FRESHLINE STRM))))
-(PUTPROPS \\CHECKRADIX MACRO (LAMBDA (R) (COND ((OR (NOT (SMALLP R)) (ILESSP R 1) (IGREATERP R 36)) (
-\\INVALID.RADIX R)) (T R))))
+(PUTPROPS .SPACECHECK. MACRO ((STRM N) (AND \THISFILELINELENGTH (IGREATERP (IPLUS N (fetch 
+CHARPOSITION of STRM)) \THISFILELINELENGTH) (FRESHLINE STRM))))
+(PUTPROPS \CHECKRADIX MACRO (LAMBDA (R) (COND ((OR (NOT (SMALLP R)) (ILESSP R 1) (IGREATERP R 36)) (
+\INVALID.RADIX R)) (T R))))
 (PUTPROP (QUOTE APRINT) (QUOTE IMPORTDATE) (IDATE " 9-Jun-2021 22:50:15"))
 
-(GLOBALVARS \\BCPLDISPLAY)
-(ACCESSFNS LINEBUFFER ((LPARCOUNT (|fetch| FW6 |of| DATUM) (|replace| FW6 |of| DATUM |with| NEWVALUE))
- (LBRKCOUNT (|fetch| FW7 |of| DATUM) (|replace| FW7 |of| DATUM |with| NEWVALUE)) (LINEBUFSTATE (
-|fetch| F5 |of| DATUM) (|replace| F5 |of| DATUM |with| NEWVALUE)) (* \; "F4 is free.  EJS, 7/8/85") (
-KEYBOARDSTREAM (|fetch| F2 |of| DATUM) (|replace| F2 |of| DATUM |with| NEWVALUE)) (PEEKEDCHAR (|fetch|
- F3 |of| DATUM) (|replace| F3 |of| DATUM |with| NEWVALUE)) (* \; "Character read by PEEKC") (LBFLAGS (
-|fetch| FW9 |of| DATUM) (|replace| FW9 |of| DATUM |with| NEWVALUE)) (* |;;| 
+(GLOBALVARS \BCPLDISPLAY)
+(ACCESSFNS LINEBUFFER ((LPARCOUNT (fetch FW6 of DATUM) (replace FW6 of DATUM with NEWVALUE)) (
+LBRKCOUNT (fetch FW7 of DATUM) (replace FW7 of DATUM with NEWVALUE)) (LINEBUFSTATE (fetch F5 of DATUM)
+ (replace F5 of DATUM with NEWVALUE)) (* ; "F4 is free.  EJS, 7/8/85") (KEYBOARDSTREAM (fetch F2 of 
+DATUM) (replace F2 of DATUM with NEWVALUE)) (PEEKEDCHAR (fetch F3 of DATUM) (replace F3 of DATUM with 
+NEWVALUE)) (* ; "Character read by PEEKC") (LBFLAGS (fetch FW9 of DATUM) (replace FW9 of DATUM with 
+NEWVALUE)) (* ;; 
 "True if peeked char was echoed when peeked.  Could use this to determine whether to echo later or not, but that would be incompatible with Interlisp-10, so this field not used"
-)) (ACCESSFNS LINEBUFFER ((LBFLAGBASE (LOCF (|fetch| LBFLAGS |of| DATUM)))) (BLOCKRECORD LBFLAGBASE ((
+)) (ACCESSFNS LINEBUFFER ((LBFLAGBASE (LOCF (fetch LBFLAGS of DATUM)))) (BLOCKRECORD LBFLAGBASE ((
 PEEKEDECHOFLG FLAG) (INSTRINGP FLAG)))))
 (RPAQQ LINEBUFFERSTATES (FILLING.LBS READING.LBS RETYPING.LBS))
 (RPAQQ FILLING.LBS 0)
 (RPAQQ READING.LBS 1)
 (RPAQQ RETYPING.LBS 2)
 (CONSTANTS FILLING.LBS READING.LBS RETYPING.LBS)
-(PUTPROPS \\INTERMP MACRO ((OFD) (EQ OFD \\LINEBUF.OFD)))
-(PUTPROPS \\OUTTERMP MACRO ((OFD) (EQ OFD \\TERM.OFD)))
-(GLOBALVARS \\DEFAULTLINEBUF)
+(PUTPROPS \INTERMP MACRO ((OFD) (EQ OFD \LINEBUF.OFD)))
+(PUTPROPS \OUTTERMP MACRO ((OFD) (EQ OFD \TERM.OFD)))
+(GLOBALVARS \DEFAULTLINEBUF)
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE ATERM) (QUOTE IMPORTDATE) (IDATE "13-Aug-2021 23:55:35"))
+=======
 (PUTPROP (QUOTE ATERM) (QUOTE IMPORTDATE) (IDATE "23-Jun-2021 12:31:16"))
+>>>>>>> Stashed changes
 
-(DATATYPE HARRAYP ((NULLSLOTS WORD) (* \; "Number of NIL-NIL slots, which break chains") (LASTINDEX 
-WORD) (* \; 
-"Slot offset of last slot.  Used in probe computations computations.  Microcode support for \\ADDBASE4 would help"
-) (HARRAYPBASE POINTER) (RECLAIMABLE FLAG) (* \; "True if keys can go away when no other refs") (
-OVERFLOWACTION POINTER) (NUMSLOTS WORD) (* \; 
-"The maximum number of logical slots--returned by HARRAYSIZE") (NUMKEYS WORD) (* \; 
+(DATATYPE HARRAYP ((NULLSLOTS WORD) (* ; "Number of NIL-NIL slots, which break chains") (LASTINDEX 
+WORD) (* ; 
+"Slot offset of last slot.  Used in probe computations computations.  Microcode support for \ADDBASE4 would help"
+) (HARRAYPBASE POINTER) (RECLAIMABLE FLAG) (* ; "True if keys can go away when no other refs") (
+OVERFLOWACTION POINTER) (NUMSLOTS WORD) (* ; 
+"The maximum number of logical slots--returned by HARRAYSIZE") (NUMKEYS WORD) (* ; 
 "The number of distinct keys in the array") (HASHBITSFN POINTER) (EQUIVFN POINTER) (HASHUSERDATA 
 POINTER)))
-(PUTPROPS \\EQHASHINGBITS MACRO (OPENLAMBDA (X) (* \; 
-"Spread out objects whose low bits are in small arithmetic progression, esp atoms") (LOGXOR (\\HILOC X
-) (LOGXOR (LLSH (LOGAND (\\LOLOC X) 8191) 3) (LRSH (\\LOLOC X) 9)))))
-(PUTPROPS \\ADDBASE2 MACRO (OPENLAMBDA (BASE N) (\\ADDBASE (\\ADDBASE BASE N) N)))
-(PUTPROPS \\ADDBASE4 MACRO (OPENLAMBDA (BASE N) (\\ADDBASE2 (\\ADDBASE2 BASE N) N)))
-(PUTPROPS HUNKSIZEFROMNUMBER MACRO ((NTYPX) (FOLDLO (|fetch| DTDSIZE |of| (\\GETDTD NTYPX)) 
-WORDSPERCELL)))
-(PUTPROPS \\BYTELT DMACRO (OPENLAMBDA (A J) (\\GETBASEBYTE (|fetch| (ARRAYP BASE) |of| A) (IPLUS (
-|fetch| (ARRAYP OFFST) |of| A) J))))
-(PUTPROPS \\BYTESETA DMACRO (OPENLAMBDA (A J V) (\\PUTBASEBYTE (|fetch| (ARRAYP BASE) |of| A) (IPLUS (
-|fetch| (ARRAYP OFFST) |of| A) J) V)))
-(PUTPROPS \\WORDELT DMACRO (OPENLAMBDA (A J) (CHECK (AND (ARRAYP A) (EQ 0 (|fetch| (ARRAYP ORIG) |of| 
-A)) (EQ \\ST.POS16 (|fetch| (ARRAYP TYP) |of| A)))) (CHECK (IGREATERP (|fetch| (ARRAYP LENGTH) |of| A)
- J)) (\\GETBASE (|fetch| (ARRAYP BASE) |of| A) (IPLUS (|fetch| (ARRAYP OFFST) |of| A) J))))
+(PUTPROPS \EQHASHINGBITS MACRO (OPENLAMBDA (X) (* ; 
+"Spread out objects whose low bits are in small arithmetic progression, esp atoms") (LOGXOR (\HILOC X)
+ (LOGXOR (LLSH (LOGAND (\LOLOC X) 8191) 3) (LRSH (\LOLOC X) 9)))))
+(PUTPROPS \ADDBASE2 MACRO (OPENLAMBDA (BASE N) (\ADDBASE (\ADDBASE BASE N) N)))
+(PUTPROPS \ADDBASE4 MACRO (OPENLAMBDA (BASE N) (\ADDBASE2 (\ADDBASE2 BASE N) N)))
+(PUTPROPS HUNKSIZEFROMNUMBER MACRO ((NTYPX) (FOLDLO (fetch DTDSIZE of (\GETDTD NTYPX)) WORDSPERCELL)))
+(PUTPROPS \BYTELT DMACRO (OPENLAMBDA (A J) (\GETBASEBYTE (fetch (ARRAYP BASE) of A) (IPLUS (fetch (
+ARRAYP OFFST) of A) J))))
+(PUTPROPS \BYTESETA DMACRO (OPENLAMBDA (A J V) (\PUTBASEBYTE (fetch (ARRAYP BASE) of A) (IPLUS (fetch 
+(ARRAYP OFFST) of A) J) V)))
+(PUTPROPS \WORDELT DMACRO (OPENLAMBDA (A J) (CHECK (AND (ARRAYP A) (EQ 0 (fetch (ARRAYP ORIG) of A)) (
+EQ \ST.POS16 (fetch (ARRAYP TYP) of A)))) (CHECK (IGREATERP (fetch (ARRAYP LENGTH) of A) J)) (\GETBASE
+ (fetch (ARRAYP BASE) of A) (IPLUS (fetch (ARRAYP OFFST) of A) J))))
 (RPAQQ BLOCKGCTYPECONSTANTS ((CODEBLOCK.GCT 2) (PTRBLOCK.GCT 1) (UNBOXEDBLOCK.GCT 0)))
 (RPAQQ CODEBLOCK.GCT 2)
 (RPAQQ PTRBLOCK.GCT 1)
 (RPAQQ UNBOXEDBLOCK.GCT 0)
 (CONSTANTS (CODEBLOCK.GCT 2) (PTRBLOCK.GCT 1) (UNBOXEDBLOCK.GCT 0))
-(RPAQQ ARRAYCONSTANTS (|\\ArrayBlockHeaderCells| |\\ArrayBlockHeaderWords| |\\ArrayBlockTrailerCells| 
-|\\ArrayBlockTrailerWords| (|\\ArrayBlockOverheadCells| (IPLUS |\\ArrayBlockHeaderCells| 
-|\\ArrayBlockTrailerCells|)) (|\\ArrayBlockOverheadWords| (IPLUS |\\ArrayBlockHeaderWords| 
-|\\ArrayBlockTrailerWords|)) |\\ArrayBlockLinkingCells| (|\\MinArrayBlockSize| (IPLUS 
-|\\ArrayBlockOverheadCells| |\\ArrayBlockLinkingCells|)) (|\\MaxArrayBlockSize| 65535) (
-|\\MaxArrayNCells| (IDIFFERENCE |\\MaxArrayBlockSize| |\\ArrayBlockOverheadCells|)) |\\MaxArrayLen| (
-\\ABPASSWORDSHIFT 3) (|\\ArrayBlockPassword| (LRSH 43690 \\ABPASSWORDSHIFT)) (|\\FreeArrayFlagWord| (
-LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) (LLSH UNBOXEDBLOCK.GCT 1))) (
-|\\UsedArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) 1)) (
-|\\CodeArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) (LLSH CODEBLOCK.GCT 1) 1)
-)))
-(RPAQQ |\\ArrayBlockHeaderCells| 1)
-(RPAQQ |\\ArrayBlockHeaderWords| 2)
-(RPAQQ |\\ArrayBlockTrailerCells| 1)
-(RPAQQ |\\ArrayBlockTrailerWords| 2)
-(RPAQ |\\ArrayBlockOverheadCells| (IPLUS |\\ArrayBlockHeaderCells| |\\ArrayBlockTrailerCells|))
-(RPAQ |\\ArrayBlockOverheadWords| (IPLUS |\\ArrayBlockHeaderWords| |\\ArrayBlockTrailerWords|))
-(RPAQQ |\\ArrayBlockLinkingCells| 2)
-(RPAQ |\\MinArrayBlockSize| (IPLUS |\\ArrayBlockOverheadCells| |\\ArrayBlockLinkingCells|))
-(RPAQQ |\\MaxArrayBlockSize| 65535)
-(RPAQ |\\MaxArrayNCells| (IDIFFERENCE |\\MaxArrayBlockSize| |\\ArrayBlockOverheadCells|))
-(RPAQQ |\\MaxArrayLen| 65535)
-(RPAQQ \\ABPASSWORDSHIFT 3)
-(RPAQ |\\ArrayBlockPassword| (LRSH 43690 \\ABPASSWORDSHIFT))
-(RPAQ |\\FreeArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) (LLSH 
-UNBOXEDBLOCK.GCT 1)))
-(RPAQ |\\UsedArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) 1))
-(RPAQ |\\CodeArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) (LLSH CODEBLOCK.GCT
- 1) 1))
-(CONSTANTS |\\ArrayBlockHeaderCells| |\\ArrayBlockHeaderWords| |\\ArrayBlockTrailerCells| 
-|\\ArrayBlockTrailerWords| (|\\ArrayBlockOverheadCells| (IPLUS |\\ArrayBlockHeaderCells| 
-|\\ArrayBlockTrailerCells|)) (|\\ArrayBlockOverheadWords| (IPLUS |\\ArrayBlockHeaderWords| 
-|\\ArrayBlockTrailerWords|)) |\\ArrayBlockLinkingCells| (|\\MinArrayBlockSize| (IPLUS 
-|\\ArrayBlockOverheadCells| |\\ArrayBlockLinkingCells|)) (|\\MaxArrayBlockSize| 65535) (
-|\\MaxArrayNCells| (IDIFFERENCE |\\MaxArrayBlockSize| |\\ArrayBlockOverheadCells|)) |\\MaxArrayLen| (
-\\ABPASSWORDSHIFT 3) (|\\ArrayBlockPassword| (LRSH 43690 \\ABPASSWORDSHIFT)) (|\\FreeArrayFlagWord| (
-LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) (LLSH UNBOXEDBLOCK.GCT 1))) (
-|\\UsedArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) 1)) (
-|\\CodeArrayFlagWord| (LOGOR (LLSH |\\ArrayBlockPassword| \\ABPASSWORDSHIFT) (LLSH CODEBLOCK.GCT 1) 1)
-))
-(RPAQQ ARRAYTYPES ((\\ST.BYTE 0) (\\ST.POS16 1) (\\ST.INT32 2) (\\ST.CODE 4) (\\ST.PTR 6) (\\ST.FLOAT 
-7) (\\ST.BIT 8) (\\ST.PTR2 11)))
-(RPAQQ \\ST.BYTE 0)
-(RPAQQ \\ST.POS16 1)
-(RPAQQ \\ST.INT32 2)
-(RPAQQ \\ST.CODE 4)
-(RPAQQ \\ST.PTR 6)
-(RPAQQ \\ST.FLOAT 7)
-(RPAQQ \\ST.BIT 8)
-(RPAQQ \\ST.PTR2 11)
-(CONSTANTS (\\ST.BYTE 0) (\\ST.POS16 1) (\\ST.INT32 2) (\\ST.CODE 4) (\\ST.PTR 6) (\\ST.FLOAT 7) (
-\\ST.BIT 8) (\\ST.PTR2 11))
-(RPAQQ \\MAX.CELLSPERHUNK 64)
-(CONSTANTS \\MAX.CELLSPERHUNK)
-(RPAQQ \\IN.MAKEINIT NIL)
-(CONSTANTS (\\IN.MAKEINIT))
+(RPAQQ ARRAYCONSTANTS (\ArrayBlockHeaderCells \ArrayBlockHeaderWords \ArrayBlockTrailerCells 
+\ArrayBlockTrailerWords (\ArrayBlockOverheadCells (IPLUS \ArrayBlockHeaderCells 
+\ArrayBlockTrailerCells)) (\ArrayBlockOverheadWords (IPLUS \ArrayBlockHeaderWords 
+\ArrayBlockTrailerWords)) \ArrayBlockLinkingCells (\MinArrayBlockSize (IPLUS \ArrayBlockOverheadCells 
+\ArrayBlockLinkingCells)) (\MaxArrayBlockSize 65535) (\MaxArrayNCells (IDIFFERENCE \MaxArrayBlockSize 
+\ArrayBlockOverheadCells)) \MaxArrayLen (\ABPASSWORDSHIFT 3) (\ArrayBlockPassword (LRSH 43690 
+\ABPASSWORDSHIFT)) (\FreeArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) (LLSH 
+UNBOXEDBLOCK.GCT 1))) (\UsedArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) 1)) (
+\CodeArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) (LLSH CODEBLOCK.GCT 1) 1))))
+(RPAQQ \ArrayBlockHeaderCells 1)
+(RPAQQ \ArrayBlockHeaderWords 2)
+(RPAQQ \ArrayBlockTrailerCells 1)
+(RPAQQ \ArrayBlockTrailerWords 2)
+(RPAQ \ArrayBlockOverheadCells (IPLUS \ArrayBlockHeaderCells \ArrayBlockTrailerCells))
+(RPAQ \ArrayBlockOverheadWords (IPLUS \ArrayBlockHeaderWords \ArrayBlockTrailerWords))
+(RPAQQ \ArrayBlockLinkingCells 2)
+(RPAQ \MinArrayBlockSize (IPLUS \ArrayBlockOverheadCells \ArrayBlockLinkingCells))
+(RPAQQ \MaxArrayBlockSize 65535)
+(RPAQ \MaxArrayNCells (IDIFFERENCE \MaxArrayBlockSize \ArrayBlockOverheadCells))
+(RPAQQ \MaxArrayLen 65535)
+(RPAQQ \ABPASSWORDSHIFT 3)
+(RPAQ \ArrayBlockPassword (LRSH 43690 \ABPASSWORDSHIFT))
+(RPAQ \FreeArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) (LLSH UNBOXEDBLOCK.GCT 1))
+)
+(RPAQ \UsedArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) 1))
+(RPAQ \CodeArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) (LLSH CODEBLOCK.GCT 1) 1))
+(CONSTANTS \ArrayBlockHeaderCells \ArrayBlockHeaderWords \ArrayBlockTrailerCells 
+\ArrayBlockTrailerWords (\ArrayBlockOverheadCells (IPLUS \ArrayBlockHeaderCells 
+\ArrayBlockTrailerCells)) (\ArrayBlockOverheadWords (IPLUS \ArrayBlockHeaderWords 
+\ArrayBlockTrailerWords)) \ArrayBlockLinkingCells (\MinArrayBlockSize (IPLUS \ArrayBlockOverheadCells 
+\ArrayBlockLinkingCells)) (\MaxArrayBlockSize 65535) (\MaxArrayNCells (IDIFFERENCE \MaxArrayBlockSize 
+\ArrayBlockOverheadCells)) \MaxArrayLen (\ABPASSWORDSHIFT 3) (\ArrayBlockPassword (LRSH 43690 
+\ABPASSWORDSHIFT)) (\FreeArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) (LLSH 
+UNBOXEDBLOCK.GCT 1))) (\UsedArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) 1)) (
+\CodeArrayFlagWord (LOGOR (LLSH \ArrayBlockPassword \ABPASSWORDSHIFT) (LLSH CODEBLOCK.GCT 1) 1)))
+(RPAQQ ARRAYTYPES ((\ST.BYTE 0) (\ST.POS16 1) (\ST.INT32 2) (\ST.CODE 4) (\ST.PTR 6) (\ST.FLOAT 7) (
+\ST.BIT 8) (\ST.PTR2 11)))
+(RPAQQ \ST.BYTE 0)
+(RPAQQ \ST.POS16 1)
+(RPAQQ \ST.INT32 2)
+(RPAQQ \ST.CODE 4)
+(RPAQQ \ST.PTR 6)
+(RPAQQ \ST.FLOAT 7)
+(RPAQQ \ST.BIT 8)
+(RPAQQ \ST.PTR2 11)
+(CONSTANTS (\ST.BYTE 0) (\ST.POS16 1) (\ST.INT32 2) (\ST.CODE 4) (\ST.PTR 6) (\ST.FLOAT 7) (\ST.BIT 8)
+ (\ST.PTR2 11))
+(RPAQQ \MAX.CELLSPERHUNK 64)
+(CONSTANTS \MAX.CELLSPERHUNK)
+(RPAQQ \IN.MAKEINIT NIL)
+(CONSTANTS (\IN.MAKEINIT))
 (BLOCKRECORD SEQUENCEDESCRIPTOR ((ORIG BITS 1) (NIL BITS 1) (READONLY FLAG) (NIL BITS 1) (BASE POINTER
 ) (TYP BITS 4) (NIL BITS 4) (LENGTH BITS 24) (OFFST FIXP)))
-(DATATYPE ARRAYP ((* |;;| "Describes an INTERLISP ARRAYP, as opposed to a CL array.") (ORIG BITS 1) (*
- \; "Origin, 0 or 1") (NIL BITS 1) (READONLY FLAG) (* \; "probably no READONLY arrays now") (NIL BITS 
-1) (BASE POINTER) (TYP BITS 4) (* \; "Type of the contents") (NIL BITS 4) (LENGTH BITS 24) (* \; 
-"Array's length") (OFFST FIXP) (* \; "Offset from BASE where the data really starts.")) (* |;;| 
+(DATATYPE ARRAYP ((* ;; "Describes an INTERLISP ARRAYP, as opposed to a CL array.") (ORIG BITS 1) (* ;
+ "Origin, 0 or 1") (NIL BITS 1) (READONLY FLAG) (* ; "probably no READONLY arrays now") (NIL BITS 1) (
+BASE POINTER) (TYP BITS 4) (* ; "Type of the contents") (NIL BITS 4) (LENGTH BITS 24) (* ; 
+"Array's length") (OFFST FIXP) (* ; "Offset from BASE where the data really starts.")) (* ;; 
 "note that while ARRAYP is a DATATYPE, the allocation of it actually happens at MAKEINIT time under INITDATATYPE{NAMES}"
 ))
-(BLOCKRECORD ARRAYBLOCK ((PASSWORD BITS 13) (GCTYPE BITS 2) (* \; "Unboxed, Pointers, or Code") (INUSE
- FLAG) (ARLEN WORD) (FWD FULLXPOINTER) (* \; "Only when on free list") (BKWD FULLXPOINTER)) (
-BLOCKRECORD ARRAYBLOCK ((ABFLAGS WORD) (* \; "Used for header and trailer"))) (ACCESSFNS ARRAYBLOCK ((
-DAT (\\ADDBASE DATUM |\\ArrayBlockHeaderWords|)) (TRAILER (\\ADDBASE2 DATUM (IDIFFERENCE (|fetch| (
-ARRAYBLOCK ARLEN) |of| DATUM) |\\ArrayBlockTrailerCells|))))) (TYPE? (AND (EQ 0 (NTYPX DATUM)) (IGEQ (
-\\HILOC DATUM) |\\FirstArraySegment|))))
-(GLOBALVARS |\\NxtArrayPage| \\FREEBLOCKBUCKETS \\HUNKING?)
-(PUTPROPS HUNKSIZEFROMNUMBER MACRO ((NTYPX) (FOLDLO (|fetch| DTDSIZE |of| (\\GETDTD NTYPX)) 
-WORDSPERCELL)))
+(BLOCKRECORD ARRAYBLOCK ((PASSWORD BITS 13) (GCTYPE BITS 2) (* ; "Unboxed, Pointers, or Code") (INUSE 
+FLAG) (ARLEN WORD) (FWD FULLXPOINTER) (* ; "Only when on free list") (BKWD FULLXPOINTER)) (BLOCKRECORD
+ ARRAYBLOCK ((ABFLAGS WORD) (* ; "Used for header and trailer"))) (ACCESSFNS ARRAYBLOCK ((DAT (
+\ADDBASE DATUM \ArrayBlockHeaderWords)) (TRAILER (\ADDBASE2 DATUM (IDIFFERENCE (fetch (ARRAYBLOCK 
+ARLEN) of DATUM) \ArrayBlockTrailerCells))))) (TYPE? (AND (EQ 0 (NTYPX DATUM)) (IGEQ (\HILOC DATUM) 
+\FirstArraySegment))))
+(GLOBALVARS \NxtArrayPage \FREEBLOCKBUCKETS \HUNKING?)
+(PUTPROPS HUNKSIZEFROMNUMBER MACRO ((NTYPX) (FOLDLO (fetch DTDSIZE of (\GETDTD NTYPX)) WORDSPERCELL)))
 (PUTPROP (QUOTE LLARRAYELT) (QUOTE IMPORTDATE) (IDATE "15-Sep-1994 11:08:59"))
 
 (DEFOPTIMIZER PUTBASEPTRX (&REST ARGS) (CONS (QUOTE (OPENLAMBDA (DATUM OFFSET NEWVALUE) (
-UNINTERRUPTABLY (\\PUTBASE DATUM OFFSET (LOGOR (LOGAND 61440 (\\GETBASE DATUM OFFSET)) (LOGAND (
-\\HILOC NEWVALUE) 4095))) (\\PUTBASE DATUM (ADD1 OFFSET) (\\LOLOC NEWVALUE)) NEWVALUE))) ARGS))
-(RPAQQ \\SMALLP 1)
-(RPAQQ \\FIXP 2)
-(RPAQQ \\FLOATP 3)
-(RPAQQ \\LITATOM 4)
-(RPAQQ \\LISTP 5)
-(RPAQQ \\ARRAYP 6)
-(RPAQQ \\STACKP 8)
-(RPAQQ \\VMEMPAGEP 10)
-(RPAQQ \\STREAM 11)
-(RPAQQ \\NEW-ATOM 21)
-(CONSTANTS \\SMALLP \\FIXP \\FLOATP \\LITATOM \\LISTP \\ARRAYP \\STACKP \\VMEMPAGEP \\STREAM 
-\\NEW-ATOM)
-(RPAQQ \\BUILT-IN-SYSTEM-TYPES ((SMALLP) (FIXP 2) (FLOATP 2) (LITATOM) (LISTP 4 (0 2)) (ARRAYP 6 (0)) 
-(STRINGP 6 (0)) (STACKP 2 NIL \\RECLAIMSTACKP) (CHARACTER) (VMEMPAGEP 256 NIL RELEASINGVMEMPAGE) (
-STREAM) (BITMAP) (COMPILED-CLOSURE 4 (0 2)) (ONED-ARRAY 8 (0)) (TWOD-ARRAY 10 (0)) (GENERAL-ARRAY 10 (
-0 8)) (BIGNUM) (RATIO) (COMPLEX) (PATHNAME) (NEW-ATOM 10 (2 4 6)) (FILLER22) (FILLER23) (FILLER24) (
-FILLER25) (FILLER26) (FILLER27) (FILLER28) (FILLER29) (FILLER30)))
-(BLOCKRECORD DTD ((NIL BITS 2) (DTDOBSOLETE FLAG) (* \; 
+UNINTERRUPTABLY (\PUTBASE DATUM OFFSET (LOGOR (LOGAND 61440 (\GETBASE DATUM OFFSET)) (LOGAND (\HILOC 
+NEWVALUE) 4095))) (\PUTBASE DATUM (ADD1 OFFSET) (\LOLOC NEWVALUE)) NEWVALUE))) ARGS))
+(RPAQQ \SMALLP 1)
+(RPAQQ \FIXP 2)
+(RPAQQ \FLOATP 3)
+(RPAQQ \LITATOM 4)
+(RPAQQ \LISTP 5)
+(RPAQQ \ARRAYP 6)
+(RPAQQ \STACKP 8)
+(RPAQQ \VMEMPAGEP 10)
+(RPAQQ \STREAM 11)
+(RPAQQ \NEW-ATOM 21)
+(CONSTANTS \SMALLP \FIXP \FLOATP \LITATOM \LISTP \ARRAYP \STACKP \VMEMPAGEP \STREAM \NEW-ATOM)
+(RPAQQ \BUILT-IN-SYSTEM-TYPES ((SMALLP) (FIXP 2) (FLOATP 2) (LITATOM) (LISTP 4 (0 2)) (ARRAYP 6 (0)) (
+STRINGP 6 (0)) (STACKP 2 NIL \RECLAIMSTACKP) (CHARACTER) (VMEMPAGEP 256 NIL RELEASINGVMEMPAGE) (STREAM
+) (BITMAP) (COMPILED-CLOSURE 4 (0 2)) (ONED-ARRAY 8 (0)) (TWOD-ARRAY 10 (0)) (GENERAL-ARRAY 10 (0 8)) 
+(BIGNUM) (RATIO) (COMPLEX) (PATHNAME) (NEW-ATOM 10 (2 4 6)) (FILLER22) (FILLER23) (FILLER24) (FILLER25
+) (FILLER26) (FILLER27) (FILLER28) (FILLER29) (FILLER30)))
+(BLOCKRECORD DTD ((NIL BITS 2) (DTDOBSOLETE FLAG) (* ; 
 "True for type of a redeclared datatype--not allowed to allocate more of these") (DTDFINALIZABLE FLAG)
- (* \; "True if finalization exists for this type") (DTDNAME POINTER) (* \; "Type name -- a symbol ") 
-(DTDCNT0 WORD) (* \; "Incremental box count -- this plus DTDOLDCNT is the true box count") (DTDSIZE 
-WORD) (* \; "Length of datum in words") (DTDFREE FULLXPOINTER) (* \; 
-"Pointer to first object on free chain, or NIL.  Not used for LISTP") (DTDLOCKEDP FLAG) (* \; 
-"True if objects of this type must be locked down (not pagefault)") (DTDHUNKP FLAG) (* \; 
-"True if this type is used as an array hunk type") (DTDGCTYPE BITS 2) (* \; 
+ (* ; "True if finalization exists for this type") (DTDNAME POINTER) (* ; "Type name -- a symbol ") (
+DTDCNT0 WORD) (* ; "Incremental box count -- this plus DTDOLDCNT is the true box count") (DTDSIZE WORD
+) (* ; "Length of datum in words") (DTDFREE FULLXPOINTER) (* ; 
+"Pointer to first object on free chain, or NIL.  Not used for LISTP") (DTDLOCKEDP FLAG) (* ; 
+"True if objects of this type must be locked down (not pagefault)") (DTDHUNKP FLAG) (* ; 
+"True if this type is used as an array hunk type") (DTDGCTYPE BITS 2) (* ; 
 "For hunk datatypes, is analogous to arrayblock's GCTYPE") (DTDDESCRS POINTER) (DTDTYPESPECS POINTER) 
-(DTDPTRS POINTER) (* \; 
+(DTDPTRS POINTER) (* ; 
 "List of word offsets inside datum where reference-counted pointers are stored -- used by GC") (
-DTDOLDCNT FIXP) (* \; "'Box count' -- number of objects of this type ever allocated") (DTDNEXTPAGE 
-FIXP) (* \; 
-"Currently only for LISTP pages -- page number of next page on chain of non-full cons pages") (
-DTDTYPEENTRY WORD) (* |;;| 
+DTDOLDCNT FIXP) (* ; "'Box count' -- number of objects of this type ever allocated") (DTDNEXTPAGE FIXP
+) (* ; "Currently only for LISTP pages -- page number of next page on chain of non-full cons pages") (
+DTDTYPEENTRY WORD) (* ;; 
 "The word stored in the type table for objects of this type.  Hi bits have numberp tags, ref countable, etc."
-) (DTDSUPERTYPE WORD) (* \; "Type number of immediate supertype, or zero if none")) (ACCESSFNS DTD ((
-DTDCNTLOC (\\ADDBASE DATUM 4)) (DTDCNT (IPLUS (|fetch| DTDOLDCNT DATUM) (|fetch| DTDCNT0 DATUM)) (
-UNINTERRUPTABLY (|replace| DTDOLDCNT |of| DATUM |with| NEWVALUE) (|replace| DTDCNT0 |of| DATUM |with| 
-0))))))
-(PUTPROPS \\GETDTD MACRO ((|typeNum|) (ADDBASE |\\DTDSpaceBase| (ITIMES |typeNum| 18))))
-(DEFOPTIMIZER \\TYPEMASK.UFN (&REST X) (LET ((CE (CONSTANTEXPRESSIONP (CADR X)))) (|if| CE |then| (
-BQUOTE ((OPCODES TYPEMASK.N (\\\, (CAR CE))) (\\\, (CAR X)))) |else| (QUOTE IGNOREMACRO))))
-(RPAQQ \\GUARDSTORAGEFULL 128)
-(RPAQQ \\GUARD1STORAGEFULL 64)
-(CONSTANTS \\GUARDSTORAGEFULL \\GUARD1STORAGEFULL)
-(GLOBALVARS |\\NxtMDSPage| |\\LeastMDSPage| |\\SecondArrayPage| |\\SecondMDSPage| \\MDSFREELISTPAGE 
-|\\MaxSysTypeNum| |\\MaxTypeNumber| \\STORAGEFULL \\INTERRUPTSTATE \\PENDINGINTERRUPT)
+) (DTDSUPERTYPE WORD) (* ; "Type number of immediate supertype, or zero if none")) (ACCESSFNS DTD ((
+DTDCNTLOC (\ADDBASE DATUM 4)) (DTDCNT (IPLUS (fetch DTDOLDCNT DATUM) (fetch DTDCNT0 DATUM)) (
+UNINTERRUPTABLY (replace DTDOLDCNT of DATUM with NEWVALUE) (replace DTDCNT0 of DATUM with 0))))))
+(PUTPROPS \GETDTD MACRO ((typeNum) (ADDBASE \DTDSpaceBase (ITIMES typeNum 18))))
+(DEFOPTIMIZER \TYPEMASK.UFN (&REST X) (LET ((CE (CONSTANTEXPRESSIONP (CADR X)))) (if CE then (BQUOTE (
+(OPCODES TYPEMASK.N (\, (CAR CE))) (\, (CAR X)))) else (QUOTE IGNOREMACRO))))
+(RPAQQ \GUARDSTORAGEFULL 128)
+(RPAQQ \GUARD1STORAGEFULL 64)
+(CONSTANTS \GUARDSTORAGEFULL \GUARD1STORAGEFULL)
+(GLOBALVARS \NxtMDSPage \LeastMDSPage \SecondArrayPage \SecondMDSPage \MDSFREELISTPAGE \MaxSysTypeNum 
+\MaxTypeNumber \STORAGEFULL \INTERRUPTSTATE \PENDINGINTERRUPT)
 (PUTPROP (QUOTE LLDATATYPE) (QUOTE IMPORTDATE) (IDATE "28-Jun-1999 16:57:50"))
 
-(ACCESSFNS POINTER ((PAGE# (IPLUS (LLSH (\\HILOC DATUM) 8) (LRSH (\\LOLOC DATUM) 8))) (WORDINPAGE (
-LOGAND (\\LOLOC DATUM) 255)) (CELLINPAGE (LRSH (|fetch| WORDINPAGE |of| DATUM) 1)) (BYTEINPAGE (LLSH (
-|fetch| WORDINPAGE |of| DATUM) 1)) (SEGMENT# (\\HILOC DATUM)) (WORDINSEGMENT (\\LOLOC DATUM)) (
-CELLINSEGMENT (LRSH (|fetch| WORDINSEGMENT |of| DATUM) 1)) (WORD# (|fetch| WORDINPAGE |of| DATUM)) (
-DBLWORD# (|fetch| CELLINPAGE |of| DATUM)) (PAGEBASE (\\VAG2 (\\HILOC DATUM) (LOGAND (\\LOLOC DATUM) 
-65280)))) (CREATE (\\VAG2 (LRSH PAGE# 8) (LLSH (LOGAND PAGE# 255) 8))))
+(ACCESSFNS POINTER ((PAGE# (IPLUS (LLSH (\HILOC DATUM) 8) (LRSH (\LOLOC DATUM) 8))) (WORDINPAGE (
+LOGAND (\LOLOC DATUM) 255)) (CELLINPAGE (LRSH (fetch WORDINPAGE of DATUM) 1)) (BYTEINPAGE (LLSH (fetch
+ WORDINPAGE of DATUM) 1)) (SEGMENT# (\HILOC DATUM)) (WORDINSEGMENT (\LOLOC DATUM)) (CELLINSEGMENT (
+LRSH (fetch WORDINSEGMENT of DATUM) 1)) (WORD# (fetch WORDINPAGE of DATUM)) (DBLWORD# (fetch 
+CELLINPAGE of DATUM)) (PAGEBASE (\VAG2 (\HILOC DATUM) (LOGAND (\LOLOC DATUM) 65280)))) (CREATE (\VAG2 
+(LRSH PAGE# 8) (LLSH (LOGAND PAGE# 255) 8))))
 (ACCESSFNS WORD ((HIBYTE (LRSH DATUM 8)) (LOBYTE (LOGAND DATUM 255))) (CREATE (IPLUS (LLSH HIBYTE 8) 
 LOBYTE)))
-(PUTPROPS PTRGTP MACRO (OPENLAMBDA (X Y) (OR (IGREATERP (\\HILOC X) (\\HILOC Y)) (AND (EQ (\\HILOC X) 
-(\\HILOC Y)) (IGREATERP (\\LOLOC X) (\\LOLOC Y))))))
-(PUTPROPS .COERCE.TO.SMALLPOSP. DMACRO (OPENLAMBDA (X) (COND ((SMALLPOSP X) X) (T (\\ILLEGAL.ARG X))))
-)
+(PUTPROPS PTRGTP MACRO (OPENLAMBDA (X Y) (OR (IGREATERP (\HILOC X) (\HILOC Y)) (AND (EQ (\HILOC X) (
+\HILOC Y)) (IGREATERP (\LOLOC X) (\LOLOC Y))))))
+(PUTPROPS .COERCE.TO.SMALLPOSP. DMACRO (OPENLAMBDA (X) (COND ((SMALLPOSP X) X) (T (\ILLEGAL.ARG X)))))
 (PUTPROPS .COERCE.TO.BYTE. DMACRO (OPENLAMBDA (X) (COND ((AND (SMALLPOSP X) (ILESSP X (CONSTANT (LLSH 
-1 BITSPERBYTE)))) X) (T (\\ILLEGAL.ARG X)))))
-(BLOCKRECORD LISTP ((* |;;| "Describes a CONS cell.") (CAR POINTER) (CDR POINTER)) (CREATE (CREATECELL
- \\LISTP)) (* |;;| "FOLLOWING ARE CDR-CODE FIELDS") (BLOCKRECORD LISTP ((CDRCODE BITS 4) (CARFIELD 
-XPOINTER))) (* |;;| "For chaining together free cells on a page:") (BLOCKRECORD LISTP ((NEXTFREE BYTE)
- (NIL BITS 24))) (ACCESSFNS LISTP ((FULLCARFIELD NIL (\\PUTBASEPTR DATUM 0 NEWVALUE)))) (* |;;| 
+1 BITSPERBYTE)))) X) (T (\ILLEGAL.ARG X)))))
+(BLOCKRECORD LISTP ((* ;; "Describes a CONS cell.") (CAR POINTER) (CDR POINTER)) (CREATE (CREATECELL 
+\LISTP)) (* ;; "FOLLOWING ARE CDR-CODE FIELDS") (BLOCKRECORD LISTP ((CDRCODE BITS 4) (CARFIELD 
+XPOINTER))) (* ;; "For chaining together free cells on a page:") (BLOCKRECORD LISTP ((NEXTFREE BYTE) (
+NIL BITS 24))) (ACCESSFNS LISTP ((FULLCARFIELD NIL (\PUTBASEPTR DATUM 0 NEWVALUE)))) (* ;; 
 "because replace of XPOINTER is slow, the CAR field is stored with PUTBASEPTR, even though that smashes the hi byte"
 ))
-(BLOCKRECORD CONSPAGE ((* |;;| 
+(BLOCKRECORD CONSPAGE ((* ;; 
 "Describes a page of CONS cells, which (when free) are chained together thru the top byte.") (NIL 2 
-FIXP) (* \; "Empty cells, space for another 2 CONS cells if we can figure out how.") (CNT BYTE) (* \; 
-"# of cells free on this page") (NEXTCELL BYTE) (* \; 
-"WORD offset of next free cell (not guaranteed to be 0 if no free cells)") (NIL WORD) (* \; "Padding")
- (NEXTPAGE FIXP) (* \; "Next CONS page on the DTD's free list, for searching for cells.")))
-(RPAQQ CONSCONSTANTS (\\CDR.ONPAGE \\CDR.NIL \\CDR.INDIRECT \\CDR.MAXINDIRECT \\CONSPAGE.LAST))
-(RPAQQ \\CDR.ONPAGE 8)
-(RPAQQ \\CDR.NIL 8)
-(RPAQQ \\CDR.INDIRECT 0)
-(RPAQQ \\CDR.MAXINDIRECT 7)
-(RPAQQ \\CONSPAGE.LAST 65535)
-(CONSTANTS \\CDR.ONPAGE \\CDR.NIL \\CDR.INDIRECT \\CDR.MAXINDIRECT \\CONSPAGE.LAST)
+FIXP) (* ; "Empty cells, space for another 2 CONS cells if we can figure out how.") (CNT BYTE) (* ; 
+"# of cells free on this page") (NEXTCELL BYTE) (* ; 
+"WORD offset of next free cell (not guaranteed to be 0 if no free cells)") (NIL WORD) (* ; "Padding") 
+(NEXTPAGE FIXP) (* ; "Next CONS page on the DTD's free list, for searching for cells.")))
+(RPAQQ CONSCONSTANTS (\CDR.ONPAGE \CDR.NIL \CDR.INDIRECT \CDR.MAXINDIRECT \CONSPAGE.LAST))
+(RPAQQ \CDR.ONPAGE 8)
+(RPAQQ \CDR.NIL 8)
+(RPAQQ \CDR.INDIRECT 0)
+(RPAQQ \CDR.MAXINDIRECT 7)
+(RPAQQ \CONSPAGE.LAST 65535)
+(CONSTANTS \CDR.ONPAGE \CDR.NIL \CDR.INDIRECT \CDR.MAXINDIRECT \CONSPAGE.LAST)
 (PUTPROPS LOCAL MACRO ((X) X))
 (PUTPROPS ALLOCAL MACRO ((X) X))
 (PUTPROP (QUOTE LLNEW) (QUOTE IMPORTDATE) (IDATE " 2-Feb-1995 16:21:44"))
 
-(PUTPROPS CHECK MACRO (ARGS (COND ((AND (BOUNDP (QUOTE CHECK)) CHECK) (CONS (QUOTE PROGN) (|for| I 
-|in| ARGS |collect| (LIST (QUOTE OR) I (LIST (QUOTE RAID) (KWOTE (LIST (QUOTE |Check-failure:|) I)))))
-)) (T (CONS COMMENTFLG ARGS)))))
-(PUTPROPS |\\StatsZero| BYTEMACRO (OPENLAMBDA (N) (\\PUTBASE N 0 0) (\\PUTBASE N 1 0)))
-(PUTPROPS |\\StatsAdd1| DMACRO (OPENLAMBDA (A) (PROG ((LO (IPLUS16 (\\GETBASE A 1) 1))) (DECLARE (
-LOCALVARS LO)) (* \; "Increment double word at A by 1") (\\PUTBASE A 1 LO) (COND ((EQ LO 0) (\\PUTBASE
- A 0 (ADD1 (\\GETBASE A 0))))))))
-(PUTPROPS IPLUS16 MACRO ((X Y) (* \; "Kludge to do 16-bit plus") (\\LOLOC (\\ADDBASE X Y))))
+(PUTPROPS CHECK MACRO (ARGS (COND ((AND (BOUNDP (QUOTE CHECK)) CHECK) (CONS (QUOTE PROGN) (for I in 
+ARGS collect (LIST (QUOTE OR) I (LIST (QUOTE RAID) (KWOTE (LIST (QUOTE Check-failure%:) I))))))) (T (
+CONS COMMENTFLG ARGS)))))
+(PUTPROPS \StatsZero BYTEMACRO (OPENLAMBDA (N) (\PUTBASE N 0 0) (\PUTBASE N 1 0)))
+(PUTPROPS \StatsAdd1 DMACRO (OPENLAMBDA (A) (PROG ((LO (IPLUS16 (\GETBASE A 1) 1))) (DECLARE (
+LOCALVARS LO)) (* ; "Increment double word at A by 1") (\PUTBASE A 1 LO) (COND ((EQ LO 0) (\PUTBASE A 
+0 (ADD1 (\GETBASE A 0))))))))
+(PUTPROPS IPLUS16 MACRO ((X Y) (* ; "Kludge to do 16-bit plus") (\LOLOC (\ADDBASE X Y))))
 (PUTPROPS SMALLPOSP MACRO (OPENLAMBDA (X) (AND (SMALLP X) (IGEQ X 0))))
-(PROGN (PUTPROPS SETXVAR MACRO (X (BQUOTE (SETQ.NOREF \, (CADAR X) \, (CADR X))))) (PUTPROPS SETXVAR 
-DMACRO (X (OR (AND (EQ (CAAR X) (QUOTE QUOTE)) (LITATOM (CADAR X))) (SHOULDNT)) (GLOBALVARS \\VALSPACE
-) (LIST (QUOTE SETQ.NOREF) (CADAR X) (CADR X)))))
-(PUTPROPS SETQ.NOREF DMACRO ((VAR VAL) (\\PUTBASEPTR (LOCF (|fetch| (LITATOM VALUE) |of| (QUOTE VAR)))
- 0 VAL)))
+(PROGN (PUTPROPS SETXVAR MACRO (X (BQUOTE (SETQ.NOREF %, (CADAR X) %, (CADR X))))) (PUTPROPS SETXVAR 
+DMACRO (X (OR (AND (EQ (CAAR X) (QUOTE QUOTE)) (LITATOM (CADAR X))) (SHOULDNT)) (GLOBALVARS \VALSPACE)
+ (LIST (QUOTE SETQ.NOREF) (CADAR X) (CADR X)))))
+(PUTPROPS SETQ.NOREF DMACRO ((VAR VAL) (\PUTBASEPTR (LOCF (fetch (LITATOM VALUE) of (QUOTE VAR))) 0 
+VAL)))
 (PROGN (PUTPROPS IEQ MACRO ((X Y) (IEQP X Y))) (PUTPROPS IEQ DMACRO (= . EQ)))
-(RPAQQ |WordsPerPage| 256)
-(CONSTANTS |WordsPerPage|)
-(ACCESSFNS LITATOM ((DEFINITIONCELL (\\DEFCELL DATUM)) (PROPCELL (\\PROPCELL DATUM)) (VCELL (\\VALCELL
- DATUM)) (PNAMECELL (\\PNAMECELL DATUM))) (* |;;| 
-"VCELL can also be accessed directly from a value index via the record VALINDEX (as in \\SETGLOBALVAL.UFN) --- Similarly, PNAMEINDEX accesses PNAMECELL for use by \\MKATOM and UNCOPYATOM"
-) (TYPE? (LITATOM DATUM)) (BLOCKRECORD PROPCELL ((NIL BITS 4) (* \; "former flags locations") (
-PROPLIST POINTER) (NIL BITS 8) (* \; "Package byte") (NIL BITS 8) (* \; "Flags from defcell") (* |;;| 
-"PROPCell flags:") (NIL BITS 1) (GENSYMP FLAG) (FATPNAMEP FLAG) (NIL BITS 5) (* |;;| 
+(RPAQQ WordsPerPage 256)
+(CONSTANTS WordsPerPage)
+(ACCESSFNS LITATOM ((DEFINITIONCELL (\DEFCELL DATUM)) (PROPCELL (\PROPCELL DATUM)) (VCELL (\VALCELL 
+DATUM)) (PNAMECELL (\PNAMECELL DATUM))) (* ;; 
+"VCELL can also be accessed directly from a value index via the record VALINDEX (as in \SETGLOBALVAL.UFN) --- Similarly, PNAMEINDEX accesses PNAMECELL for use by \MKATOM and UNCOPYATOM"
+) (TYPE? (LITATOM DATUM)) (BLOCKRECORD PROPCELL ((NIL BITS 4) (* ; "former flags locations") (PROPLIST
+ POINTER) (NIL BITS 8) (* ; "Package byte") (NIL BITS 8) (* ; "Flags from defcell") (* ;; 
+"PROPCell flags:") (NIL BITS 1) (GENSYMP FLAG) (FATPNAMEP FLAG) (NIL BITS 5) (* ;; 
 "Filler for final cell:") (NIL BITS 8))))
 (SYNONYM CL:SYMBOL (LITATOM))
-(ACCESSFNS VALINDEX ((VCELL (COND ((AND (FIXP DATUM) (ILESSP DATUM 65535)) (* \; 
-"Xerox Lisp traditional symbol") (\\ADDBASE2 \\PNPSPACE (IPLUS \\NEWATOM-VALOFFSET (ITIMES 10 DATUM)))
-) (T (* \; "New symbol") (* \; "'90/07/19 ON") (\\ADDBASE DATUM \\NEWATOM-VALOFFSET))))))
+(ACCESSFNS VALINDEX ((VCELL (COND ((AND (FIXP DATUM) (ILESSP DATUM 65535)) (* ; 
+"Xerox Lisp traditional symbol") (\ADDBASE2 \PNPSPACE (IPLUS \NEWATOM-VALOFFSET (ITIMES 10 DATUM)))) (
+T (* ; "New symbol") (* ; "'90/07/19 ON") (\ADDBASE DATUM \NEWATOM-VALOFFSET))))))
 (BLOCKRECORD VCELL ((VALUE FULLPOINTER)))
-(BLOCKRECORD DEFINITIONCELL ((CCODEP FLAG) (FASTP FLAG) (ARGTYPE BITS 2) (* \; "Former flag location")
- (DEFPOINTER POINTER) (NIL POINTER) (* \; "Proplist cell") (NIL BITS 8) (* \; "package") (* |;;| 
+(BLOCKRECORD DEFINITIONCELL ((CCODEP FLAG) (FASTP FLAG) (ARGTYPE BITS 2) (* ; "Former flag location") 
+(DEFPOINTER POINTER) (NIL POINTER) (* ; "Proplist cell") (NIL BITS 8) (* ; "package") (* ;; 
 "DEFCELL flags overflow from top 4 bits of the real cell:") (NIL BITS 4) (PSEUDOCODEP FLAG) (NIL BITS 
-3) (* |;;| "proplist falgs and filler:") (NIL BITS 16)) (BLOCKRECORD DEFINITIONCELL ((DEFCELLFLAGS 
-BITS 4) (NIL POINTER) (* \; "defn ptr") (NIL BITS 4) (NIL POINTER) (* \; "filler for proplist ptr") (
-NIL BITS 8) (AUXDEFCELLFLAGS BYTE) (NIL BITS 16))))
+3) (* ;; "proplist falgs and filler:") (NIL BITS 16)) (BLOCKRECORD DEFINITIONCELL ((DEFCELLFLAGS BITS 
+4) (NIL POINTER) (* ; "defn ptr") (NIL BITS 4) (NIL POINTER) (* ; "filler for proplist ptr") (NIL BITS
+ 8) (AUXDEFCELLFLAGS BYTE) (NIL BITS 16))))
 (BLOCKRECORD FNHEADER ((STKMIN WORD) (NA SIGNEDWORD) (PV SIGNEDWORD) (STARTPC WORD) (CLOSUREP FLAG) (*
- \; "T if this is a \"compiled closure\"") (BYTESWAPPED FLAG) (* \; 
+ ; "T if this is a %"compiled closure%"") (BYTESWAPPED FLAG) (* ; 
 "T if, on 386, we reswapped the code section of this function for faster access.") (ARGTYPE BITS 2) (*
- \; "0 = LAMBDA") (* \; "2 = LAMBDA nospread") (* \; "1 = NLAMBDA") (* \; "3 = NLAMBDA nospread") (* 
-|;;| "4 NIL BITS USED TO BE HERE.") (\#FRAMENAME XPOINTER) (NTSIZE WORD) (* \; 
+ ; "0 = LAMBDA") (* ; "2 = LAMBDA nospread") (* ; "1 = NLAMBDA") (* ; "3 = NLAMBDA nospread") (* ;; 
+"4 NIL BITS USED TO BE HERE.") (%#FRAMENAME XPOINTER) (NTSIZE WORD) (* ; 
 "Size of the Name Table, IN WORDS.  This value is always rounded up to the next Quad-word in size, and there' guaranteed to be one entry of zeros in the length."
-) (NLOCALS BYTE) (FVAROFFSET BYTE)) (ACCESSFNS FNHEADER ((LSTARP (ILESSP (|fetch| (FNHEADER NA) |of| 
-DATUM) 0)) (OVERHEADWORDS (PROGN 8)) (NATIVE (PROGN NIL)) (* \; 
-"T if this is a NATIVE-code function (never true!)") (ALIGNED (IPLUS (|fetch| (FNHEADER NTSIZE) |of| 
-DATUM) (|fetch| (FNHEADER OVERHEADWORDS) |of| T))) (FIXED NIL (|replace| (FNHEADER STKMIN) |of| DATUM 
-|with| (\\STKMIN DATUM T))) (NPVARWORDS (UNFOLD (ADD1 (|fetch| (FNHEADER PV) |of| DATUM)) WORDSPERQUAD
-)) (FRAMENAME (|fetch| (FNHEADER \#FRAMENAME) |of| DATUM) (UNINTERRUPTABLY (CHECK (NEQ (\\HILOC DATUM)
- \\STACKHI)) (\\DELREF (|fetch| (FNHEADER \#FRAMENAME) |of| DATUM)) (\\ADDREF NEWVALUE) (|replace| (
-FNHEADER \#FRAMENAME) |of| DATUM |with| NEWVALUE))))))
-(BLOCKRECORD PNAMECELL ((NIL BITS 4) (PNAMEBASE XPOINTER) (NIL POINTER) (* \; "val, def, prop cells") 
-(NIL POINTER) (NIL POINTER) (PACKAGEINDEX BYTE) (NIL BITS 24) (* \; "filler for other flags")) (
-BLOCKRECORD PNAMECELL ((FULLPNAMEBASE FULLXPOINTER) (* \; "Replacing this smashes PACKAGEINDEX to 0"))
-) (ACCESSFNS PNAMECELL ((PACKAGE (LET ((I (FETCH (PNAMECELL PACKAGEINDEX) OF DATUM))) (* \; 
+) (NLOCALS BYTE) (FVAROFFSET BYTE)) (ACCESSFNS FNHEADER ((LSTARP (ILESSP (fetch (FNHEADER NA) of DATUM
+) 0)) (OVERHEADWORDS (PROGN 8)) (NATIVE (PROGN NIL)) (* ; 
+"T if this is a NATIVE-code function (never true!)") (ALIGNED (IPLUS (fetch (FNHEADER NTSIZE) of DATUM
+) (fetch (FNHEADER OVERHEADWORDS) of T))) (FIXED NIL (replace (FNHEADER STKMIN) of DATUM with (\STKMIN
+ DATUM T))) (NPVARWORDS (UNFOLD (ADD1 (fetch (FNHEADER PV) of DATUM)) WORDSPERQUAD)) (FRAMENAME (fetch
+ (FNHEADER %#FRAMENAME) of DATUM) (UNINTERRUPTABLY (CHECK (NEQ (\HILOC DATUM) \STACKHI)) (\DELREF (
+fetch (FNHEADER %#FRAMENAME) of DATUM)) (\ADDREF NEWVALUE) (replace (FNHEADER %#FRAMENAME) of DATUM 
+with NEWVALUE))))))
+(BLOCKRECORD PNAMECELL ((NIL BITS 4) (PNAMEBASE XPOINTER) (NIL POINTER) (* ; "val, def, prop cells") (
+NIL POINTER) (NIL POINTER) (PACKAGEINDEX BYTE) (NIL BITS 24) (* ; "filler for other flags")) (
+BLOCKRECORD PNAMECELL ((FULLPNAMEBASE FULLXPOINTER) (* ; "Replacing this smashes PACKAGEINDEX to 0")))
+ (ACCESSFNS PNAMECELL ((PACKAGE (LET ((I (FETCH (PNAMECELL PACKAGEINDEX) OF DATUM))) (* ; 
 "This ugly construct allows cl:symbol-package to run in the init, where *PACKAGE-FROM-INDEX* is not yet bound."
 ) (COND ((EQ 0 I) NIL) (T (CL:AREF *PACKAGE-FROM-INDEX* I)))) (REPLACE (PNAMECELL PACKAGEINDEX) OF 
-DATUM WITH (IF (NULL NEWVALUE) THEN *UNINTERNED-PACKAGE-INDEX* ELSE (CL::%PACKAGE-INDEX NEWVALUE))))))
-)
-(ACCESSFNS PACKAGEINDEX ((PACKAGE (IF (EQ 0 DATUM) (* \; 
+DATUM WITH (IF (NULL NEWVALUE) THEN *UNINTERNED-PACKAGE-INDEX* ELSE (CL::%%PACKAGE-INDEX NEWVALUE)))))
+))
+(ACCESSFNS PACKAGEINDEX ((PACKAGE (IF (EQ 0 DATUM) (* ; 
 "This ugly construct allows cl:symbol-package to run in the init, where *PACKAGE-FROM-INDEX* is not yet bound."
 ) THEN NIL ELSE (CL:AREF *PACKAGE-FROM-INDEX* DATUM)))))
-(BLOCKRECORD PNAMEBASE ((PNAMELENGTH BYTE) (* \; "Length is always here, be the pname thin or fat") (
-PNAMEFATPADDINGBYTE BYTE) (* \; 
+(BLOCKRECORD PNAMEBASE ((PNAMELENGTH BYTE) (* ; "Length is always here, be the pname thin or fat") (
+PNAMEFATPADDINGBYTE BYTE) (* ; 
 "This byte is zero for fat pnames so that the pname chars are word-aligned")))
-(ACCESSFNS PNAMEINDEX ((PNAMECELL (COND ((AND (FIXP DATUM) (ILESSP DATUM 65535)) (* \; 
-"Xerox Lisp traditional symbol") (\\ADDBASE \\OLDATOMSPACE (IPLUS \\NEWATOM-PNAMEOFFSET (ITIMES 10 
-DATUM)))) (T (* \; "New symbol") (* \; "'90/07/19 ON") (\\ADDBASE DATUM \\NEWATOM-PNAMEOFFSET))))))
-(BLOCKRECORD NEW-ATOM ((* |;;| 
-"An extended symbol, for expanding atom space.  Kept in its own datatype.") (PNAME XPOINTER) (* \; 
-"PNAME, same as litatom.") (VALUE POINTER) (DEF POINTER) (PROPLIST POINTER) (* |;;| 
+(ACCESSFNS PNAMEINDEX ((PNAMECELL (COND ((AND (FIXP DATUM) (ILESSP DATUM 65535)) (* ; 
+"Xerox Lisp traditional symbol") (\ADDBASE \OLDATOMSPACE (IPLUS \NEWATOM-PNAMEOFFSET (ITIMES 10 DATUM)
+))) (T (* ; "New symbol") (* ; "'90/07/19 ON") (\ADDBASE DATUM \NEWATOM-PNAMEOFFSET))))))
+(BLOCKRECORD NEW-ATOM ((* ;; 
+"An extended symbol, for expanding atom space.  Kept in its own datatype.") (PNAME XPOINTER) (* ; 
+"PNAME, same as litatom.") (VALUE POINTER) (DEF POINTER) (PROPLIST POINTER) (* ;; 
 "Flags that used to be above the pointers, e.g. package, ccodep, gensymp:") (NIL BITS 32)))
-(PUTPROPS \\DEFCELL MACRO ((ATOM) (\\ATOMCELL ATOM \\DEF.HI)))
-(PUTPROPS \\VALCELL MACRO ((ATOM) (\\ATOMCELL ATOM \\VAL.HI)))
-(PUTPROPS \\PNAMECELL MACRO ((ATOM) (\\ATOMCELL ATOM \\PNAME.HI)))
-(PUTPROPS \\ATOMVALINDEX DMACRO (OPENLAMBDA (X) (COND ((EQ (NTYPX X) \\LITATOM) (* \; 
-"Original litatoms") (\\LOLOC X)) ((EQ (NTYPX X) \\NEW-ATOM) (* \; "new 3-byte symbols") X) (T (
-SHOULDNT)))))
-(PUTPROPS \\ATOMDEFINDEX DMACRO (OPENLAMBDA (X) (COND ((EQ (NTYPX X) \\LITATOM) (* \; 
-"Original litatoms") (\\LOLOC X)) ((EQ (NTYPX X) \\NEW-ATOM) (* \; "new 3-byte symbols") X) (T (
-SHOULDNT)))))
-(PUTPROPS \\ATOMPNAMEINDEX DMACRO (OPENLAMBDA (X) (COND ((EQ (NTYPX X) \\LITATOM) (* \; 
-"Original litatoms") (\\LOLOC X)) ((EQ (NTYPX X) \\NEW-ATOM) (* \; "new 3-byte symbols") X) (T (
-SHOULDNT)))))
-(PUTPROPS \\ATOMPROPINDEX DMACRO ((X) (COND ((EQ (NTYPX X) \\LITATOM) (* \; "Original litatoms") (
-\\LOLOC X)) ((EQ (NTYPX X) \\NEW-ATOM) (* \; "new 3-byte symbols") X) (T (SHOULDNT)))))
-(PUTPROPS \\INDEXATOMPNAME DMACRO (OPENLAMBDA (X) (COND ((FIXP X) (* \; 
-"Xerox Lisp traditional symbol") (COND ((SMALLP X) (\\VAG2 |\\AtomHI| X)) (T (\\VAG2 (LRSH X 16) (
-LOGAND X 65535))))) (T (* \; "New symbol") X))))
-(PUTPROPS \\INDEXATOMVAL DMACRO (OPENLAMBDA (X) (COND ((FIXP X) (* \; "Xerox Lisp traditional symbol")
- (COND ((SMALLP X) (\\VAG2 |\\AtomHI| X)) (T (\\VAG2 (LRSH X 16) (LOGAND X 65535))))) (T (* \; 
-"New symbol") X))))
-(PUTPROPS \\INDEXATOMDEF DMACRO (OPENLAMBDA (X) (COND ((FIXP X) (* \; "Xerox Lisp traditional symbol")
- (COND ((SMALLP X) (\\VAG2 |\\AtomHI| X)) (T (\\VAG2 (LRSH X 16) (LOGAND X 65535))))) (T (* \; 
-"New symbol") X))))
-(PUTPROPS \\ATOMNUMBER DMACRO (= . \\LOLOC))
-(GLOBALVARS |\\NxtPnByte| |\\CurPnPage| |\\NxtAtomPage| |\\AtomFrLst| |\\OneCharAtomBase| 
-\\PNAMES.IN.BLOCKS? \\SCRATCHSTRING COMPILEATPUTDFLG)
-(RPAQQ \\PNAMELIMIT 255)
-(RPAQQ |\\CharsPerPnPage| 512)
-(CONSTANTS (\\PNAMELIMIT 255) (|\\CharsPerPnPage| 512))
-(RPAQQ \\NEWATOM-PNAMEOFFSET 0)
-(RPAQQ \\NEWATOM-VALOFFSET 2)
-(RPAQQ \\NEWATOM-DEFOFFSET 4)
-(RPAQQ \\NEWATOM-PLISTOFFSET 6)
-(RPAQQ \\NEWATOM-TYPE# 21)
-(CONSTANTS (\\NEWATOM-PNAMEOFFSET 0) (\\NEWATOM-VALOFFSET 2) (\\NEWATOM-DEFOFFSET 4) (
-\\NEWATOM-PLISTOFFSET 6) (\\NEWATOM-TYPE# 21))
-(PUTPROPS \\MOVEWORDS MACRO (OPENLAMBDA (SBASE SOFFSET DBASE DOFFSET NWORDS) (\\BLT (\\ADDBASE DBASE 
-DOFFSET) (\\ADDBASE SBASE SOFFSET) NWORDS)))
+(PUTPROPS \DEFCELL MACRO ((ATOM) (\ATOMCELL ATOM \DEF.HI)))
+(PUTPROPS \VALCELL MACRO ((ATOM) (\ATOMCELL ATOM \VAL.HI)))
+(PUTPROPS \PNAMECELL MACRO ((ATOM) (\ATOMCELL ATOM \PNAME.HI)))
+(PUTPROPS \ATOMVALINDEX DMACRO (OPENLAMBDA (X) (COND ((EQ (NTYPX X) \LITATOM) (* ; "Original litatoms"
+) (\LOLOC X)) ((EQ (NTYPX X) \NEW-ATOM) (* ; "new 3-byte symbols") X) (T (SHOULDNT)))))
+(PUTPROPS \ATOMDEFINDEX DMACRO (OPENLAMBDA (X) (COND ((EQ (NTYPX X) \LITATOM) (* ; "Original litatoms"
+) (\LOLOC X)) ((EQ (NTYPX X) \NEW-ATOM) (* ; "new 3-byte symbols") X) (T (SHOULDNT)))))
+(PUTPROPS \ATOMPNAMEINDEX DMACRO (OPENLAMBDA (X) (COND ((EQ (NTYPX X) \LITATOM) (* ; 
+"Original litatoms") (\LOLOC X)) ((EQ (NTYPX X) \NEW-ATOM) (* ; "new 3-byte symbols") X) (T (SHOULDNT)
+))))
+(PUTPROPS \ATOMPROPINDEX DMACRO ((X) (COND ((EQ (NTYPX X) \LITATOM) (* ; "Original litatoms") (\LOLOC 
+X)) ((EQ (NTYPX X) \NEW-ATOM) (* ; "new 3-byte symbols") X) (T (SHOULDNT)))))
+(PUTPROPS \INDEXATOMPNAME DMACRO (OPENLAMBDA (X) (COND ((FIXP X) (* ; "Xerox Lisp traditional symbol")
+ (COND ((SMALLP X) (\VAG2 \AtomHI X)) (T (\VAG2 (LRSH X 16) (LOGAND X 65535))))) (T (* ; "New symbol")
+ X))))
+(PUTPROPS \INDEXATOMVAL DMACRO (OPENLAMBDA (X) (COND ((FIXP X) (* ; "Xerox Lisp traditional symbol") (
+COND ((SMALLP X) (\VAG2 \AtomHI X)) (T (\VAG2 (LRSH X 16) (LOGAND X 65535))))) (T (* ; "New symbol") X
+))))
+(PUTPROPS \INDEXATOMDEF DMACRO (OPENLAMBDA (X) (COND ((FIXP X) (* ; "Xerox Lisp traditional symbol") (
+COND ((SMALLP X) (\VAG2 \AtomHI X)) (T (\VAG2 (LRSH X 16) (LOGAND X 65535))))) (T (* ; "New symbol") X
+))))
+(PUTPROPS \ATOMNUMBER DMACRO (= . \LOLOC))
+(GLOBALVARS \NxtPnByte \CurPnPage \NxtAtomPage \AtomFrLst \OneCharAtomBase \PNAMES.IN.BLOCKS? 
+\SCRATCHSTRING COMPILEATPUTDFLG)
+(RPAQQ \PNAMELIMIT 255)
+(RPAQQ \CharsPerPnPage 512)
+(CONSTANTS (\PNAMELIMIT 255) (\CharsPerPnPage 512))
+(RPAQQ \NEWATOM-PNAMEOFFSET 0)
+(RPAQQ \NEWATOM-VALOFFSET 2)
+(RPAQQ \NEWATOM-DEFOFFSET 4)
+(RPAQQ \NEWATOM-PLISTOFFSET 6)
+(RPAQQ \NEWATOM-TYPE# 21)
+(CONSTANTS (\NEWATOM-PNAMEOFFSET 0) (\NEWATOM-VALOFFSET 2) (\NEWATOM-DEFOFFSET 4) (
+\NEWATOM-PLISTOFFSET 6) (\NEWATOM-TYPE# 21))
+(PUTPROPS \MOVEWORDS MACRO (OPENLAMBDA (SBASE SOFFSET DBASE DOFFSET NWORDS) (\BLT (\ADDBASE DBASE 
+DOFFSET) (\ADDBASE SBASE SOFFSET) NWORDS)))
 (PUTPROP (QUOTE LLBASIC) (QUOTE IMPORTDATE) (IDATE "31-Jan-1998 09:55:50"))
 
-(ACCESSFNS STRINGP ((XREADONLY (|fetch| (ARRAY-HEADER READ-ONLY-P) |of| DATUM) (|replace| (
-ARRAY-HEADER READ-ONLY-P) |of| DATUM |with| NEWVALUE)) (XBASE ((OPENLAMBDA (STRING) (COND ((|fetch| (
-ARRAY-HEADER INDIRECT-P) |of| STRING) (%ARRAY-BASE STRING)) (T (|fetch| (ARRAY-HEADER BASE) |of| 
-STRING)))) DATUM) ((OPENLAMBDA (STRING NV) (|replace| (ARRAY-HEADER INDIRECT-P) |of| STRING |with| NIL
-) (|replace| (ARRAY-HEADER BASE) |of| STRING |with| NV) NV) DATUM NEWVALUE)) (TYP ((OPENLAMBDA (STRING
-) (SELECTC (COND ((|fetch| (ARRAY-HEADER INDIRECT-P) |of| STRING) (%ARRAY-TYPE-NUMBER STRING)) (T (
-|fetch| (ARRAY-HEADER TYPE-NUMBER) |of| STRING))) (%THIN-CHAR-TYPENUMBER \\ST.BYTE) (
-%FAT-CHAR-TYPENUMBER \\ST.POS16) (SHOULDNT "Unknown type-number"))) DATUM) ((OPENLAMBDA (STRING NV) (
-LET ((%NEW-TYPE-NUMBER (SELECTC NV (\\ST.BYTE %THIN-CHAR-TYPENUMBER) (\\ST.POS16 %FAT-CHAR-TYPENUMBER)
- (SHOULDNT "Unknown typ value")))) (COND ((|fetch| (ARRAY-HEADER INDIRECT-P) |of| STRING) (
-%SET-ARRAY-TYPE-NUMBER STRING %NEW-TYPE-NUMBER)) (T (|replace| (ARRAY-HEADER TYPE-NUMBER) |of| STRING 
-|with| %NEW-TYPE-NUMBER))))) DATUM NEWVALUE)) (LENGTH (|fetch| (ARRAY-HEADER FILL-POINTER) |of| DATUM)
- ((OPENLAMBDA (STRING NV) (|replace| (ARRAY-HEADER FILL-POINTER) |of| STRING |with| NV) (|replace| (
-ARRAY-HEADER TOTAL-SIZE) |of| STRING |with| NV) (COND ((%GENERAL-ARRAY-P STRING) (|freplace| (
-GENERAL-ARRAY DIMS) |of| STRING |with| (LIST NV)))) NV) DATUM NEWVALUE)) (OFFST ((OPENLAMBDA (STRING) 
-(COND ((|fetch| (ARRAY-HEADER INDIRECT-P) |of| STRING) (%ARRAY-OFFSET STRING)) (T (|fetch| (
-ARRAY-HEADER OFFSET) |of| STRING)))) DATUM) ((OPENLAMBDA (STRING NV) (COND ((NOT (EQ 0 NV)) (|replace|
- (ARRAY-HEADER DISPLACED-P) |of| STRING |with| T))) (COND ((|fetch| (ARRAY-HEADER INDIRECT-P) |of| 
-STRING) (%SET-ARRAY-OFFSET STRING NV)) (T (|replace| (ARRAY-HEADER OFFSET) |of| STRING |with| NV)))) 
-DATUM NEWVALUE)) (* |;;| "The rest of these fields only appear when smashing") (XFLAGS (LOGAND (
-|fetch| (ARRAY-HEADER FLAGS) |of| DATUM) 15) ((OPENLAMBDA (STRING) (|replace| (ARRAY-HEADER 
-ADJUSTABLE-P) |of| STRING |with| NIL) (|replace| (ARRAY-HEADER DISPLACED-P) |of| STRING |with| NIL) (
-|replace| (ARRAY-HEADER FILL-POINTER-P) |of| STRING |with| NIL) (|replace| (ARRAY-HEADER EXTENDABLE-P)
- |of| STRING |with| NIL)) DATUM))) (ACCESSFNS STRINGP ((ORIG ((OPENLAMBDA (STRING) 1) DATUM) ((
-OPENLAMBDA (STRING NV) (COND ((NOT (EQ NV 1)) (ERROR "Il:stringp's are always origin 1"))) NV) DATUM 
-NEWVALUE)) (* \; "An inoperative field") (SUBSTRINGED ((OPENLAMBDA (STRING) NIL) DATUM) ((OPENLAMBDA (
-STRING NV) (OR (NULL NV) (ERROR "Substringed field not supported"))) DATUM NEWVALUE)) (READONLY (
-|ffetch| (STRINGP XREADONLY) |of| DATUM) (|freplace| (STRINGP XREADONLY) |of| DATUM |with| NEWVALUE)) 
-(FATSTRINGP ((OPENLAMBDA (STRING) (EQ (COND ((|fetch| (ARRAY-HEADER INDIRECT-P) |of| STRING) (
-%ARRAY-TYPE-NUMBER STRING)) (T (|fetch| (ARRAY-HEADER TYPE-NUMBER) |of| STRING))) %FAT-CHAR-TYPENUMBER
-)) DATUM) ((OPENLAMBDA (STRING NV) (LET ((%NEW-TYPE-NUMBER (COND (NV %FAT-CHAR-TYPENUMBER) (T 
-%THIN-CHAR-TYPENUMBER)))) (COND ((|fetch| (ARRAY-HEADER INDIRECT-P) |of| STRING) (
-%SET-ARRAY-TYPE-NUMBER STRING %NEW-TYPE-NUMBER)) (T (|replace| (ARRAY-HEADER TYPE-NUMBER) |of| STRING 
-|with| %NEW-TYPE-NUMBER))))) DATUM NEWVALUE)) (BASE (|ffetch| (STRINGP XBASE) |of| DATUM) (|freplace| 
-(STRINGP XBASE) |of| DATUM |with| NEWVALUE)))) (CREATE (|create| ONED-ARRAY BASE _ XBASE READ-ONLY-P _
- XREADONLY STRING-P _ T DISPLACED-P _ (NOT (EQ OFFST 0)) TYPE-NUMBER _ (COND ((EQ TYP \\ST.POS16) 
-%FAT-CHAR-TYPENUMBER) (T %THIN-CHAR-TYPENUMBER)) OFFSET _ OFFST FILL-POINTER _ LENGTH TOTAL-SIZE _ 
-LENGTH)) (TYPE? (CL:STRINGP DATUM)) OFFST _ 0 TYP _ \\ST.BYTE LENGTH _ 0)
-(GLOBALVARS |\\OneCharAtomBase|)
-(PUTDEF (QUOTE \\NUMSTR) (QUOTE RESOURCES) (QUOTE (NEW (ALLOCSTRING 128))))
-(PUTDEF (QUOTE \\NUMSTR1) (QUOTE RESOURCES) (QUOTE (NEW (CONCAT))))
-(PUTDEF (QUOTE \\PNAMESTRING) (QUOTE RESOURCES) (QUOTE (NEW (ALLOCSTRING \\PNAMELIMIT NIL NIL 
-\\FATPNAMESTRINGP))))
-(RPAQQ \\FATPNAMESTRINGP T)
-(CONSTANTS (\\FATPNAMESTRINGP T))
-(PUTPROPS \\PNAMESTRINGPUTCHAR MACRO ((BASE OFFSET CODE) (* \; 
-"For stuffing chars into resource \\PNAMESTRING") (\\PUTBASECHAR \\FATPNAMESTRINGP BASE OFFSET CODE)))
-(DEFOPTIMIZER FCHARACTER (NUM) (BQUOTE ((OPENLAMBDA (N) (COND ((IGREATERP N \\MAXTHINCHAR) (* \; 
+(ACCESSFNS STRINGP ((XREADONLY (fetch (ARRAY-HEADER READ-ONLY-P) of DATUM) (replace (ARRAY-HEADER 
+READ-ONLY-P) of DATUM with NEWVALUE)) (XBASE ((OPENLAMBDA (STRING) (COND ((fetch (ARRAY-HEADER 
+INDIRECT-P) of STRING) (%%ARRAY-BASE STRING)) (T (fetch (ARRAY-HEADER BASE) of STRING)))) DATUM) ((
+OPENLAMBDA (STRING NV) (replace (ARRAY-HEADER INDIRECT-P) of STRING with NIL) (replace (ARRAY-HEADER 
+BASE) of STRING with NV) NV) DATUM NEWVALUE)) (TYP ((OPENLAMBDA (STRING) (SELECTC (COND ((fetch (
+ARRAY-HEADER INDIRECT-P) of STRING) (%%ARRAY-TYPE-NUMBER STRING)) (T (fetch (ARRAY-HEADER TYPE-NUMBER)
+ of STRING))) (%%THIN-CHAR-TYPENUMBER \ST.BYTE) (%%FAT-CHAR-TYPENUMBER \ST.POS16) (SHOULDNT 
+"Unknown type-number"))) DATUM) ((OPENLAMBDA (STRING NV) (LET ((%%NEW-TYPE-NUMBER (SELECTC NV (
+\ST.BYTE %%THIN-CHAR-TYPENUMBER) (\ST.POS16 %%FAT-CHAR-TYPENUMBER) (SHOULDNT "Unknown typ value")))) (
+COND ((fetch (ARRAY-HEADER INDIRECT-P) of STRING) (%%SET-ARRAY-TYPE-NUMBER STRING %%NEW-TYPE-NUMBER)) 
+(T (replace (ARRAY-HEADER TYPE-NUMBER) of STRING with %%NEW-TYPE-NUMBER))))) DATUM NEWVALUE)) (LENGTH 
+(fetch (ARRAY-HEADER FILL-POINTER) of DATUM) ((OPENLAMBDA (STRING NV) (replace (ARRAY-HEADER 
+FILL-POINTER) of STRING with NV) (replace (ARRAY-HEADER TOTAL-SIZE) of STRING with NV) (COND ((
+%%GENERAL-ARRAY-P STRING) (freplace (GENERAL-ARRAY DIMS) of STRING with (LIST NV)))) NV) DATUM 
+NEWVALUE)) (OFFST ((OPENLAMBDA (STRING) (COND ((fetch (ARRAY-HEADER INDIRECT-P) of STRING) (
+%%ARRAY-OFFSET STRING)) (T (fetch (ARRAY-HEADER OFFSET) of STRING)))) DATUM) ((OPENLAMBDA (STRING NV) 
+(COND ((NOT (EQ 0 NV)) (replace (ARRAY-HEADER DISPLACED-P) of STRING with T))) (COND ((fetch (
+ARRAY-HEADER INDIRECT-P) of STRING) (%%SET-ARRAY-OFFSET STRING NV)) (T (replace (ARRAY-HEADER OFFSET) 
+of STRING with NV)))) DATUM NEWVALUE)) (* ;; "The rest of these fields only appear when smashing") (
+XFLAGS (LOGAND (fetch (ARRAY-HEADER FLAGS) of DATUM) 15) ((OPENLAMBDA (STRING) (replace (ARRAY-HEADER 
+ADJUSTABLE-P) of STRING with NIL) (replace (ARRAY-HEADER DISPLACED-P) of STRING with NIL) (replace (
+ARRAY-HEADER FILL-POINTER-P) of STRING with NIL) (replace (ARRAY-HEADER EXTENDABLE-P) of STRING with 
+NIL)) DATUM))) (ACCESSFNS STRINGP ((ORIG ((OPENLAMBDA (STRING) 1) DATUM) ((OPENLAMBDA (STRING NV) (
+COND ((NOT (EQ NV 1)) (ERROR "Il:stringp's are always origin 1"))) NV) DATUM NEWVALUE)) (* ; 
+"An inoperative field") (SUBSTRINGED ((OPENLAMBDA (STRING) NIL) DATUM) ((OPENLAMBDA (STRING NV) (OR (
+NULL NV) (ERROR "Substringed field not supported"))) DATUM NEWVALUE)) (READONLY (ffetch (STRINGP 
+XREADONLY) of DATUM) (freplace (STRINGP XREADONLY) of DATUM with NEWVALUE)) (FATSTRINGP ((OPENLAMBDA (
+STRING) (EQ (COND ((fetch (ARRAY-HEADER INDIRECT-P) of STRING) (%%ARRAY-TYPE-NUMBER STRING)) (T (fetch
+ (ARRAY-HEADER TYPE-NUMBER) of STRING))) %%FAT-CHAR-TYPENUMBER)) DATUM) ((OPENLAMBDA (STRING NV) (LET 
+((%%NEW-TYPE-NUMBER (COND (NV %%FAT-CHAR-TYPENUMBER) (T %%THIN-CHAR-TYPENUMBER)))) (COND ((fetch (
+ARRAY-HEADER INDIRECT-P) of STRING) (%%SET-ARRAY-TYPE-NUMBER STRING %%NEW-TYPE-NUMBER)) (T (replace (
+ARRAY-HEADER TYPE-NUMBER) of STRING with %%NEW-TYPE-NUMBER))))) DATUM NEWVALUE)) (BASE (ffetch (
+STRINGP XBASE) of DATUM) (freplace (STRINGP XBASE) of DATUM with NEWVALUE)))) (CREATE (create 
+ONED-ARRAY BASE _ XBASE READ-ONLY-P _ XREADONLY STRING-P _ T DISPLACED-P _ (NOT (EQ OFFST 0)) 
+TYPE-NUMBER _ (COND ((EQ TYP \ST.POS16) %%FAT-CHAR-TYPENUMBER) (T %%THIN-CHAR-TYPENUMBER)) OFFSET _ 
+OFFST FILL-POINTER _ LENGTH TOTAL-SIZE _ LENGTH)) (TYPE? (CL:STRINGP DATUM)) OFFST _ 0 TYP _ \ST.BYTE 
+LENGTH _ 0)
+(GLOBALVARS \OneCharAtomBase)
+(PUTDEF (QUOTE \NUMSTR) (QUOTE RESOURCES) (QUOTE (NEW (ALLOCSTRING 128))))
+(PUTDEF (QUOTE \NUMSTR1) (QUOTE RESOURCES) (QUOTE (NEW (CONCAT))))
+(PUTDEF (QUOTE \PNAMESTRING) (QUOTE RESOURCES) (QUOTE (NEW (ALLOCSTRING \PNAMELIMIT NIL NIL 
+\FATPNAMESTRINGP))))
+(RPAQQ \FATPNAMESTRINGP T)
+(CONSTANTS (\FATPNAMESTRINGP T))
+(PUTPROPS \PNAMESTRINGPUTCHAR MACRO ((BASE OFFSET CODE) (* ; 
+"For stuffing chars into resource \PNAMESTRING") (\PUTBASECHAR \FATPNAMESTRINGP BASE OFFSET CODE)))
+(DEFOPTIMIZER FCHARACTER (NUM) (BQUOTE ((OPENLAMBDA (N) (COND ((IGREATERP N \MAXTHINCHAR) (* ; 
 "The character we're getting is NOT a thin character -- do it the hard way") (CHARACTER N)) ((
-IGREATERP N (CHARCODE 9)) (\\ADDBASE |\\OneCharAtomBase| (IDIFFERENCE N 10))) ((IGEQ N (CHARCODE 0)) (
-IDIFFERENCE N (CHARCODE 0))) (T (* \; "The common case -- just add on the one-atom base.") (\\ADDBASE 
-|\\OneCharAtomBase| N)))) (\\\, NUM))))
-(I.S.OPR (QUOTE |inpname|) NIL (QUOTE (SUBPAIR (QUOTE ($$END $$BODY $$FATP $$BASE $$OFFSET)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (BQUOTE (|bind| $$OFFSET _ 0 
-$$BODY _ BODY $$BASE $$END $$FATP |declare| (LOCALVARS $$END $$BODY $$FATP $$BASE $$OFFSET) |first| (
-PROG NIL $$RETRY (COND ((STRINGP $$BODY) (SETQ $$BASE (|ffetch| (STRINGP BASE) |of| $$BODY)) (SETQ 
-$$OFFSET (SUB1 (|ffetch| (STRINGP OFFST) |of| $$BODY))) (SETQ $$END (IPLUS $$OFFSET (|ffetch| (STRINGP
- LENGTH) |of| $$BODY))) (SETQ $$FATP (|ffetch| (STRINGP FATSTRINGP) |of| $$BODY))) ((LITATOM $$BODY) (
-SETQ $$BASE (|ffetch| (LITATOM PNAMEBASE) |of| $$BODY)) (SETQ $$END (|ffetch| (PNAMEBASE PNAMELENGTH) 
-|of| $$BASE)) (SETQ $$FATP (|ffetch| (LITATOM FATPNAMEP) |of| $$BODY))) (T (SETQ $$BODY (MKSTRING 
-$$BODY)) (GO $$RETRY)))) |eachtime| (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (
-GO $$OUT)) (SETQ I.V. (COND ($$FATP (\\GETBASEFAT $$BASE $$OFFSET)) (T (\\GETBASETHIN $$BASE $$OFFSET)
-))))))) T)
-(I.S.OPR (QUOTE |inatom|) NIL (QUOTE (SUBPAIR (QUOTE ($$OFFSET $$BODY $$BASE $$END $$FATP)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (|bind| $$OFFSET _ 0 
-$$BODY _ BODY $$BASE $$END $$FATP |declare| (LOCALVARS $$OFFSET $$BODY $$BASE $$END $$FATP) |first| (
-SETQ $$BASE (|ffetch| (LITATOM PNAMEBASE) |of| $$BODY)) (SETQ $$END (|ffetch| (PNAMEBASE PNAMELENGTH) 
-|of| $$BASE)) (SETQ $$FATP (|ffetch| (LITATOM FATPNAMEP) |of| $$BODY)) |eachtime| (SETQ $$OFFSET (ADD1
- $$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (COND ($$FATP (\\GETBASEFAT $$BASE 
-$$OFFSET)) (T (\\GETBASETHIN $$BASE $$OFFSET)))))))) T)
-(I.S.OPR (QUOTE |instring|) NIL (QUOTE (SUBPAIR (QUOTE ($$BODY $$END $$OFFSET $$BASE $$FATP)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (|bind| $$BODY _ BODY 
-$$END $$OFFSET $$BASE $$FATP |declare| (LOCALVARS $$BODY $$END $$OFFSET $$BASE $$FATP) |first| (SETQ 
-$$OFFSET (SUB1 (|ffetch| (STRINGP OFFST) |of| $$BODY))) (SETQ $$BASE (|ffetch| (STRINGP BASE) |of| 
-$$BODY)) (SETQ $$END (IPLUS $$OFFSET (|ffetch| (STRINGP LENGTH) |of| $$BODY))) (SETQ $$FATP (|ffetch| 
-(STRINGP FATSTRINGP) |of| $$BODY)) |eachtime| (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET
- $$END) (GO $$OUT)) (SETQ I.V. (COND ($$FATP (\\GETBASEFAT $$BASE $$OFFSET)) (T (\\GETBASETHIN $$BASE 
-$$OFFSET)))))))) T)
-(I.S.OPR (QUOTE |infatatom|) NIL (QUOTE (SUBPAIR (QUOTE ($$OFFSET $$BODY $$BASE $$END)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (|bind| $$OFFSET _ 0 $$BODY _ BODY 
-$$BASE $$END |declare| (LOCALVARS $$OFFSET $$BODY $$BASE $$END) |first| (SETQ $$BASE (|ffetch| (
-LITATOM PNAMEBASE) |of| $$BODY)) (SETQ $$END (|ffetch| (PNAMEBASE PNAMELENGTH) |of| $$BASE)) 
-|eachtime| (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (
-\\GETBASEFAT $$BASE $$OFFSET)))))) T)
-(I.S.OPR (QUOTE |inthinatom|) NIL (QUOTE (SUBPAIR (QUOTE ($$OFFSET $$BODY $$BASE $$END)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (|bind| $$OFFSET _ 0 $$BODY _ BODY 
-$$BASE $$END |declare| (LOCALVARS $$OFFSET $$BODY $$BASE $$END) |first| (SETQ $$BASE (|ffetch| (
-LITATOM PNAMEBASE) |of| $$BODY)) (SETQ $$END (|ffetch| (PNAMEBASE PNAMELENGTH) |of| $$BASE)) 
-|eachtime| (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (
-\\GETBASETHIN $$BASE $$OFFSET)))))) T)
-(I.S.OPR (QUOTE |infatstring|) NIL (QUOTE (SUBPAIR (QUOTE ($$BODY $$END $$OFFSET $$BASE)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (|bind| $$BODY _ BODY $$END $$OFFSET 
-$$BASE |declare| (LOCALVARS $$BODY $$END $$OFFSET $$BASE) |first| (SETQ $$OFFSET (SUB1 (|ffetch| (
-STRINGP OFFST) |of| $$BODY))) (SETQ $$BASE (|ffetch| (STRINGP BASE) |of| $$BODY)) (SETQ $$END (IPLUS 
-$$OFFSET (|ffetch| (STRINGP LENGTH) |of| $$BODY))) |eachtime| (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (
-IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (\\GETBASEFAT $$BASE $$OFFSET)))))) T)
-(I.S.OPR (QUOTE |inthinstring|) NIL (QUOTE (SUBPAIR (QUOTE ($$BODY $$END $$OFFSET $$BASE)) (LIST (
-GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (|bind| $$BODY _ BODY $$END $$OFFSET 
-$$BASE |declare| (LOCALVARS $$BODY $$END $$OFFSET $$BASE) |first| (SETQ $$OFFSET (SUB1 (|ffetch| (
-STRINGP OFFST) |of| $$BODY))) (SETQ $$BASE (|ffetch| (STRINGP BASE) |of| $$BODY)) (SETQ $$END (IPLUS 
-$$OFFSET (|ffetch| (STRINGP LENGTH) |of| $$BODY))) |eachtime| (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (
-IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (\\GETBASETHIN $$BASE $$OFFSET)))))) T)
-(PUTPROPS \\CHARCODEP DMACRO (OPENLAMBDA (X) (* \; 
-"used to also say (ILEQ X \\MAXFATCHAR), but that's implied by the first two clauses") (AND (SMALLP X)
- (IGEQ X 0))))
-(PUTPROPS \\FATCHARCODEP DMACRO (OPENLAMBDA (X) (* \; 
-"Used to also say (ILEQ X \\MAXFATCHAR), but that's implied by the first two clauses") (AND (SMALLP X)
- (IGREATERP X \\MAXTHINCHAR))))
-(PUTPROPS \\THINCHARCODEP DMACRO (OPENLAMBDA (X) (AND (SMALLP X) (IGEQ X 0) (ILEQ X \\MAXTHINCHAR))))
-(PUTPROPS \\GETBASEFAT MACRO (= . \\GETBASE))
-(PUTPROPS \\GETBASETHIN MACRO (= . \\GETBASEBYTE))
-(PUTPROPS \\PUTBASEFAT MACRO (= . \\PUTBASE))
-(PUTPROPS \\PUTBASETHIN MACRO (= . \\PUTBASEBYTE))
-(PUTPROPS \\PUTBASECHAR MACRO (OPENLAMBDA (FATP BASE OFFSET CODE) (COND (FATP (\\PUTBASEFAT BASE 
-OFFSET CODE)) (T (\\PUTBASETHIN BASE OFFSET CODE)))))
-(PUTPROPS \\GETBASECHAR MACRO ((FATP BASE N) (COND (FATP (\\GETBASEFAT BASE N)) (T (\\GETBASETHIN BASE
- N)))))
-(PUTPROPS \\CHARSET MACRO ((CHARCODE) (LRSH CHARCODE 8)))
-(PUTPROPS \\CHAR8CODE MACRO ((CHARCODE) (LOGAND CHARCODE 255)))
-(RPAQQ \\CHARMASK 255)
-(RPAQQ \\MAXCHAR 255)
-(RPAQQ \\MAXTHINCHAR 255)
-(RPAQQ \\MAXFATCHAR 65535)
-(RPAQQ \\MAXCHARSET 255)
-(RPAQQ \#STRINGPWORDS 4)
-(CONSTANTS (\\CHARMASK 255) (\\MAXCHAR 255) (\\MAXTHINCHAR 255) (\\MAXFATCHAR 65535) (\\MAXCHARSET 255
-) (\#STRINGPWORDS 4))
-(PUTPROPS \\NATOMCHARS DMACRO ((AT) (|fetch| (LITATOM PNAMELENGTH) |of| AT)))
-(PUTPROPS \\NSTRINGCHARS DMACRO ((S) (|fetch| (STRINGP LENGTH) |of| S)))
+IGREATERP N (CHARCODE 9)) (\ADDBASE \OneCharAtomBase (IDIFFERENCE N 10))) ((IGEQ N (CHARCODE 0)) (
+IDIFFERENCE N (CHARCODE 0))) (T (* ; "The common case -- just add on the one-atom base.") (\ADDBASE 
+\OneCharAtomBase N)))) (\, NUM))))
+(I.S.OPR (QUOTE inpname) NIL (QUOTE (SUBPAIR (QUOTE ($$END $$BODY $$FATP $$BASE $$OFFSET)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (BQUOTE (bind $$OFFSET _ 0 
+$$BODY _ BODY $$BASE $$END $$FATP declare (LOCALVARS $$END $$BODY $$FATP $$BASE $$OFFSET) first (PROG 
+NIL $$RETRY (COND ((STRINGP $$BODY) (SETQ $$BASE (ffetch (STRINGP BASE) of $$BODY)) (SETQ $$OFFSET (
+SUB1 (ffetch (STRINGP OFFST) of $$BODY))) (SETQ $$END (IPLUS $$OFFSET (ffetch (STRINGP LENGTH) of 
+$$BODY))) (SETQ $$FATP (ffetch (STRINGP FATSTRINGP) of $$BODY))) ((LITATOM $$BODY) (SETQ $$BASE (
+ffetch (LITATOM PNAMEBASE) of $$BODY)) (SETQ $$END (ffetch (PNAMEBASE PNAMELENGTH) of $$BASE)) (SETQ 
+$$FATP (ffetch (LITATOM FATPNAMEP) of $$BODY))) (T (SETQ $$BODY (MKSTRING $$BODY)) (GO $$RETRY)))) 
+eachtime (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (COND 
+($$FATP (\GETBASEFAT $$BASE $$OFFSET)) (T (\GETBASETHIN $$BASE $$OFFSET)))))))) T)
+(I.S.OPR (QUOTE inatom) NIL (QUOTE (SUBPAIR (QUOTE ($$OFFSET $$BODY $$BASE $$END $$FATP)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (bind $$OFFSET _ 0 $$BODY
+ _ BODY $$BASE $$END $$FATP declare (LOCALVARS $$OFFSET $$BODY $$BASE $$END $$FATP) first (SETQ $$BASE
+ (ffetch (LITATOM PNAMEBASE) of $$BODY)) (SETQ $$END (ffetch (PNAMEBASE PNAMELENGTH) of $$BASE)) (SETQ
+ $$FATP (ffetch (LITATOM FATPNAMEP) of $$BODY)) eachtime (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (
+IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (COND ($$FATP (\GETBASEFAT $$BASE $$OFFSET)) (T (
+\GETBASETHIN $$BASE $$OFFSET)))))))) T)
+(I.S.OPR (QUOTE instring) NIL (QUOTE (SUBPAIR (QUOTE ($$BODY $$END $$OFFSET $$BASE $$FATP)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (bind $$BODY _ BODY $$END
+ $$OFFSET $$BASE $$FATP declare (LOCALVARS $$BODY $$END $$OFFSET $$BASE $$FATP) first (SETQ $$OFFSET (
+SUB1 (ffetch (STRINGP OFFST) of $$BODY))) (SETQ $$BASE (ffetch (STRINGP BASE) of $$BODY)) (SETQ $$END 
+(IPLUS $$OFFSET (ffetch (STRINGP LENGTH) of $$BODY))) (SETQ $$FATP (ffetch (STRINGP FATSTRINGP) of 
+$$BODY)) eachtime (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ 
+I.V. (COND ($$FATP (\GETBASEFAT $$BASE $$OFFSET)) (T (\GETBASETHIN $$BASE $$OFFSET)))))))) T)
+(I.S.OPR (QUOTE infatatom) NIL (QUOTE (SUBPAIR (QUOTE ($$OFFSET $$BODY $$BASE $$END)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (bind $$OFFSET _ 0 $$BODY _ BODY $$BASE
+ $$END declare (LOCALVARS $$OFFSET $$BODY $$BASE $$END) first (SETQ $$BASE (ffetch (LITATOM PNAMEBASE)
+ of $$BODY)) (SETQ $$END (ffetch (PNAMEBASE PNAMELENGTH) of $$BASE)) eachtime (SETQ $$OFFSET (ADD1 
+$$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (\GETBASEFAT $$BASE $$OFFSET)))))) T
+)
+(I.S.OPR (QUOTE inthinatom) NIL (QUOTE (SUBPAIR (QUOTE ($$OFFSET $$BODY $$BASE $$END)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (bind $$OFFSET _ 0 $$BODY _ BODY $$BASE
+ $$END declare (LOCALVARS $$OFFSET $$BODY $$BASE $$END) first (SETQ $$BASE (ffetch (LITATOM PNAMEBASE)
+ of $$BODY)) (SETQ $$END (ffetch (PNAMEBASE PNAMELENGTH) of $$BASE)) eachtime (SETQ $$OFFSET (ADD1 
+$$OFFSET)) (AND (IGREATERP $$OFFSET $$END) (GO $$OUT)) (SETQ I.V. (\GETBASETHIN $$BASE $$OFFSET)))))) 
+T)
+(I.S.OPR (QUOTE infatstring) NIL (QUOTE (SUBPAIR (QUOTE ($$BODY $$END $$OFFSET $$BASE)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (bind $$BODY _ BODY $$END $$OFFSET 
+$$BASE declare (LOCALVARS $$BODY $$END $$OFFSET $$BASE) first (SETQ $$OFFSET (SUB1 (ffetch (STRINGP 
+OFFST) of $$BODY))) (SETQ $$BASE (ffetch (STRINGP BASE) of $$BODY)) (SETQ $$END (IPLUS $$OFFSET (
+ffetch (STRINGP LENGTH) of $$BODY))) eachtime (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET
+ $$END) (GO $$OUT)) (SETQ I.V. (\GETBASEFAT $$BASE $$OFFSET)))))) T)
+(I.S.OPR (QUOTE inthinstring) NIL (QUOTE (SUBPAIR (QUOTE ($$BODY $$END $$OFFSET $$BASE)) (LIST (
+GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR) (GETDUMMYVAR)) (QUOTE (bind $$BODY _ BODY $$END $$OFFSET 
+$$BASE declare (LOCALVARS $$BODY $$END $$OFFSET $$BASE) first (SETQ $$OFFSET (SUB1 (ffetch (STRINGP 
+OFFST) of $$BODY))) (SETQ $$BASE (ffetch (STRINGP BASE) of $$BODY)) (SETQ $$END (IPLUS $$OFFSET (
+ffetch (STRINGP LENGTH) of $$BODY))) eachtime (SETQ $$OFFSET (ADD1 $$OFFSET)) (AND (IGREATERP $$OFFSET
+ $$END) (GO $$OUT)) (SETQ I.V. (\GETBASETHIN $$BASE $$OFFSET)))))) T)
+(PUTPROPS \CHARCODEP DMACRO (OPENLAMBDA (X) (* ; 
+"used to also say (ILEQ X \MAXFATCHAR), but that's implied by the first two clauses") (AND (SMALLP X) 
+(IGEQ X 0))))
+(PUTPROPS \FATCHARCODEP DMACRO (OPENLAMBDA (X) (* ; 
+"Used to also say (ILEQ X \MAXFATCHAR), but that's implied by the first two clauses") (AND (SMALLP X) 
+(IGREATERP X \MAXTHINCHAR))))
+(PUTPROPS \THINCHARCODEP DMACRO (OPENLAMBDA (X) (AND (SMALLP X) (IGEQ X 0) (ILEQ X \MAXTHINCHAR))))
+(PUTPROPS \GETBASEFAT MACRO (= . \GETBASE))
+(PUTPROPS \GETBASETHIN MACRO (= . \GETBASEBYTE))
+(PUTPROPS \PUTBASEFAT MACRO (= . \PUTBASE))
+(PUTPROPS \PUTBASETHIN MACRO (= . \PUTBASEBYTE))
+(PUTPROPS \PUTBASECHAR MACRO (OPENLAMBDA (FATP BASE OFFSET CODE) (COND (FATP (\PUTBASEFAT BASE OFFSET 
+CODE)) (T (\PUTBASETHIN BASE OFFSET CODE)))))
+(PUTPROPS \GETBASECHAR MACRO ((FATP BASE N) (COND (FATP (\GETBASEFAT BASE N)) (T (\GETBASETHIN BASE N)
+))))
+(PUTPROPS \CHARSET MACRO ((CHARCODE) (LRSH CHARCODE 8)))
+(PUTPROPS \CHAR8CODE MACRO ((CHARCODE) (LOGAND CHARCODE 255)))
+(RPAQQ \CHARMASK 255)
+(RPAQQ \MAXCHAR 255)
+(RPAQQ \MAXTHINCHAR 255)
+(RPAQQ \MAXFATCHAR 65535)
+(RPAQQ \MAXCHARSET 255)
+(RPAQQ %#STRINGPWORDS 4)
+(CONSTANTS (\CHARMASK 255) (\MAXCHAR 255) (\MAXTHINCHAR 255) (\MAXFATCHAR 65535) (\MAXCHARSET 255) (
+%#STRINGPWORDS 4))
+(PUTPROPS \NATOMCHARS DMACRO ((AT) (fetch (LITATOM PNAMELENGTH) of AT)))
+(PUTPROPS \NSTRINGCHARS DMACRO ((S) (fetch (STRINGP LENGTH) of S)))
 (PUTPROP (QUOTE LLCHAR) (QUOTE IMPORTDATE) (IDATE "21-Jun-2021 18:08:19"))
 
-(ACCESSFNS BF ((BFBLOCK (ADDSTACKBASE DATUM))) (* \; "basic frame pointer") (BLOCKRECORD BFBLOCK ((
-FLAGS BITS 3) (NIL BITS 3) (RESIDUAL FLAG) (* \; "true if this is not a full BF") (PADDING BITS 1) (
-USECNT BITS 8) (IVAR WORD))) (TYPE? (IEQ (|fetch| (BF FLAGS) |of| DATUM) \\STK.BF)) (ACCESSFNS BF ((
-NARGS (IDIFFERENCE (FOLDLO (IDIFFERENCE DATUM (|fetch| (BF IVAR) |of| DATUM)) WORDSPERCELL) (|fetch| (
-BF PADDING) |of| DATUM))) (SIZE (IPLUS 2 (IDIFFERENCE DATUM (|fetch| (BF IVAR) |of| DATUM)))) (CHECKED
- (AND (|type?| BF DATUM) (|for| I |from| (|fetch| (BF IVAR) |of| DATUM) |to| (IDIFFERENCE DATUM 2) 
-|by| 2 |always| (IEQ \\STK.NOTFLAG (|fetch| (BF FLAGS) |of| I))))))))
-(ACCESSFNS FX ((FXBLOCK (ADDSTACKBASE DATUM))) (* \; "frame extension index") (BLOCKRECORD FXBLOCK ((
-FLAGS BITS 3) (* \; "= \\STK.FX") (FAST FLAG) (NIL FLAG) (INCALL FLAG) (* \; 
-"set when fncall microcode has to punt") (VALIDNAMETABLE FLAG) (* \; 
-"if on, NAMETABLE field is filled in.  If off, is same as FNHEADER") (NOPUSH FLAG) (* \; 
-"when returning to this frame, don't push a value.  Set by interrupt code") (USECNT BITS 8) (\#ALINK 
-WORD) (* \; "low bit is SLOWP") (FNHEADER FULLXPOINTER) (NEXTBLOCK WORD) (PC WORD) (NAMETABLE# 
-FULLXPOINTER) (\#BLINK WORD) (\#CLINK WORD))) (BLOCKRECORD FXBLOCK ((FLAGBYTE BYTE) (NIL BYTE) (NIL 
-BITS 15) (* \; "most of the bits of #ALINK") (SLOWP FLAG) (* \; 
+(ACCESSFNS BF ((BFBLOCK (ADDSTACKBASE DATUM))) (* ; "basic frame pointer") (BLOCKRECORD BFBLOCK ((
+FLAGS BITS 3) (NIL BITS 3) (RESIDUAL FLAG) (* ; "true if this is not a full BF") (PADDING BITS 1) (
+USECNT BITS 8) (IVAR WORD))) (TYPE? (IEQ (fetch (BF FLAGS) of DATUM) \STK.BF)) (ACCESSFNS BF ((NARGS (
+IDIFFERENCE (FOLDLO (IDIFFERENCE DATUM (fetch (BF IVAR) of DATUM)) WORDSPERCELL) (fetch (BF PADDING) 
+of DATUM))) (SIZE (IPLUS 2 (IDIFFERENCE DATUM (fetch (BF IVAR) of DATUM)))) (CHECKED (AND (type? BF 
+DATUM) (for I from (fetch (BF IVAR) of DATUM) to (IDIFFERENCE DATUM 2) by 2 always (IEQ \STK.NOTFLAG (
+fetch (BF FLAGS) of I))))))))
+(ACCESSFNS FX ((FXBLOCK (ADDSTACKBASE DATUM))) (* ; "frame extension index") (BLOCKRECORD FXBLOCK ((
+FLAGS BITS 3) (* ; "= \STK.FX") (FAST FLAG) (NIL FLAG) (INCALL FLAG) (* ; 
+"set when fncall microcode has to punt") (VALIDNAMETABLE FLAG) (* ; 
+"if on, NAMETABLE field is filled in.  If off, is same as FNHEADER") (NOPUSH FLAG) (* ; 
+"when returning to this frame, don't push a value.  Set by interrupt code") (USECNT BITS 8) (%#ALINK 
+WORD) (* ; "low bit is SLOWP") (FNHEADER FULLXPOINTER) (NEXTBLOCK WORD) (PC WORD) (NAMETABLE# 
+FULLXPOINTER) (%#BLINK WORD) (%#CLINK WORD))) (BLOCKRECORD FXBLOCK ((FLAGBYTE BYTE) (NIL BYTE) (NIL 
+BITS 15) (* ; "most of the bits of #ALINK") (SLOWP FLAG) (* ; 
 "if on, then BLINK and CLINK fields are valid.  If off, they are implicit") (NIL FULLXPOINTER 2) (
-NAMETABHI WORD) (NAMETABLO WORD))) (TYPE? (IEQ (|fetch| (FX FLAGS) |of| DATUM) \\STK.FX)) (ACCESSFNS 
-FX ((NAMETABLE (COND ((|fetch| (FX VALIDNAMETABLE) |of| DATUM) (|fetch| (FX NAMETABLE#) |of| DATUM)) (
-T (|fetch| (FX FNHEADER) |of| DATUM))) (PROGN (|replace| (FX FAST) |of| DATUM |with| NIL) (|replace| (
-FX NAMETABLE#) |of| DATUM |with| NEWVALUE) (|replace| (FX VALIDNAMETABLE) |of| DATUM |with| T))) (
-FRAMENAME (|fetch| (FNHEADER FRAMENAME) |of| (|fetch| (FX NAMETABLE) |of| DATUM))) (INVALIDP (EQ DATUM
- 0)) (* \; "true when A/CLink points at nobody, i.e. FX is bottom of stack") (FASTP (NOT (|fetch| (FX 
-SLOWP) |of| DATUM)) (PROGN (CHECK (NULL NEWVALUE)) (COND ((|fetch| (FX FASTP) |of| DATUM) (|replace| (
-FX \#BLINK) |of| DATUM |with| (|fetch| (FX DUMMYBF) |of| DATUM)) (|replace| (FX \#CLINK) |of| DATUM 
-|with| (|fetch| (FX \#ALINK) |of| DATUM)) (|replace| (FX SLOWP) |of| DATUM |with| T))))) (BLINK (COND 
-((|fetch| (FX FASTP) |of| DATUM) (|fetch| (FX DUMMYBF) |of| DATUM)) (T (|fetch| (FX \#BLINK) |of| 
-DATUM))) (PROGN (|replace| (FX \#BLINK) |of| DATUM |with| NEWVALUE) (COND ((|fetch| (FX FASTP) |of| 
-DATUM) (|replace| (FX \#CLINK) |of| DATUM |with| (|fetch| (FX \#ALINK) |of| DATUM)) (|replace| (FX 
-SLOWP) |of| DATUM |with| T))))) (CLINK (IDIFFERENCE (COND ((|fetch| (FX FASTP) |of| DATUM) (|fetch| (
-FX \#ALINK) |of| DATUM)) (T (|fetch| (FX \#CLINK) |of| DATUM))) \\#ALINK.OFFSET) (PROGN (|replace| (FX
- \#CLINK) |of| DATUM |with| (IPLUS NEWVALUE \\#ALINK.OFFSET)) (COND ((|fetch| (FX FASTP) |of| DATUM) (
-|replace| (FX \#BLINK) |of| DATUM |with| (|fetch| (FX DUMMYBF) |of| DATUM)) (|replace| (FX SLOWP) |of|
- DATUM |with| T))))) (ALINK (IDIFFERENCE (FLOOR (|fetch| (FX \#ALINK) |of| DATUM) WORDSPERCELL) 
-\\#ALINK.OFFSET) (PROGN (COND ((|fetch| (FX FASTP) |of| DATUM) (|replace| (FX \#BLINK) |of| DATUM 
-|with| (|fetch| (FX DUMMYBF) |of| DATUM)) (|replace| (FX \#CLINK) |of| DATUM |with| (|fetch| (FX 
-\#ALINK) |of| DATUM)))) (|replace| (FX \#ALINK) |of| DATUM |with| (IPLUS NEWVALUE \\#ALINK.OFFSET (
-SUB1 WORDSPERCELL))))) (ACLINK (SHOULDNT) (PROGN (COND ((|fetch| (FX FASTP) |of| DATUM) (|replace| (FX
- \#BLINK) |of| DATUM |with| (|fetch| (FX DUMMYBF) |of| DATUM)))) (|replace| (FX \#CLINK) |of| DATUM 
-|with| (IPLUS NEWVALUE \\#ALINK.OFFSET)) (|replace| (FX \#ALINK) |of| DATUM |with| (IPLUS NEWVALUE 
-\\#ALINK.OFFSET (SUB1 WORDSPERCELL))))) (* \; 
+NAMETABHI WORD) (NAMETABLO WORD))) (TYPE? (IEQ (fetch (FX FLAGS) of DATUM) \STK.FX)) (ACCESSFNS FX ((
+NAMETABLE (COND ((fetch (FX VALIDNAMETABLE) of DATUM) (fetch (FX NAMETABLE#) of DATUM)) (T (fetch (FX 
+FNHEADER) of DATUM))) (PROGN (replace (FX FAST) of DATUM with NIL) (replace (FX NAMETABLE#) of DATUM 
+with NEWVALUE) (replace (FX VALIDNAMETABLE) of DATUM with T))) (FRAMENAME (fetch (FNHEADER FRAMENAME) 
+of (fetch (FX NAMETABLE) of DATUM))) (INVALIDP (EQ DATUM 0)) (* ; 
+"true when A/CLink points at nobody, i.e. FX is bottom of stack") (FASTP (NOT (fetch (FX SLOWP) of 
+DATUM)) (PROGN (CHECK (NULL NEWVALUE)) (COND ((fetch (FX FASTP) of DATUM) (replace (FX %#BLINK) of 
+DATUM with (fetch (FX DUMMYBF) of DATUM)) (replace (FX %#CLINK) of DATUM with (fetch (FX %#ALINK) of 
+DATUM)) (replace (FX SLOWP) of DATUM with T))))) (BLINK (COND ((fetch (FX FASTP) of DATUM) (fetch (FX 
+DUMMYBF) of DATUM)) (T (fetch (FX %#BLINK) of DATUM))) (PROGN (replace (FX %#BLINK) of DATUM with 
+NEWVALUE) (COND ((fetch (FX FASTP) of DATUM) (replace (FX %#CLINK) of DATUM with (fetch (FX %#ALINK) 
+of DATUM)) (replace (FX SLOWP) of DATUM with T))))) (CLINK (IDIFFERENCE (COND ((fetch (FX FASTP) of 
+DATUM) (fetch (FX %#ALINK) of DATUM)) (T (fetch (FX %#CLINK) of DATUM))) \#ALINK.OFFSET) (PROGN (
+replace (FX %#CLINK) of DATUM with (IPLUS NEWVALUE \#ALINK.OFFSET)) (COND ((fetch (FX FASTP) of DATUM)
+ (replace (FX %#BLINK) of DATUM with (fetch (FX DUMMYBF) of DATUM)) (replace (FX SLOWP) of DATUM with 
+T))))) (ALINK (IDIFFERENCE (FLOOR (fetch (FX %#ALINK) of DATUM) WORDSPERCELL) \#ALINK.OFFSET) (PROGN (
+COND ((fetch (FX FASTP) of DATUM) (replace (FX %#BLINK) of DATUM with (fetch (FX DUMMYBF) of DATUM)) (
+replace (FX %#CLINK) of DATUM with (fetch (FX %#ALINK) of DATUM)))) (replace (FX %#ALINK) of DATUM 
+with (IPLUS NEWVALUE \#ALINK.OFFSET (SUB1 WORDSPERCELL))))) (ACLINK (SHOULDNT) (PROGN (COND ((fetch (
+FX FASTP) of DATUM) (replace (FX %#BLINK) of DATUM with (fetch (FX DUMMYBF) of DATUM)))) (replace (FX 
+%#CLINK) of DATUM with (IPLUS NEWVALUE \#ALINK.OFFSET)) (replace (FX %#ALINK) of DATUM with (IPLUS 
+NEWVALUE \#ALINK.OFFSET (SUB1 WORDSPERCELL))))) (* ; 
 "replaces A & C Links at once more efficiently than separately") (DUMMYBF (IDIFFERENCE DATUM 
-WORDSPERCELL)) (* |;;| 
-"This is either an actual BF or \"residual\" BF that provides enough BF to find its IVAR slot.  This means that when a FX is copied, the cell preceding the FX is copied too."
-) (IVAR (|fetch| (BF IVAR) |of| (|fetch| (FX DUMMYBF) |of| DATUM))) (CHECKED (AND (|type?| FX DATUM) (
-OR (IEQ (|fetch| (FX DUMMYBF) |of| DATUM) (|fetch| (FX BLINK) |of| DATUM)) (AND (|fetch| (BF RESIDUAL)
- |of| (|fetch| (FX DUMMYBF) |of| DATUM)) (IEQ (|fetch| (BF IVAR) |of| (|fetch| (FX DUMMYBF) |of| DATUM
-)) (|fetch| (BF IVAR) |of| (|fetch| (FX BLINK) |of| DATUM))))))) (FIRSTPVAR (IPLUS DATUM (|fetch| (FX 
-FXSIZE) |of| T))) (* \; "stack offset of PVAR0") (FXSIZE (PROGN 10)) (* \; 
-"fixed overhead from flags thru clink") (PADDING (PROGN 4)) (* \; 
-"doublecell of garbage for microcode use") (FIRSTTEMP (IPLUS (|fetch| (FX FIRSTPVAR) |of| DATUM) (
-|fetch| (FX NPVARWORDS) |of| DATUM) (|fetch| (FX PADDING) |of| DATUM))) (* \; 
-"note that NPVARWORDS is obtained from the FNHEADER") (SIZE (IDIFFERENCE (|fetch| (FX NEXTBLOCK) |of| 
+WORDSPERCELL)) (* ;; 
+"This is either an actual BF or %"residual%" BF that provides enough BF to find its IVAR slot.  This means that when a FX is copied, the cell preceding the FX is copied too."
+) (IVAR (fetch (BF IVAR) of (fetch (FX DUMMYBF) of DATUM))) (CHECKED (AND (type? FX DATUM) (OR (IEQ (
+fetch (FX DUMMYBF) of DATUM) (fetch (FX BLINK) of DATUM)) (AND (fetch (BF RESIDUAL) of (fetch (FX 
+DUMMYBF) of DATUM)) (IEQ (fetch (BF IVAR) of (fetch (FX DUMMYBF) of DATUM)) (fetch (BF IVAR) of (fetch
+ (FX BLINK) of DATUM))))))) (FIRSTPVAR (IPLUS DATUM (fetch (FX FXSIZE) of T))) (* ; 
+"stack offset of PVAR0") (FXSIZE (PROGN 10)) (* ; "fixed overhead from flags thru clink") (PADDING (
+PROGN 4)) (* ; "doublecell of garbage for microcode use") (FIRSTTEMP (IPLUS (fetch (FX FIRSTPVAR) of 
+DATUM) (fetch (FX NPVARWORDS) of DATUM) (fetch (FX PADDING) of DATUM))) (* ; 
+"note that NPVARWORDS is obtained from the FNHEADER") (SIZE (IDIFFERENCE (fetch (FX NEXTBLOCK) of 
 DATUM) DATUM)))))
-(ACCESSFNS FSB (* |;;| "FREE STACK BLOCK -- ") (* |;;| " A piece of stack space that's free.") (* |;;|
- "The first word contains 120000Q") (* |;;| "The 2nd word is the size of the block, in words.") ((
-FSBBLOCK (ADDSTACKBASE DATUM)) (CHECKED (IEQ (|fetch| (FSB FLAGWORD) |of| DATUM) \\STK.FSB.WORD))) (
+(ACCESSFNS FSB (* ;; "FREE STACK BLOCK -- ") (* ;; " A piece of stack space that's free.") (* ;; 
+"The first word contains 120000Q") (* ;; "The 2nd word is the size of the block, in words.") ((
+FSBBLOCK (ADDSTACKBASE DATUM)) (CHECKED (IEQ (fetch (FSB FLAGWORD) of DATUM) \STK.FSB.WORD))) (
 BLOCKRECORD FSBBLOCK ((FLAGS BITS 3) (DUMMY BITS 13) (SIZE WORD))) (BLOCKRECORD FSBBLOCK ((FLAGWORD 
-WORD) (SIZE WORD))) (* \; "free stack block") (TYPE? (IEQ (|fetch| (FSB FLAGS) |of| DATUM) \\STK.FSB))
-)
-(ACCESSFNS STK ((STKBLOCK (ADDSTACKBASE DATUM))) (* \; "unspecified stack block") (BLOCKRECORD 
-STKBLOCK ((FLAGS BITS 3))) (BLOCKRECORD STKBLOCK ((FLAGWORD WORD))))
-(RPAQQ \\#ALINK.OFFSET 10)
-(CONSTANTS \\#ALINK.OFFSET)
-(GLOBALVARS \\PENDINGINTERRUPT \\KBDSTACKBASE \\MISCSTACKBASE \\STACKOVERFLOW)
-(PUTPROPS \\MYALINK DMACRO (NIL ((OPCODES MYALINK))))
+WORD) (SIZE WORD))) (* ; "free stack block") (TYPE? (IEQ (fetch (FSB FLAGS) of DATUM) \STK.FSB)))
+(ACCESSFNS STK ((STKBLOCK (ADDSTACKBASE DATUM))) (* ; "unspecified stack block") (BLOCKRECORD STKBLOCK
+ ((FLAGS BITS 3))) (BLOCKRECORD STKBLOCK ((FLAGWORD WORD))))
+(RPAQQ \#ALINK.OFFSET 10)
+(CONSTANTS \#ALINK.OFFSET)
+(GLOBALVARS \PENDINGINTERRUPT \KBDSTACKBASE \MISCSTACKBASE \STACKOVERFLOW)
+(PUTPROPS \MYALINK DMACRO (NIL ((OPCODES MYALINK))))
 (PUTPROPS ADDSTACKBASE DMACRO (= . STACKADDBASE))
-(PUTPROPS STACKADDBASE DMACRO ((N) (VAG2 \\STACKHI N)))
-(PUTPROPS STACKGETBASE DMACRO ((N) (\\GETBASE (STACKADDBASE N) 0)))
-(PUTPROPS STACKGETBASEPTR DMACRO ((N) (\\GETBASEPTR (STACKADDBASE N) 0)))
-(PUTPROPS STACKPUTBASE DMACRO ((N V) (\\PUTBASE (STACKADDBASE N) 0 V)))
-(PUTPROPS STACKPUTBASEPTR DMACRO ((N V) (\\PUTBASEPTR (STACKADDBASE N) 0 V)))
-(PUTPROPS \\MISCAPPLY* MACRO ((FN ARG1 ARG2) (UNINTERRUPTABLY (|replace| (IFPAGE MISCSTACKFN) |of| 
-|\\InterfacePage| |with| FN) (|replace| (IFPAGE MISCSTACKARG1) |of| |\\InterfacePage| |with| ARG1) (
-|replace| (IFPAGE MISCSTACKARG2) |of| |\\InterfacePage| |with| ARG2) (\\CONTEXTSWITCH |\\MiscFXP|) (
-|fetch| (IFPAGE MISCSTACKRESULT) |of| |\\InterfacePage|))))
+(PUTPROPS STACKADDBASE DMACRO ((N) (VAG2 \STACKHI N)))
+(PUTPROPS STACKGETBASE DMACRO ((N) (\GETBASE (STACKADDBASE N) 0)))
+(PUTPROPS STACKGETBASEPTR DMACRO ((N) (\GETBASEPTR (STACKADDBASE N) 0)))
+(PUTPROPS STACKPUTBASE DMACRO ((N V) (\PUTBASE (STACKADDBASE N) 0 V)))
+(PUTPROPS STACKPUTBASEPTR DMACRO ((N V) (\PUTBASEPTR (STACKADDBASE N) 0 V)))
+(PUTPROPS \MISCAPPLY* MACRO ((FN ARG1 ARG2) (UNINTERRUPTABLY (replace (IFPAGE MISCSTACKFN) of 
+\InterfacePage with FN) (replace (IFPAGE MISCSTACKARG1) of \InterfacePage with ARG1) (replace (IFPAGE 
+MISCSTACKARG2) of \InterfacePage with ARG2) (\CONTEXTSWITCH \MiscFXP) (fetch (IFPAGE MISCSTACKRESULT) 
+of \InterfacePage))))
 (BLOCKRECORD STACKP ((STACKP0 WORD) (EDFXP WORD)) (BLOCKRECORD STACKP ((STACKPOINTER FULLXPOINTER))) (
 TYPE? (STACKP DATUM)))
-(RPAQQ STACKTYPES (\\STK.GUARD \\STK.FX \\STK.BF \\STK.NOTFLAG \\STK.FSB \\STK.FLAGS.SHIFT (
-\\STK.FSB.WORD (LLSH \\STK.FSB \\STK.FLAGS.SHIFT)) (\\STK.GUARD.WORD (LLSH \\STK.GUARD 
-\\STK.FLAGS.SHIFT)) (\\STK.BF.WORD (LLSH \\STK.BF \\STK.FLAGS.SHIFT))))
-(RPAQQ \\STK.GUARD 7)
-(RPAQQ \\STK.FX 6)
-(RPAQQ \\STK.BF 4)
-(RPAQQ \\STK.NOTFLAG 0)
-(RPAQQ \\STK.FSB 5)
-(RPAQQ \\STK.FLAGS.SHIFT 13)
-(RPAQ \\STK.FSB.WORD (LLSH \\STK.FSB \\STK.FLAGS.SHIFT))
-(RPAQ \\STK.GUARD.WORD (LLSH \\STK.GUARD \\STK.FLAGS.SHIFT))
-(RPAQ \\STK.BF.WORD (LLSH \\STK.BF \\STK.FLAGS.SHIFT))
-(CONSTANTS \\STK.GUARD \\STK.FX \\STK.BF \\STK.NOTFLAG \\STK.FSB \\STK.FLAGS.SHIFT (\\STK.FSB.WORD (
-LLSH \\STK.FSB \\STK.FLAGS.SHIFT)) (\\STK.GUARD.WORD (LLSH \\STK.GUARD \\STK.FLAGS.SHIFT)) (
-\\STK.BF.WORD (LLSH \\STK.BF \\STK.FLAGS.SHIFT)))
-(RPAQQ |\\StackAreaSize| 768)
-(RPAQ |\\InitStackSize| (ITIMES |\\StackAreaSize| 12))
-(CONSTANTS |\\StackAreaSize| (|\\InitStackSize| (ITIMES |\\StackAreaSize| 12)))
-(RPAQQ \\MAXSAFEUSECOUNT 200)
-(CONSTANTS \\MAXSAFEUSECOUNT)
+(RPAQQ STACKTYPES (\STK.GUARD \STK.FX \STK.BF \STK.NOTFLAG \STK.FSB \STK.FLAGS.SHIFT (\STK.FSB.WORD (
+LLSH \STK.FSB \STK.FLAGS.SHIFT)) (\STK.GUARD.WORD (LLSH \STK.GUARD \STK.FLAGS.SHIFT)) (\STK.BF.WORD (
+LLSH \STK.BF \STK.FLAGS.SHIFT))))
+(RPAQQ \STK.GUARD 7)
+(RPAQQ \STK.FX 6)
+(RPAQQ \STK.BF 4)
+(RPAQQ \STK.NOTFLAG 0)
+(RPAQQ \STK.FSB 5)
+(RPAQQ \STK.FLAGS.SHIFT 13)
+(RPAQ \STK.FSB.WORD (LLSH \STK.FSB \STK.FLAGS.SHIFT))
+(RPAQ \STK.GUARD.WORD (LLSH \STK.GUARD \STK.FLAGS.SHIFT))
+(RPAQ \STK.BF.WORD (LLSH \STK.BF \STK.FLAGS.SHIFT))
+(CONSTANTS \STK.GUARD \STK.FX \STK.BF \STK.NOTFLAG \STK.FSB \STK.FLAGS.SHIFT (\STK.FSB.WORD (LLSH 
+\STK.FSB \STK.FLAGS.SHIFT)) (\STK.GUARD.WORD (LLSH \STK.GUARD \STK.FLAGS.SHIFT)) (\STK.BF.WORD (LLSH 
+\STK.BF \STK.FLAGS.SHIFT)))
+(RPAQQ \StackAreaSize 768)
+(RPAQ \InitStackSize (ITIMES \StackAreaSize 12))
+(CONSTANTS \StackAreaSize (\InitStackSize (ITIMES \StackAreaSize 12)))
+(RPAQQ \MAXSAFEUSECOUNT 200)
+(CONSTANTS \MAXSAFEUSECOUNT)
 (BLOCKRECORD NAMETABLESLOT ((VARTYPE BYTE) (VAROFFSET BYTE)))
-(BLOCKRECORD FVARSLOT ((BINDLO WORD) (BINDHI WORD)) (ACCESSFNS FVARSLOT ((LOOKEDUP (EVENP (|fetch| 
-BINDLO |of| DATUM))) (BINDINGPTR (\\VAG2 (|fetch| BINDHI |of| DATUM) (|fetch| BINDLO |of| DATUM)) (
-PROGN (|replace| BINDLO |of| DATUM |with| (\\LOLOC NEWVALUE)) (|replace| BINDHI |of| DATUM |with| (
-\\HILOC NEWVALUE)))))))
-(BLOCKRECORD PVARSLOT ((PVHI BITS 4) (PVVALUE XPOINTER)) (ACCESSFNS PVARSLOT ((BOUND (EQ (|fetch| (
-PVARSLOT PVHI) |of| DATUM) 0) (|if| (NULL NEWVALUE) |then| (|replace| (PVARSLOT PVHI) |of| DATUM 
-|with| 255) |else| (ERROR "Illegal replace" NEWVALUE))))))
+(BLOCKRECORD FVARSLOT ((BINDLO WORD) (BINDHI WORD)) (ACCESSFNS FVARSLOT ((LOOKEDUP (EVENP (fetch 
+BINDLO of DATUM))) (BINDINGPTR (\VAG2 (fetch BINDHI of DATUM) (fetch BINDLO of DATUM)) (PROGN (replace
+ BINDLO of DATUM with (\LOLOC NEWVALUE)) (replace BINDHI of DATUM with (\HILOC NEWVALUE)))))))
+(BLOCKRECORD PVARSLOT ((PVHI BITS 4) (PVVALUE XPOINTER)) (ACCESSFNS PVARSLOT ((BOUND (EQ (fetch (
+PVARSLOT PVHI) of DATUM) 0) (if (NULL NEWVALUE) then (replace (PVARSLOT PVHI) of DATUM with 255) else 
+(ERROR "Illegal replace" NEWVALUE))))))
 (BLOCKRECORD STKTEMPSLOT ((STKTMPHI BITS 4) (VALUE XPOINTER)) (ACCESSFNS STKTEMPSLOT ((BINDINGPTRP (
-NEQ (|fetch| STKTMPHI |of| DATUM) 0)))))
+NEQ (fetch STKTMPHI of DATUM) 0)))))
 (BLOCKRECORD BINDMARKSLOT ((BINDMARKP FLAG) (NIL BITS 15)) (BLOCKRECORD BINDMARKSLOT ((BINDNEGVALUES 
-WORD) (BINDLASTPVAR WORD))) (ACCESSFNS BINDMARKSLOT ((BINDNVALUES (PROGN (* \; 
-"Value stored in high half is one's complement of number of values bound") (LOGXOR (|fetch| 
-BINDNEGVALUES |of| DATUM) 65535))))))
-(RPAQQ \\NT.IVAR 0)
-(RPAQQ \\NT.PVAR 128)
-(RPAQQ \\NT.FVAR 192)
-(CONSTANTS \\NT.IVAR \\NT.PVAR \\NT.FVAR)
+WORD) (BINDLASTPVAR WORD))) (ACCESSFNS BINDMARKSLOT ((BINDNVALUES (PROGN (* ; 
+"Value stored in high half is one's complement of number of values bound") (LOGXOR (fetch 
+BINDNEGVALUES of DATUM) 65535))))))
+(RPAQQ \NT.IVAR 0)
+(RPAQQ \NT.PVAR 128)
+(RPAQQ \NT.FVAR 192)
+(CONSTANTS \NT.IVAR \NT.PVAR \NT.FVAR)
 (PUTPROP (QUOTE LLSTK) (QUOTE IMPORTDATE) (IDATE " 6-Jan-1993 18:07:37"))
 
-(PUTPROPS WORDCONTENTS BYTEMACRO ((PTR) (\\GETBASE PTR 0)))
-(PUTPROPS SETWORDCONTENTS BYTEMACRO ((PTR N) (\\PUTBASE PTR 0 N)))
-(PUTPROPS WORDOFFSET BYTEMACRO ((PTR N) (\\ADDBASE PTR N)))
-(PUTPROPS \\RELEASECPAGE MACRO ((STREAM) (PROGN (* \; "Must be under an UNINTERRUPTABLY !") (COND ((
-|fetch| CBUFDIRTY |of| STREAM) (\\SETIODIRTY STREAM (|fetch| CPAGE |of| STREAM)) (|replace| CBUFDIRTY 
-|of| STREAM |with| NIL))) (|replace| CBUFSIZE |of| STREAM |with| 0) (|replace| CBUFPTR |of| STREAM 
-|with| NIL))))
+(PUTPROPS WORDCONTENTS BYTEMACRO ((PTR) (\GETBASE PTR 0)))
+(PUTPROPS SETWORDCONTENTS BYTEMACRO ((PTR N) (\PUTBASE PTR 0 N)))
+(PUTPROPS WORDOFFSET BYTEMACRO ((PTR N) (\ADDBASE PTR N)))
+(PUTPROPS \RELEASECPAGE MACRO ((STREAM) (PROGN (* ; "Must be under an UNINTERRUPTABLY !") (COND ((
+fetch CBUFDIRTY of STREAM) (\SETIODIRTY STREAM (fetch CPAGE of STREAM)) (replace CBUFDIRTY of STREAM 
+with NIL))) (replace CBUFSIZE of STREAM with 0) (replace CBUFPTR of STREAM with NIL))))
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE PMAP) (QUOTE IMPORTDATE) (IDATE "13-Aug-2021 23:55:35"))
+=======
 (PUTPROP (QUOTE PMAP) (QUOTE IMPORTDATE) (IDATE "23-Jun-2021 12:40:35"))
+>>>>>>> Stashed changes
 
-(PUTPROPS ADDREF MACRO (OPENLAMBDA (PTR) (PROG1 PTR (\\ADDREF PTR))))
-(PUTPROPS \\ADDREF DMACRO ((X) ((OPCODES GCREF 0) X)))
-(PUTPROPS DELETEREF MACRO (OPENLAMBDA (PTR) (PROG1 PTR (\\DELREF PTR))))
-(PUTPROPS \\DELREF DMACRO ((X) ((OPCODES GCREF 1) X)))
-(PUTPROPS SCANREF MACRO (= . \\STKREF))
-(PUTPROPS \\STKREF DMACRO ((X) ((OPCODES GCREF 2) X)))
-(PUTPROPS UNSCANREF MACRO ((PTR) (\\HTFIND PTR 3)))
-(PUTPROPS CREATEREF MACRO (= . \\CREATEREF))
-(PUTPROPS \\CREATEREF MACRO (OPENLAMBDA (PTR) (PROG1 (\\DELREF PTR) (.INCREMENT.ALLOCATION.COUNT. 1)))
-)
-(PUTPROPS .INCREMENT.ALLOCATION.COUNT. MACRO (OPENLAMBDA (N) (DECLARE (GLOBALVARS \\RECLAIM.COUNTDOWN)
-) (AND \\RECLAIM.COUNTDOWN (COND ((IGREATERP \\RECLAIM.COUNTDOWN N) (SETQ \\RECLAIM.COUNTDOWN (
-IDIFFERENCE \\RECLAIM.COUNTDOWN N))) (T (SETQ \\RECLAIM.COUNTDOWN) (\\DORECLAIM))))))
-(PUTPROPS .CHECK.ALLOCATION.COUNT. MACRO (OPENLAMBDA (N) (DECLARE (GLOBALVARS \\RECLAIM.COUNTDOWN)) (
-AND \\RECLAIM.COUNTDOWN (COND ((NOT (IGREATERP \\RECLAIM.COUNTDOWN N)) (SETQ \\RECLAIM.COUNTDOWN) (
-\\DORECLAIM))))))
-(PUTPROPS \\GCDISABLED MACRO (NIL (PROGN (DECLARE (GLOBALVARS \\GCDISABLED)) \\GCDISABLED)))
-(BLOCKRECORD HTOVERFLOW ((CASE BITS 4) (PTR XPOINTER)) (ACCESSFNS HTOVERFLOW ((CLEAR NIL (\\PUTBASEPTR
- DATUM 0 NIL)))))
+(PUTPROPS ADDREF MACRO (OPENLAMBDA (PTR) (PROG1 PTR (\ADDREF PTR))))
+(PUTPROPS \ADDREF DMACRO ((X) ((OPCODES GCREF 0) X)))
+(PUTPROPS DELETEREF MACRO (OPENLAMBDA (PTR) (PROG1 PTR (\DELREF PTR))))
+(PUTPROPS \DELREF DMACRO ((X) ((OPCODES GCREF 1) X)))
+(PUTPROPS SCANREF MACRO (= . \STKREF))
+(PUTPROPS \STKREF DMACRO ((X) ((OPCODES GCREF 2) X)))
+(PUTPROPS UNSCANREF MACRO ((PTR) (\HTFIND PTR 3)))
+(PUTPROPS CREATEREF MACRO (= . \CREATEREF))
+(PUTPROPS \CREATEREF MACRO (OPENLAMBDA (PTR) (PROG1 (\DELREF PTR) (.INCREMENT.ALLOCATION.COUNT. 1))))
+(PUTPROPS .INCREMENT.ALLOCATION.COUNT. MACRO (OPENLAMBDA (N) (DECLARE (GLOBALVARS \RECLAIM.COUNTDOWN))
+ (AND \RECLAIM.COUNTDOWN (COND ((IGREATERP \RECLAIM.COUNTDOWN N) (SETQ \RECLAIM.COUNTDOWN (IDIFFERENCE
+ \RECLAIM.COUNTDOWN N))) (T (SETQ \RECLAIM.COUNTDOWN) (\DORECLAIM))))))
+(PUTPROPS .CHECK.ALLOCATION.COUNT. MACRO (OPENLAMBDA (N) (DECLARE (GLOBALVARS \RECLAIM.COUNTDOWN)) (
+AND \RECLAIM.COUNTDOWN (COND ((NOT (IGREATERP \RECLAIM.COUNTDOWN N)) (SETQ \RECLAIM.COUNTDOWN) (
+\DORECLAIM))))))
+(PUTPROPS \GCDISABLED MACRO (NIL (PROGN (DECLARE (GLOBALVARS \GCDISABLED)) \GCDISABLED)))
+(BLOCKRECORD HTOVERFLOW ((CASE BITS 4) (PTR XPOINTER)) (ACCESSFNS HTOVERFLOW ((CLEAR NIL (\PUTBASEPTR 
+DATUM 0 NIL)))))
 (BLOCKRECORD GC ((CNT BITS 15) (STKBIT FLAG) (HIBITS BITS 15) (LINKP FLAG) (NXTPTR FIXP)) (BLOCKRECORD
- GC ((STKCNT WORD))) (ACCESSFNS GC ((EMPTY (EQ 0 (\\GETBASEFIXP DATUM 0)) (\\PUTBASEFIXP DATUM 0 0)) (
-CONTENTS (\\GETBASEFIXP DATUM 0) (\\PUTBASEFIXP DATUM 0 NEWVALUE)) (LINKPTR (LOGAND (\\GETBASEFIXP 
-DATUM 0) -2) (\\PUTBASEFIXP DATUM 0 (LOGOR NEWVALUE 1))))))
-(BLOCKRECORD HTCOLL ((* |;;| 
+ GC ((STKCNT WORD))) (ACCESSFNS GC ((EMPTY (EQ 0 (\GETBASEFIXP DATUM 0)) (\PUTBASEFIXP DATUM 0 0)) (
+CONTENTS (\GETBASEFIXP DATUM 0) (\PUTBASEFIXP DATUM 0 NEWVALUE)) (LINKPTR (LOGAND (\GETBASEFIXP DATUM 
+0) -2) (\PUTBASEFIXP DATUM 0 (LOGOR NEWVALUE 1))))))
+(BLOCKRECORD HTCOLL ((* ;; 
 "An entry in the GC collision table.  NEXTFREE is initialized to 2 by INITGC, as part of the MAKEINIT."
-) (FREEPTR FIXP) (* \; "The GC table entry") (NEXTFREE FIXP) (* \; 
+) (FREEPTR FIXP) (* ; "The GC table entry") (NEXTFREE FIXP) (* ; 
 "If the entry is in use, points to the next entry in this collision chain.  If not, offset (in 1/2-entries) of the next free one on the chain."
 )))
 (PUTPROP (QUOTE LLGC) (QUOTE IMPORTDATE) (IDATE "19-Oct-1994 12:30:11"))
 
-(PUTPROPS \\SYNCODE DMACRO (OPENLAMBDA (TABLE CHAR) (CHECK (|type?| CHARTABLE TABLE)) (* \; 
-"0 is either NONE.TC, REAL.CCE, or OTHER.RC") (COND ((IGREATERP CHAR \\MAXTHINCHAR) (OR (AND (|fetch| 
-(CHARTABLE NSCHARHASH) |of| TABLE) (GETHASH CHAR (|fetch| (CHARTABLE NSCHARHASH) |of| TABLE))) 0)) (T 
-(\\GETBASEBYTE TABLE CHAR)))))
-(PUTPROPS \\SETSYNCODE DMACRO (LAMBDA (TABLE CHAR CODE) (CHECK (|type?| CHARTABLE TABLE)) (* \; 
-"0 is REAL.CCE, NONE.TC, OTHER.RC") (COND ((ILEQ CHAR \\MAXTHINCHAR) (\\PUTBASEBYTE TABLE CHAR CODE)) 
-(T (\\SETFATSYNCODE TABLE CHAR CODE)))))
+(PUTPROPS \SYNCODE DMACRO (OPENLAMBDA (TABLE CHAR) (CHECK (type? CHARTABLE TABLE)) (* ; 
+"0 is either NONE.TC, REAL.CCE, or OTHER.RC") (COND ((IGREATERP CHAR \MAXTHINCHAR) (OR (AND (fetch (
+CHARTABLE NSCHARHASH) of TABLE) (GETHASH CHAR (fetch (CHARTABLE NSCHARHASH) of TABLE))) 0)) (T (
+\GETBASEBYTE TABLE CHAR)))))
+(PUTPROPS \SETSYNCODE DMACRO (LAMBDA (TABLE CHAR CODE) (CHECK (type? CHARTABLE TABLE)) (* ; 
+"0 is REAL.CCE, NONE.TC, OTHER.RC") (COND ((ILEQ CHAR \MAXTHINCHAR) (\PUTBASEBYTE TABLE CHAR CODE)) (T
+ (\SETFATSYNCODE TABLE CHAR CODE)))))
 (DATATYPE CHARTABLE ((CHARSET0 256 BYTE) (NSCHARHASH FULLPOINTER)))
 (RPAQQ CCECHOMODES (REAL.CCE IGNORE.CCE SIMULATE.CCE INDICATE.CCE))
 (RPAQQ REAL.CCE 0)
@@ -1401,16 +1377,16 @@ CTRLV.TC))
 (RPAQQ RETYPE.TC 4)
 (RPAQQ CTRLV.TC 5)
 (CONSTANTS NONE.TC EOL.TC CHARDELETE.TC WORDDELETE.TC WORDSEPR.TC LINEDELETE.TC RETYPE.TC CTRLV.TC)
-(ACCESSFNS TERMCODE ((CCECHO (LOGAND DATUM 24)) (TERMCLASS (LOGAND DATUM 7))) (* \; 
+(ACCESSFNS TERMCODE ((CCECHO (LOGAND DATUM 24)) (TERMCLASS (LOGAND DATUM 7))) (* ; 
 "We assume that values are appropriately shifted") (CREATE (LOGOR CCECHO TERMCLASS)))
 (DATATYPE TERMTABLEP (TERMSA RAISEFLG DELCHARECHO LINEDELETE 1STCHDEL NTHCHDEL POSTCHDEL EMPTYCHDEL (
-CONTROLFLG FLAG) (ECHOFLG FLAG)) TERMSA _ (|create| CHARTABLE))
-(PUTPROPS \\GETREADMACRODEF MACRO ((C TBL) (GETHASH C (|fetch| READMACRODEFS |of| TBL))))
-(PUTPROPS \\GTREADTABLE MACRO (ARGS (COND ((LITATOM (CAR ARGS)) (SUBPAIR (QUOTE (X . FLG)) ARGS (QUOTE
- (SELECTQ X ((NIL T) (\\DTEST *READTABLE* (QUOTE READTABLEP))) (\\GTREADTABLE1 X . FLG))))) (T (QUOTE 
+CONTROLFLG FLAG) (ECHOFLG FLAG)) TERMSA _ (create CHARTABLE))
+(PUTPROPS \GETREADMACRODEF MACRO ((C TBL) (GETHASH C (fetch READMACRODEFS of TBL))))
+(PUTPROPS \GTREADTABLE MACRO (ARGS (COND ((LITATOM (CAR ARGS)) (SUBPAIR (QUOTE (X . FLG)) ARGS (QUOTE 
+(SELECTQ X ((NIL T) (\DTEST *READTABLE* (QUOTE READTABLEP))) (\GTREADTABLE1 X . FLG))))) (T (QUOTE 
 IGNOREMACRO)))))
-(PUTPROPS \\GTREADTABLE1 DMACRO (ARGS (COND ((NULL (CDR ARGS)) (LIST (QUOTE \\DTEST) (CAR ARGS) (QUOTE
- (QUOTE READTABLEP)))) (T (QUOTE IGNOREMACRO)))))
+(PUTPROPS \GTREADTABLE1 DMACRO (ARGS (COND ((NULL (CDR ARGS)) (LIST (QUOTE \DTEST) (CAR ARGS) (QUOTE (
+QUOTE READTABLEP)))) (T (QUOTE IGNOREMACRO)))))
 (RPAQQ MACROBIT 8)
 (RPAQQ BREAKBIT 16)
 (RPAQQ STOPATOMBIT 32)
@@ -1465,106 +1441,106 @@ INNERESCAPEBIT 7)) (PACKAGEDELIM.RC (LOGOR ESCAPEBIT INNERESCAPEBIT 1)))
 MACROCONTEXT (LOGAND DATUM CONTEXTMASK)) (MACROP (BITTEST DATUM MACROBIT)) (WAKEUP (LOGAND DATUM 
 WAKEUPMASK)) (BREAK (BITTEST DATUM BREAKBIT))))
 (RECORD READMACRODEF (MACROTYPE . MACROFN))
-(DATATYPE READTABLEP ((READSA POINTER) (* \; "A CHARTABLE defining syntax of each char") (
-READMACRODEFS POINTER) (* \; "A hash table associating macro chars with macro definitions") (
-READMACROFLG FLAG) (* \; 
-"True if read macros are enabled (turned off by Interlisp's crufty READMACROS function)") (ESCAPEFLG 
-FLAG) (* \; 
+(DATATYPE READTABLEP ((READSA POINTER) (* ; "A CHARTABLE defining syntax of each char") (READMACRODEFS
+ POINTER) (* ; "A hash table associating macro chars with macro definitions") (READMACROFLG FLAG) (* ;
+ "True if read macros are enabled (turned off by Interlisp's crufty READMACROS function)") (ESCAPEFLG 
+FLAG) (* ; 
 "True if the char(s) with escape syntax are enabled (turned off by Interlisp's crufty ESCAPE function)"
-) (COMMONLISP FLAG) (* \; 
+) (COMMONLISP FLAG) (* ; 
 "True if table is a Common Lisp read table and hence must obey Common Lisp syntax rules") (NUMBERBASE 
-BITS 5) (* \; "Not used") (CASEINSENSITIVE FLAG) (* \; 
+BITS 5) (* ; "Not used") (CASEINSENSITIVE FLAG) (* ; 
 "If true, unescaped lowercase chars are converted to uppercase in symbols") (COMMONNUMSYNTAX FLAG) (* 
-\; 
+; 
 "True if number notation includes Common Lisp numbers: rationals as a/b, and the dfls exponent markers"
-) (USESILPACKAGE FLAG) (* \; "If true, IL:READ ignores *PACKAGE* and reads in the IL package") (NIL 5 
-FLAG) (DISPATCHMACRODEFS POINTER) (* \; 
-"An a-list of dispatching macro char and its dispatch definitions") (HASHMACROCHAR BYTE) (* \; 
-"The character code used in this read table for the # dispatch macro") (ESCAPECHAR BYTE) (* \; 
-"The character code used in this read table for single escape") (MULTESCAPECHAR BYTE) (* \; 
-"The character code used in this read table for multiple escape") (PACKAGECHAR BYTE) (* \; 
-"The character code used in this read table for package delimiter") (READTBLNAME POINTER) (* \; 
-"The canonical 'name' of this read table")) READSA _ (|create| CHARTABLE))
+) (USESILPACKAGE FLAG) (* ; "If true, IL:READ ignores *PACKAGE* and reads in the IL package") (NIL 5 
+FLAG) (DISPATCHMACRODEFS POINTER) (* ; 
+"An a-list of dispatching macro char and its dispatch definitions") (HASHMACROCHAR BYTE) (* ; 
+"The character code used in this read table for the # dispatch macro") (ESCAPECHAR BYTE) (* ; 
+"The character code used in this read table for single escape") (MULTESCAPECHAR BYTE) (* ; 
+"The character code used in this read table for multiple escape") (PACKAGECHAR BYTE) (* ; 
+"The character code used in this read table for package delimiter") (READTBLNAME POINTER) (* ; 
+"The canonical 'name' of this read table")) READSA _ (create CHARTABLE))
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE ATBL) (QUOTE IMPORTDATE) (IDATE "19-Aug-2021 12:06:46"))
+=======
 (PUTPROP (QUOTE ATBL) (QUOTE IMPORTDATE) (IDATE " 9-Jul-2021 15:28:19"))
+>>>>>>> Stashed changes
 
-(DATATYPE STREAM ((* |;;| 
+(DATATYPE STREAM ((* ;; 
 "First 8 words are fixed for BIN, BOUT opcodes.  Used to require length of whole datatype be multiple of 4, but Dolphin dead now."
-) (COFFSET WORD) (* \; "Offset in CPPTR of next bin or bout") (CBUFSIZE WORD) (* \; 
-"Offset past last byte in that buffer") (PEEKEDCHARP FLAG) (* \; 
-"if true, PEEKEDCHAR contains value of recent call to unread-char") (ACCESSBITS BITS 3) (* \; 
-"What kind of access file is open for (read, write, append)") (CBUFPTR POINTER) (* \; 
-"Pointer to current buffer") (BYTESIZE BYTE) (* \; "Byte size of stream, always 8 for now") (CHARSET 
-BYTE) (* \; 
+) (COFFSET WORD) (* ; "Offset in CPPTR of next bin or bout") (CBUFSIZE WORD) (* ; 
+"Offset past last byte in that buffer") (PEEKEDCHARP FLAG) (* ; 
+"if true, PEEKEDCHAR contains value of recent call to unread-char") (ACCESSBITS BITS 3) (* ; 
+"What kind of access file is open for (read, write, append)") (CBUFPTR POINTER) (* ; 
+"Pointer to current buffer") (BYTESIZE BYTE) (* ; "Byte size of stream, always 8 for now") (CHARSET 
+BYTE) (* ; 
 "the current character set for this stream.  If 255, stream is not runcoded, so read-char consumes two bytes every time"
-) (PEEKEDCHAR WORD) (* \; "value of unread-char call") (CHARPOSITION WORD) (* \; 
-"Used by POSITION etc.") (CBUFMAXSIZE WORD) (* \; 
-"on output, the size of the physical buffer--can't extend beyond this") (* |;;| 
-"-------- Above fields (8 words) potentially known to microcode.  --------") (NONDEFAULTDATEFLG FLAG) 
-(REVALIDATEFLG FLAG) (MULTIBUFFERHINT FLAG) (* \; 
-"True if stream likes to read and write more than one buffer at a time") (USERCLOSEABLE FLAG) (* \; 
-"Can be closed by CLOSEF;  NIL for terminal, dribble...") (FULLFILENAME POINTER) (* \; 
-"Name by which file is known to user") (BINABLE FLAG) (* \; "BIN punts unless this bit on") (BOUTABLE 
-FLAG) (* \; "BOUT punts unless this bit on") (EXTENDABLE FLAG) (* \; 
-"BOUT punts when COFFSET ge CBUFFSIZE unless this bit set and COFFSET lt 512") (CBUFDIRTY FLAG) (* \; 
-"true if BOUT has sullied the current buffer") (DEVICE POINTER) (* \; "FDEV of this guy") (USERVISIBLE
- FLAG) (* \; "Listed by OPENP;  NIL for terminal, dribble ...") (EOLCONVENTION BITS 2) (* \; 
-"End-of-line convention") (NOTXCCS FLAG) (* \; "True if the character encoding format is not XCCS.") (
-VALIDATION POINTER) (* \; 
+) (PEEKEDCHAR WORD) (* ; "value of unread-char call") (CHARPOSITION WORD) (* ; "Used by POSITION etc."
+) (CBUFMAXSIZE WORD) (* ; "on output, the size of the physical buffer--can't extend beyond this") (* 
+;; "-------- Above fields (8 words) potentially known to microcode.  --------") (NONDEFAULTDATEFLG 
+FLAG) (REVALIDATEFLG FLAG) (MULTIBUFFERHINT FLAG) (* ; 
+"True if stream likes to read and write more than one buffer at a time") (USERCLOSEABLE FLAG) (* ; 
+"Can be closed by CLOSEF;  NIL for terminal, dribble...") (FULLFILENAME POINTER) (* ; 
+"Name by which file is known to user") (BINABLE FLAG) (* ; "BIN punts unless this bit on") (BOUTABLE 
+FLAG) (* ; "BOUT punts unless this bit on") (EXTENDABLE FLAG) (* ; 
+"BOUT punts when COFFSET ge CBUFFSIZE unless this bit set and COFFSET lt 512") (CBUFDIRTY FLAG) (* ; 
+"true if BOUT has sullied the current buffer") (DEVICE POINTER) (* ; "FDEV of this guy") (USERVISIBLE 
+FLAG) (* ; "Listed by OPENP;  NIL for terminal, dribble ...") (EOLCONVENTION BITS 2) (* ; 
+"End-of-line convention") (NIL FLAG) (* ; "Was NOTXCCS.") (VALIDATION POINTER) (* ; 
 "A number somehow identifying file, used to determine if file has changed in our absence") (CPAGE 
-POINTER) (* \; "CPAGE,,COFFSET constitutes current file pointer for most randaccess streams") (EPAGE 
-POINTER) (EOFFSET WORD) (* \; "Page, byte offset of eof") (LINELENGTH WORD) (* \; 
-"LINELENGTH of stream, or -1 for no line length") (* |;;| 
-"----Following are device-specific fields----") (* |;;| 
-"Available for device-specific uses, NOT for application use.") (F1 POINTER) (F2 POINTER) (F3 POINTER)
- (F4 POINTER) (F5 POINTER) (FW6 WORD) (FW7 WORD) (FW8 WORD) (FW9 WORD) (F10 POINTER) (* |;;| 
-"----Following only filled in for open streams----") (STRMBINFN POINTER) (* \; 
-"Either the BIN fn from the FDEV, or a trap") (STRMBOUTFN POINTER) (* \; 
-"Either the BIN fn from the FDEV, or a trap") (OUTCHARFN POINTER) (* \; 
-"Called by \\OUTCHAR, the normal character printer.") (ENDOFSTREAMOP POINTER) (* \; 
-"Called if EOF and we try to read.") (OTHERPROPS POINTER) (* \; "PROP LIST for holding other info.") (
-IMAGEOPS POINTER) (* \; "Image operations vector") (IMAGEDATA POINTER) (* \; 
-"Image instance variables--format depends on IMAGEOPS value") (BUFFS POINTER) (* \; 
-"Buffer chain for pmapped streams") (MAXBUFFERS WORD) (* \; 
-"Max # of buffers the system will allocate.") (LASTCCODE WORD) (* \; 
+POINTER) (* ; "CPAGE,,COFFSET constitutes current file pointer for most randaccess streams") (EPAGE 
+POINTER) (EOFFSET WORD) (* ; "Page, byte offset of eof") (LINELENGTH WORD) (* ; 
+"LINELENGTH of stream, or -1 for no line length") (* ;; "----Following are device-specific fields----"
+) (* ;; "Available for device-specific uses, NOT for application use.") (F1 POINTER) (F2 POINTER) (F3 
+POINTER) (F4 POINTER) (F5 POINTER) (FW6 WORD) (FW7 WORD) (FW8 WORD) (FW9 WORD) (F10 POINTER) (* ;; 
+"----Following only filled in for open streams----") (STRMBINFN POINTER) (* ; 
+"Either the BIN fn from the FDEV, or a trap") (STRMBOUTFN POINTER) (* ; 
+"Either the BIN fn from the FDEV, or a trap") (OUTCHARFN POINTER) (* ; 
+"Called by \OUTCHAR, the normal character printer.") (ENDOFSTREAMOP POINTER) (* ; 
+"Called if EOF and we try to read.") (OTHERPROPS POINTER) (* ; "PROP LIST for holding other info.") (
+IMAGEOPS POINTER) (* ; "Image operations vector") (IMAGEDATA POINTER) (* ; 
+"Image instance variables--format depends on IMAGEOPS value") (BUFFS POINTER) (* ; 
+"Buffer chain for pmapped streams") (MAXBUFFERS WORD) (* ; 
+"Max # of buffers the system will allocate.") (LASTCCODE WORD) (* ; 
 "After READ, RATOM, etc, the charcode that will be returned (as a character) by LASTC.  If there is none, this field is 65535."
-) (EXTRASTREAMOP POINTER) (* \; "For use of applications programs, not devices") (INCCODEFN POINTER) (
-* \; "Set by \\EXTERNALFORMAT") (PEEKCCODEFN POINTER) (BACKCCODEFN POINTER) (EXTERNALFORMAT POINTER)) 
-(BLOCKRECORD STREAM ((NIL 2 WORD) (UCODEFLAGS1 BITS 1) (* |;;| "respecification of access bits:") (
-RANDOMWRITEABLE FLAG) (* \; "File open for output (access = OUTPUT or BOTH)") (APPENDABLE FLAG) (* \; 
-"File open for append (OUTPUT or APPEND or BOTH)") (READABLE FLAG) (* \; 
+) (EXTRASTREAMOP POINTER) (* ; "For use of applications programs, not devices") (INCCODEFN POINTER) (*
+ ; "Set by \EXTERNALFORMAT") (PEEKCCODEFN POINTER) (BACKCCODEFN POINTER) (EXTERNALFORMAT POINTER)) (
+BLOCKRECORD STREAM ((NIL 2 WORD) (UCODEFLAGS1 BITS 1) (* ;; "respecification of access bits:") (
+RANDOMWRITEABLE FLAG) (* ; "File open for output (access = OUTPUT or BOTH)") (APPENDABLE FLAG) (* ; 
+"File open for append (OUTPUT or APPEND or BOTH)") (READABLE FLAG) (* ; 
 "File open for read (READ or BOTH)") (NIL POINTER))) (BLOCKRECORD STREAM ((NIL 4 WORD) (NIL BITS 14) (
-* |;;| "JIS character encoding format specific, overrides CHARSET field.") (IN.KANJIIN FLAG) (* \; 
-"True if input stream is in Kanji-in mode.") (OUT.KANJIIN FLAG) (* \; 
-"True if output stream is in Kanji-in mode."))) (ACCESSFNS STREAM ((ACCESS \\GETACCESS \\SETACCESS) (
-FULLNAME (OR (|fetch| (STREAM FULLFILENAME) |of| DATUM) DATUM)) (NAMEDP (AND (|fetch| (STREAM 
-FULLFILENAME) |of| DATUM) T)))) (SYNONYM CBUFPTR (CPPTR)) USERCLOSEABLE _ T USERVISIBLE _ T ACCESSBITS
- _ |NoBits| CPAGE _ 0 EPAGE _ 0 BUFFS _ NIL BYTESIZE _ 8 CBUFPTR _ NIL MAXBUFFERS _ (LET NIL (DECLARE 
-(GLOBALVARS \\STREAM.DEFAULT.MAXBUFFERS)) \\STREAM.DEFAULT.MAXBUFFERS) CHARPOSITION _ 0 LINELENGTH _ (
-LET NIL (DECLARE (GLOBALVARS FILELINELENGTH)) FILELINELENGTH) ENDOFSTREAMOP _ (FUNCTION \\EOSERROR) 
-IMAGEOPS _ \\NOIMAGEOPS EOLCONVENTION _ LF.EOLC STRMBINFN _ (FUNCTION \\STREAM.NOT.OPEN) STRMBOUTFN _ 
-(FUNCTION \\STREAM.NOT.OPEN) LASTCCODE _ 65535 NOTXCCS _ NIL)
+* ;; "JIS character encoding format specific, overrides CHARSET field.") (IN.KANJIIN FLAG) (* ; 
+"True if input stream is in Kanji-in mode.") (OUT.KANJIIN FLAG) (* ; 
+"True if output stream is in Kanji-in mode."))) (ACCESSFNS STREAM ((ACCESS \GETACCESS \SETACCESS) (
+FULLNAME (OR (fetch (STREAM FULLFILENAME) of DATUM) DATUM)) (NAMEDP (AND (fetch (STREAM FULLFILENAME) 
+of DATUM) T)))) (SYNONYM CBUFPTR (CPPTR)) USERCLOSEABLE _ T USERVISIBLE _ T ACCESSBITS _ NoBits CPAGE 
+_ 0 EPAGE _ 0 BUFFS _ NIL BYTESIZE _ 8 CBUFPTR _ NIL MAXBUFFERS _ (LET NIL (DECLARE (GLOBALVARS 
+\STREAM.DEFAULT.MAXBUFFERS)) \STREAM.DEFAULT.MAXBUFFERS) CHARPOSITION _ 0 LINELENGTH _ (LET NIL (
+DECLARE (GLOBALVARS FILELINELENGTH)) FILELINELENGTH) ENDOFSTREAMOP _ (FUNCTION \EOSERROR) IMAGEOPS _ 
+\NOIMAGEOPS EOLCONVENTION _ LF.EOLC STRMBINFN _ (FUNCTION \STREAM.NOT.OPEN) STRMBOUTFN _ (FUNCTION 
+\STREAM.NOT.OPEN) LASTCCODE _ 65535)
 (PUTPROPS STREAMOP MACRO (ARGS (CONS (QUOTE SPREADAPPLY*) (CONS (COND ((EQ (CAR (LISTP (CAR ARGS))) (
-QUOTE QUOTE)) (LIST (QUOTE |fetch|) (CADAR ARGS) (QUOTE |of|) (CADR ARGS))) (T (HELP 
+QUOTE QUOTE)) (LIST (QUOTE fetch) (CADAR ARGS) (QUOTE of) (CADR ARGS))) (T (HELP 
 "STREAMOP - OPNAME not quoted:" ARGS))) (CDDR ARGS)))))
-(RPAQQ |AppendBit| 2)
-(RPAQQ |NoBits| 0)
-(RPAQQ |ReadBit| 1)
-(RPAQQ |WriteBit| 4)
-(RPAQ |OutputBits| (LOGOR |AppendBit| |WriteBit|))
-(RPAQ |BothBits| (LOGOR |ReadBit| |OutputBits|))
-(CONSTANTS |AppendBit| |NoBits| |ReadBit| |WriteBit| (|OutputBits| (LOGOR |AppendBit| |WriteBit|)) (
-|BothBits| (LOGOR |ReadBit| |OutputBits|)))
-(PUTPROPS |TestMasked| MACRO ((BITS MASK) (NEQ (LOGAND BITS MASK) 0)))
-(PUTPROPS APPENDABLE MACRO ((STREAM) (|TestMasked| (|fetch| ACCESSBITS |of| STREAM) |AppendBit|)))
-(PUTPROPS APPENDONLY MACRO ((STREAM) (EQ (|fetch| ACCESSBITS |of| STREAM) |AppendBit|)))
-(PUTPROPS DIRTYABLE MACRO ((STREAM) (|TestMasked| (|fetch| ACCESSBITS |of| STREAM) (CONSTANT (LOGOR 
-|AppendBit| |WriteBit|)))))
-(PUTPROPS OPENED MACRO ((STREAM) (NEQ (|fetch| ACCESSBITS |of| STREAM) |NoBits|)))
-(PUTPROPS OVERWRITEABLE MACRO ((STREAM) (|TestMasked| (|fetch| ACCESSBITS |of| STREAM) |WriteBit|)))
-(PUTPROPS READABLE MACRO ((STREAM) (|TestMasked| (|fetch| ACCESSBITS |of| STREAM) |ReadBit|)))
-(PUTPROPS READONLY MACRO ((STREAM) (EQ (|fetch| ACCESSBITS |of| STREAM) |ReadBit|)))
-(PUTPROPS WRITEABLE MACRO ((STREAM) (OR (OVERWRITEABLE STREAM) (AND (APPENDABLE STREAM) (\\EOFP STREAM
-)))))
+(RPAQQ AppendBit 2)
+(RPAQQ NoBits 0)
+(RPAQQ ReadBit 1)
+(RPAQQ WriteBit 4)
+(RPAQ OutputBits (LOGOR AppendBit WriteBit))
+(RPAQ BothBits (LOGOR ReadBit OutputBits))
+(CONSTANTS AppendBit NoBits ReadBit WriteBit (OutputBits (LOGOR AppendBit WriteBit)) (BothBits (LOGOR 
+ReadBit OutputBits)))
+(PUTPROPS TestMasked MACRO ((BITS MASK) (NEQ (LOGAND BITS MASK) 0)))
+(PUTPROPS APPENDABLE MACRO ((STREAM) (TestMasked (fetch ACCESSBITS of STREAM) AppendBit)))
+(PUTPROPS APPENDONLY MACRO ((STREAM) (EQ (fetch ACCESSBITS of STREAM) AppendBit)))
+(PUTPROPS DIRTYABLE MACRO ((STREAM) (TestMasked (fetch ACCESSBITS of STREAM) (CONSTANT (LOGOR 
+AppendBit WriteBit)))))
+(PUTPROPS OPENED MACRO ((STREAM) (NEQ (fetch ACCESSBITS of STREAM) NoBits)))
+(PUTPROPS OVERWRITEABLE MACRO ((STREAM) (TestMasked (fetch ACCESSBITS of STREAM) WriteBit)))
+(PUTPROPS READABLE MACRO ((STREAM) (TestMasked (fetch ACCESSBITS of STREAM) ReadBit)))
+(PUTPROPS READONLY MACRO ((STREAM) (EQ (fetch ACCESSBITS of STREAM) ReadBit)))
+(PUTPROPS WRITEABLE MACRO ((STREAM) (OR (OVERWRITEABLE STREAM) (AND (APPENDABLE STREAM) (\EOFP STREAM)
+))))
 (RPAQQ EOLCONVENTIONS ((CR.EOLC 0) (LF.EOLC 1) (CRLF.EOLC 2) (ANY.EOLC 3)))
 (RPAQQ CR.EOLC 0)
 (RPAQQ LF.EOLC 1)
@@ -1572,195 +1548,199 @@ QUOTE QUOTE)) (LIST (QUOTE |fetch|) (CADAR ARGS) (QUOTE |of|) (CADR ARGS))) (T (
 (RPAQQ ANY.EOLC 3)
 (CONSTANTS (CR.EOLC 0) (LF.EOLC 1) (CRLF.EOLC 2) (ANY.EOLC 3))
 (PUTPROPS FDEVOP DMACRO (ARGS (LET ((OPNAME (CAR ARGS)) (METHOD-DEVICE (CADR ARGS)) (TAIL (CDDR ARGS))
-) (COND ((AND (LISTP OPNAME) (EQ (CAR OPNAME) (QUOTE QUOTE))) (BQUOTE (SPREADAPPLY* (|fetch| (FDEV (
-\\\, (CADR OPNAME))) |of| (\\\, METHOD-DEVICE)) (\\\,@ TAIL)))) (T (ERROR "OPNAME not quoted: " OPNAME
-))))))
-(PUTPROPS \\RECOGNIZE-HACK DMACRO (ARGS (LET ((NAME (CAR ARGS)) (RECOG (CADR ARGS)) (DEVICE (CADDR 
-ARGS))) (BQUOTE (|if| (|type?| STREAM (\\\, NAME)) |then| (\\\, NAME) |else| (FDEVOP (QUOTE 
-GETFILENAME) (\\\, DEVICE) (\\\, NAME) (\\\, RECOG) (\\\, DEVICE)))))))
-(DATATYPE FDEV ((RESETABLE FLAG) (* \; "Obsolete") (RANDOMACCESSP FLAG) (NODIRECTORIES FLAG) (
-PAGEMAPPED FLAG) (* \; "True if i/o handled by pmap routines") (FDBINABLE FLAG) (* \; 
+) (COND ((AND (LISTP OPNAME) (EQ (CAR OPNAME) (QUOTE QUOTE))) (BQUOTE (SPREADAPPLY* (fetch (FDEV (\, (
+CADR OPNAME))) of (\, METHOD-DEVICE)) (\,@ TAIL)))) (T (ERROR "OPNAME not quoted: " OPNAME))))))
+(PUTPROPS \RECOGNIZE-HACK DMACRO (ARGS (LET ((NAME (CAR ARGS)) (RECOG (CADR ARGS)) (DEVICE (CADDR ARGS
+))) (BQUOTE (if (type? STREAM (\, NAME)) then (\, NAME) else (FDEVOP (QUOTE GETFILENAME) (\, DEVICE) (
+\, NAME) (\, RECOG) (\, DEVICE)))))))
+(DATATYPE FDEV ((RESETABLE FLAG) (* ; "Obsolete") (RANDOMACCESSP FLAG) (NODIRECTORIES FLAG) (
+PAGEMAPPED FLAG) (* ; "True if i/o handled by pmap routines") (FDBINABLE FLAG) (* ; 
 "Copied as a microcode flag for INPUT streams formed on this device") (FDBOUTABLE FLAG) (FDEXTENDABLE 
-FLAG) (BUFFERED FLAG) (* \; 
+FLAG) (BUFFERED FLAG) (* ; 
 "True implies that the device supports the BIN & BOUT uCode conventions, and implements the GETNEXTBUFFER method"
-) (DEVICENAME POINTER) (* \; "Identifying name somehow") (REMOTEP FLAG) (* \; 
-"true if device not local to machine") (SUBDIRECTORIES FLAG) (* \; 
-"true if device has real subdirectories") (INPUT-INDIRECTED FLAG) (* \; 
+) (DEVICENAME POINTER) (* ; "Identifying name somehow") (REMOTEP FLAG) (* ; 
+"true if device not local to machine") (SUBDIRECTORIES FLAG) (* ; 
+"true if device has real subdirectories") (INPUT-INDIRECTED FLAG) (* ; 
 "True for devices that indirect their input stream.  Method INPUTSTREAM fetches it") (
-OUTPUT-INDIRECTED FLAG) (* \; 
+OUTPUT-INDIRECTED FLAG) (* ; 
 "True for devices that indirect their output stream.  Method OUTPUTSTREAM fetches it") (DEVICEINFO 
-POINTER) (* \; "arbitrary device-specific info stored here") (OPENFILELST POINTER) (* \; 
-"Default place to keep list of streams open on this device") (* |;;| 
-"-----Rest of record consists of device \"methods\"-----") (* |;;| 
-"-----Following fields required of all devices-----") (HOSTNAMEP POINTER) (* \; 
+POINTER) (* ; "arbitrary device-specific info stored here") (OPENFILELST POINTER) (* ; 
+"Default place to keep list of streams open on this device") (* ;; 
+"-----Rest of record consists of device %"methods%"-----") (* ;; 
+"-----Following fields required of all devices-----") (HOSTNAMEP POINTER) (* ; 
 "(hostname {device}) => T if hostname is valid.  If device is given, return a FDEV for this {new} host, or T to use existing device"
-) (EVENTFN POINTER) (* \; "(device event), called before/after logout, sysout, makesys") (* |;;| 
+) (EVENTFN POINTER) (* ; "(device event), called before/after logout, sysout, makesys") (* ;; 
 "-----Following fields required of all named devices, e.g., ones that open files-----") (
-DIRECTORYNAMEP POINTER) (* \; "(host/dir) => true if directory exists on host") (OPENFILE POINTER) (* 
-\; "(name access recog otherinfo device) => new stream open on this device, or NIL if name not found")
- (CLOSEFILE POINTER) (* \; "(stream) => closes stream, returns it") (REOPENFILE POINTER) (* \; 
+DIRECTORYNAMEP POINTER) (* ; "(host/dir) => true if directory exists on host") (OPENFILE POINTER) (* ;
+ "(name access recog otherinfo device) => new stream open on this device, or NIL if name not found") (
+CLOSEFILE POINTER) (* ; "(stream) => closes stream, returns it") (REOPENFILE POINTER) (* ; 
 "(name access recog otherinfo device stream) like openfile, but called after logout to revalidate file, so optionally uses info in old stream to keep this opening like the previous"
-) (GETFILENAME POINTER) (* \; "(name recog device) => full file name") (DELETEFILE POINTER) (* \; 
+) (GETFILENAME POINTER) (* ; "(name recog device) => full file name") (DELETEFILE POINTER) (* ; 
 "(name) => deletes file so named, returning name, or NIL on failure.  RECOG=OLDEST") (GENERATEFILES 
-POINTER) (* \; 
+POINTER) (* ; 
 "(device pattern) => generator object for files matching pattern.  Car of object is generator function, cdr is arbitrary state.  Generator fn returns next file, or NIL when finished"
-) (RENAMEFILE POINTER) (* \; 
+) (RENAMEFILE POINTER) (* ; 
 "(olddevice oldfile newdevice newfile) to rename file on this (olddevice) to a potentially different device."
-) (OPENP POINTER) (* \; 
+) (OPENP POINTER) (* ; 
 "(name access dev) => stream if name is open for access, or all open streams if name = NIL") (
-REGISTERFILE POINTER) (* \; "(stream dev) => registers stream on its device") (UNREGISTERFILE POINTER)
- (* \; "(stream dev) => unregisters a stream from its device") (FREEPAGECOUNT POINTER) (* \; 
-"(host/dir dev) => # of free pages on host/dir") (MAKEDIRECTORY POINTER) (* \; "(host/dir dev)") (
-CHECKFILENAME POINTER) (* \; "(name dev) => name if it is well-formed file name for dev") (HOSTALIVEP 
-POINTER) (* \; 
+REGISTERFILE POINTER) (* ; "(stream dev) => registers stream on its device") (UNREGISTERFILE POINTER) 
+(* ; "(stream dev) => unregisters a stream from its device") (FREEPAGECOUNT POINTER) (* ; 
+"(host/dir dev) => # of free pages on host/dir") (MAKEDIRECTORY POINTER) (* ; "(host/dir dev)") (
+CHECKFILENAME POINTER) (* ; "(name dev) => name if it is well-formed file name for dev") (HOSTALIVEP 
+POINTER) (* ; 
 "(host dev) => true if host is alive, i.e., responsive;  only defined if REMOTEP is true") (
-BREAKCONNECTION POINTER) (* \; "(host fastp dev) => closes connections to host") (* |;;| 
-"-----The following are required methods for operating on open streams-----") (BIN POINTER) (* \; 
-"(stream) => next byte of input") (BOUT POINTER) (* \; "(stream byte) output byte to stream") (PEEKBIN
- POINTER) (* \; "(stream) => next byte without advancing position in stream") (NIL POINTER) (* \; 
-"Was READCHAR, replaced by READCHARCODE") (NIL POINTER) (* \; 
-"Was WRITECHAR (stream char) => writes char to stream") (NIL POINTER) (* \; "Was PEEKCHAR") (NIL 
-POINTER) (* \; "Was UNREADCHAR") (READP POINTER) (* \; 
-"(stream flag) => T if there is input available from stream right now") (EOFP POINTER) (* \; 
-"(stream) => T if BIN would signal eof.") (BLOCKIN POINTER) (* \; "(stream buffer byteoffset nbytes)")
- (BLOCKOUT POINTER) (* \; "(stream buffer byteoffset nbytes)") (FORCEOUTPUT POINTER) (* \; 
+BREAKCONNECTION POINTER) (* ; "(host fastp dev) => closes connections to host") (* ;; 
+"-----The following are required methods for operating on open streams-----") (BIN POINTER) (* ; 
+"(stream) => next byte of input") (BOUT POINTER) (* ; "(stream byte) output byte to stream") (PEEKBIN 
+POINTER) (* ; "(stream) => next byte without advancing position in stream") (NIL POINTER) (* ; 
+"Was READCHAR, replaced by READCHARCODE") (NIL POINTER) (* ; 
+"Was WRITECHAR (stream char) => writes char to stream") (NIL POINTER) (* ; "Was PEEKCHAR") (NIL 
+POINTER) (* ; "Was UNREADCHAR") (READP POINTER) (* ; 
+"(stream flag) => T if there is input available from stream right now") (EOFP POINTER) (* ; 
+"(stream) => T if BIN would signal eof.") (BLOCKIN POINTER) (* ; "(stream buffer byteoffset nbytes)") 
+(BLOCKOUT POINTER) (* ; "(stream buffer byteoffset nbytes)") (FORCEOUTPUT POINTER) (* ; 
 "(stream waitForFinish) flushes out to device anything that is buffered awaiting transmission") (
-GETFILEINFO POINTER) (* \; 
+GETFILEINFO POINTER) (* ; 
 "(stream/name attribute device) => value of attribute for open stream or name of closed file") (
-SETFILEINFO POINTER) (* \; 
+SETFILEINFO POINTER) (* ; 
 "(stream/name attribute newvalue device) sets attribute of open stream or closed file of given name") 
-(CHARSETFN POINTER) (* \; 
+(CHARSETFN POINTER) (* ; 
 "(stream charset) => access function for the charset slot, for benefit of indirect streams.  See IMCHARSET for changing it on a file."
-) (INPUTSTREAM POINTER) (* \; "(stream) => indirected input stream") (OUTPUTSTREAM POINTER) (* \; 
-"(stream) => indirected output stream") (* |;;| 
+) (INPUTSTREAM POINTER) (* ; "(stream) => indirected input stream") (OUTPUTSTREAM POINTER) (* ; 
+"(stream) => indirected output stream") (* ;; 
 "-----Following are required of random-access streams-----") (GETFILEPTR POINTER) (GETEOFPTR POINTER) 
-(SETFILEPTR POINTER) (BACKFILEPTR POINTER) (* \; 
+(SETFILEPTR POINTER) (BACKFILEPTR POINTER) (* ; 
 "(stream) backs up `fileptr' by one.  Stream is only required to be able to do this once, i.e.  one-character buffer suffices"
-) (SETEOFPTR POINTER) (* \; "(stream length) => truncates or lengthens stream to indicated length") (
-LASTC POINTER) (* \; "Should be possible only if RANDOMACCESSP") (* |;;| 
-"-----Following used for buffered streams-----") (GETNEXTBUFFER POINTER) (* \; 
+) (SETEOFPTR POINTER) (* ; "(stream length) => truncates or lengthens stream to indicated length") (
+LASTC POINTER) (* ; "Should be possible only if RANDOMACCESSP") (* ;; 
+"-----Following used for buffered streams-----") (GETNEXTBUFFER POINTER) (* ; 
 "(stream whatfor noerrorflg) => Disposes of current buffer and optionally reads next.  whatfor is READ or WRITE.  Can cause EOF error unless noerrorflg"
-) (RELEASEBUFFER POINTER) (* \; "(stream) => Does whatever appropriate when CBUFPTR is released") (* 
-|;;| "-----Following used for pagemapped streams-----") (READPAGES POINTER) (* \; 
+) (RELEASEBUFFER POINTER) (* ; "(stream) => Does whatever appropriate when CBUFPTR is released") (* ;;
+ "-----Following used for pagemapped streams-----") (READPAGES POINTER) (* ; 
 "(stream firstpage# buflist) => # of bytes read, starting at firstpage#, reading into buflist, a list of buffers or a single buffer (the usual case)"
-) (WRITEPAGES POINTER) (* \; 
+) (WRITEPAGES POINTER) (* ; 
 "(stream firstpage# buflist) writes from buflist to stream starting at firstpage# of stream") (
-TRUNCATEFILE POINTER) (* \; 
-"(stream page offset) make stream's eof be at page,offset, discarding anything after it") (* |;;| 
-"-----For window system, argh-----") (WINDOWOPS POINTER) (* \; "window system operations") (WINDOWDATA
- POINTER) (* \; "data for window systems") (* |;;| 
-"-----For any stream (here to not recompile everything)-----") (NIL POINTER) (* \; 
+TRUNCATEFILE POINTER) (* ; 
+"(stream page offset) make stream's eof be at page,offset, discarding anything after it") (* ;; 
+"-----For window system, argh-----") (WINDOWOPS POINTER) (* ; "window system operations") (WINDOWDATA 
+POINTER) (* ; "data for window systems") (* ;; 
+"-----For any stream (here to not recompile everything)-----") (DEFAULTEXTERNALFORMAT POINTER) (* ; 
 "Was READCHARCODE. Read a character code from the stream (cf BIN for bytes).")) DIRECTORYNAMEP _ (
-FUNCTION NILL) HOSTNAMEP _ (FUNCTION NILL) READP _ (FUNCTION \\GENERIC.READP) SETFILEPTR _ (FUNCTION 
-\\IS.NO.RANDACCESSP) GETFILEPTR _ (FUNCTION \\ILLEGAL.DEVICEOP) GETEOFPTR _ (FUNCTION 
-\\IS.NOT.RANDACCESSP) EOFP _ (FUNCTION \\ILLEGAL.DEVICEOP) BLOCKIN _ (FUNCTION \\GENERIC.BINS) 
-BLOCKOUT _ (FUNCTION \\GENERIC.BOUTS) RENAMEFILE _ (FUNCTION \\GENERIC.RENAMEFILE) FORCEOUTPUT _ (
-FUNCTION NILL) REGISTERFILE _ (FUNCTION NILL) OPENP _ (FUNCTION NILL) UNREGISTERFILE _ (FUNCTION NILL)
- CHARSETFN _ (FUNCTION \\GENERIC.CHARSET) BREAKCONNECTION _ (FUNCTION NILL))
+FUNCTION NILL) HOSTNAMEP _ (FUNCTION NILL) READP _ (FUNCTION \GENERIC.READP) SETFILEPTR _ (FUNCTION 
+\IS.NO.RANDACCESSP) GETFILEPTR _ (FUNCTION \ILLEGAL.DEVICEOP) GETEOFPTR _ (FUNCTION 
+\IS.NOT.RANDACCESSP) EOFP _ (FUNCTION \ILLEGAL.DEVICEOP) BLOCKIN _ (FUNCTION \GENERIC.BINS) BLOCKOUT _
+ (FUNCTION \GENERIC.BOUTS) RENAMEFILE _ (FUNCTION \GENERIC.RENAMEFILE) FORCEOUTPUT _ (FUNCTION NILL) 
+REGISTERFILE _ (FUNCTION NILL) OPENP _ (FUNCTION NILL) UNREGISTERFILE _ (FUNCTION NILL) CHARSETFN _ (
+FUNCTION \GENERIC.CHARSET) BREAKCONNECTION _ (FUNCTION NILL))
 (RECORD FILEGENOBJ (NEXTFILEFN FILEINFOFN . GENFILESTATE))
-(DATATYPE EXTERNALFORMAT ((EOLVALID FLAG) (* \; 
+(DATATYPE EXTERNALFORMAT ((EOLVALID FLAG) (* ; 
 "If true, the value of EOL field will replace the EOLCONVENTION field of the resulted stream. (Can't test EOL because it is always something)"
-) (EOL BITS 2) (NIL BITS 1) (INCCODEFN POINTER) (* \; 
+) (EOL BITS 2) (NIL BITS 1) (INCCODEFN POINTER) (* ; 
 "Called with STREAM and 2 optional arguments, BYTECOUNTVAR and BYTECOUNTVAL") (PEEKCCODEFN POINTER) (*
- \; "Called with three arguments -- STREAM, NOERROR, and EOL") (BACKCCODEFN POINTER) (* \; 
-"Called with STREAM and optional BYTECOUNTVAR and BYTECOUNTVAL") (OUTCHARFN POINTER) (* \; 
-"Called with two arguments -- STREAM and CHARCODE") (NAME POINTER) (* \; 
-"keyword name of this format, provided to \\INSTALL.EXTERNALFORMAT") (FORMATBYTESTREAMFN POINTER (* \;
- 
+ ; "Called with three arguments -- STREAM, NOERROR, and EOL") (BACKCCODEFN POINTER) (* ; 
+"Called with STREAM and optional BYTECOUNTVAR and BYTECOUNTVAL") (OUTCHARFN POINTER) (* ; 
+"Called with two arguments -- STREAM and CHARCODE") (NAME POINTER) (* ; 
+<<<<<<< Updated upstream
+"keyword name of this format, provided to \INSTALL.EXTERNALFORMAT") (FORMATBYTESTREAMFN POINTER) (* ; 
+=======
+"keyword name of this format, provided to \INSTALL.EXTERNALFORMAT") (FORMATBYTESTREAMFN POINTER (* ; 
+>>>>>>> Stashed changes
 "Function to copy the format state of a given stream to an IO stream that allows formatted byte sequences to be examined"
-))))
+) (EF1 POINTER) (* ; 
+"Extra fields for use of particular formats.  Possibly to hold standardized translation tables") (EF2 
+POINTER)))
 (RPAQ? *DEFAULT-EXTERNALFORMAT* :XCCS)
-(PUTPROPS \\DEVICE-OPEN-STREAMS MACRO (ARGS (LET ((DEVICE (CAR ARGS))) (BQUOTE (FDEVOP (QUOTE OPENP) (
-\\\, DEVICE) NIL NIL (\\\, DEVICE))))))
-(PUTPROPS \\CONVERT-PATHNAME DMACRO (OPENLAMBDA (PATHNAME?) (* |;;| 
+(PUTPROPS \DEVICE-OPEN-STREAMS MACRO (ARGS (LET ((DEVICE (CAR ARGS))) (BQUOTE (FDEVOP (QUOTE OPENP) (
+\, DEVICE) NIL NIL (\, DEVICE))))))
+(PUTPROPS \CONVERT-PATHNAME DMACRO (OPENLAMBDA (PATHNAME?) (* ;; 
 "Coerce pathnames to Interlisp strings, for the benefit of antediluvian Interlisp-D file fns") (
 CL:TYPECASE PATHNAME? (PATHNAME (INTERLISP-NAMESTRING PATHNAME?)) (T PATHNAME?))))
 (DEFOPTIMIZER ACCESS-CHARSET (STREAM &OPTIONAL NEWVALUE) (BQUOTE ((OPENLAMBDA (STRM) (FDEVOP (QUOTE 
-CHARSETFN) (|fetch| (STREAM DEVICE) |of| STRM) STRM (\\\, NEWVALUE))) (\\\, STREAM))))
-(PUTPROPS \\DECFILEPTR MACRO ((STREAM X) (\\INCFILEPTR STREAM (IMINUS X))))
-(PUTPROPS \\GETFILEPTR MACRO (OPENLAMBDA (STRM) (FDEVOP (QUOTE GETFILEPTR) (|fetch| DEVICE |of| STRM) 
-STRM)))
-(PUTPROPS \\SIGNEDWIN MACRO ((STREAM) (SIGNED (\\WIN STREAM) BITSPERWORD)))
-(PUTPROPS \\SIGNEDWOUT MACRO ((STREAM N) (\\WOUT STREAM (UNSIGNED N BITSPERWORD))))
-(PUTPROPS \\WIN MACRO (OPENLAMBDA (STREAM) (|create| WORD HIBYTE _ (\\BIN STREAM) LOBYTE _ (\\BIN 
-STREAM))))
-(PUTPROPS \\WOUT MACRO (OPENLAMBDA (STREAM W) (\\BOUT STREAM (|fetch| HIBYTE |of| W)) (\\BOUT STREAM (
-|fetch| LOBYTE |of| W))))
-(PUTPROPS \\BINS BYTEMACRO (OPENLAMBDA (STRM BASE OFF NBYTES) (FDEVOP (QUOTE BLOCKIN) (|fetch| (STREAM
- DEVICE) |of| STRM) STRM BASE OFF NBYTES)))
-(PUTPROPS \\BOUTS BYTEMACRO (OPENLAMBDA (STRM BASE OFF NBYTES) (FDEVOP (QUOTE BLOCKOUT) (|fetch| (
-STREAM DEVICE) |of| STRM) STRM BASE OFF NBYTES)))
-(PUTPROPS \\BOUTEOL MACRO (OPENLAMBDA (STRM) (SELECTC (FETCH (STREAM EOLCONVENTION) OF STRM) (LF.EOLC 
-(\\BOUT STRM (CHARCODE LF))) (CR.EOLC (\\BOUT STRM (CHARCODE CR))) (CRLF.EOLC (\\BOUT STRM (CHARCODE 
-CR)) (\\BOUT STRM (CHARCODE LF))) (ANY.EOLC (SHOULDNT)) NIL)))
-(PUTPROPS \\EOFP BYTEMACRO (OPENLAMBDA (STRM) (FDEVOP (QUOTE EOFP) (|fetch| (STREAM DEVICE) |of| STRM)
- STRM)))
+CHARSETFN) (fetch (STREAM DEVICE) of STRM) STRM (\, NEWVALUE))) (\, STREAM))))
+(PUTPROPS \DECFILEPTR MACRO ((STREAM X) (\INCFILEPTR STREAM (IMINUS X))))
+(PUTPROPS \GETFILEPTR MACRO (OPENLAMBDA (STRM) (FDEVOP (QUOTE GETFILEPTR) (fetch DEVICE of STRM) STRM)
+))
+(PUTPROPS \SIGNEDWIN MACRO ((STREAM) (SIGNED (\WIN STREAM) BITSPERWORD)))
+(PUTPROPS \SIGNEDWOUT MACRO ((STREAM N) (\WOUT STREAM (UNSIGNED N BITSPERWORD))))
+(PUTPROPS \WIN MACRO (OPENLAMBDA (STREAM) (create WORD HIBYTE _ (\BIN STREAM) LOBYTE _ (\BIN STREAM)))
+)
+(PUTPROPS \WOUT MACRO (OPENLAMBDA (STREAM W) (\BOUT STREAM (fetch HIBYTE of W)) (\BOUT STREAM (fetch 
+LOBYTE of W))))
+(PUTPROPS \BINS BYTEMACRO (OPENLAMBDA (STRM BASE OFF NBYTES) (FDEVOP (QUOTE BLOCKIN) (fetch (STREAM 
+DEVICE) of STRM) STRM BASE OFF NBYTES)))
+(PUTPROPS \BOUTS BYTEMACRO (OPENLAMBDA (STRM BASE OFF NBYTES) (FDEVOP (QUOTE BLOCKOUT) (fetch (STREAM 
+DEVICE) of STRM) STRM BASE OFF NBYTES)))
+(PUTPROPS \EOFP BYTEMACRO (OPENLAMBDA (STRM) (FDEVOP (QUOTE EOFP) (fetch (STREAM DEVICE) of STRM) STRM
+)))
 (PUTPROPS SIZE.FROM.LENGTH MACRO (LAMBDA (LEN) (DECLARE (LOCALVARS LEN)) (AND LEN (FOLDHI LEN 
 BYTESPERPAGE))))
-(RPAQQ |BitsPerByte| 8)
-(RPAQ |ByteOffsetSize| (SELECTQ (SYSTEMTYPE) (VAX 10) 9))
-(RPAQQ |WordsPerPage| 256)
-(CONSTANTS |BitsPerByte| (|ByteOffsetSize| (SELECTQ (SYSTEMTYPE) (VAX 10) 9)) |WordsPerPage|)
-(RPAQ \\MAXFILEPTR (SUB1 (LLSH 1 30)))
-(CONSTANTS (\\MAXFILEPTR (SUB1 (LLSH 1 30))))
+(RPAQQ BitsPerByte 8)
+(RPAQ ByteOffsetSize (SELECTQ (SYSTEMTYPE) (VAX 10) 9))
+(RPAQQ WordsPerPage 256)
+(CONSTANTS BitsPerByte (ByteOffsetSize (SELECTQ (SYSTEMTYPE) (VAX 10) 9)) WordsPerPage)
+(RPAQ \MAXFILEPTR (SUB1 (LLSH 1 30)))
+(CONSTANTS (\MAXFILEPTR (SUB1 (LLSH 1 30))))
 (ACCESSFNS BYTEPTR ((PAGE (FOLDLO DATUM BYTESPERPAGE)) (OFFSET (MOD DATUM BYTESPERPAGE))) (TYPE? (AND 
-(FIXP DATUM) (IGEQ DATUM 0) (ILEQ DATUM \\MAXFILEPTR))) (CREATE (IPLUS (UNFOLD PAGE BYTESPERPAGE) 
+(FIXP DATUM) (IGEQ DATUM 0) (ILEQ DATUM \MAXFILEPTR))) (CREATE (IPLUS (UNFOLD PAGE BYTESPERPAGE) 
 OFFSET)))
-(PUTPROP (QUOTE FILEIO) (QUOTE IMPORTDATE) (IDATE "30-Jul-2021 13:05:48"))
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE FILEIO) (QUOTE IMPORTDATE) (IDATE "13-Aug-2021 23:55:35"))
+=======
+(PUTPROP (QUOTE FILEIO) (QUOTE IMPORTDATE) (IDATE " 5-Aug-2021 20:39:21"))
+>>>>>>> Stashed changes
 
-(BLOCKRECORD FIXP ((HINUM WORD) (LONUM WORD)) (CREATE (CREATECELL \\FIXP)) (TYPE? (EQ (NTYPX DATUM) 
-\\FIXP)))
+(BLOCKRECORD FIXP ((HINUM WORD) (LONUM WORD)) (CREATE (CREATECELL \FIXP)) (TYPE? (EQ (NTYPX DATUM) 
+\FIXP)))
 (RPAQQ MAX.SMALL.INTEGER 65535)
 (RPAQQ MAX.POS.HINUM 32767)
 (CONSTANTS (MAX.SMALL.INTEGER 65535) (MAX.POS.HINUM 32767))
 (PUTPROPS .UNBOX. MACRO (ARGS (LET ((ARG-FORM (CAR ARGS)) (HIGH-VAR (CADR ARGS)) (LOW-VAR (CADDR ARGS)
-) (BIGNUM-FORM (CADDDR ARGS))) (BQUOTE (PROG NIL UBLP (SELECTC (NTYPX (\\\, ARG-FORM)) (\\FIXP (SETQ (
-\\\, HIGH-VAR) (|ffetch| (FIXP HINUM) |of| (\\\, ARG-FORM))) (SETQ (\\\, LOW-VAR) (|ffetch| (FIXP 
-LONUM) |of| (\\\, ARG-FORM)))) (\\SMALLP (COND ((ILEQ 0 (\\\, ARG-FORM)) (SETQ (\\\, HIGH-VAR) 0) (
-SETQ (\\\, LOW-VAR) (\\\, ARG-FORM))) (T (SETQ (\\\, HIGH-VAR) 65535) (SETQ (\\\, LOW-VAR) (\\LOLOC (
-\\\, ARG-FORM)))))) (\\FLOATP (SETQ (\\\, ARG-FORM) (\\FIXP.FROM.FLOATP (\\\, ARG-FORM))) (GO UBLP)) (
-COND ((TYPENAMEP (\\\, ARG-FORM) (QUOTE RATIO)) (SETQ (\\\, ARG-FORM) (IQUOTIENT (CL::RATIO-NUMERATOR 
-(\\\, ARG-FORM)) (CL::RATIO-DENOMINATOR (\\\, ARG-FORM)))) (GO UBLP)) (\\\,@ (COND (BIGNUM-FORM (
-BQUOTE (((CL:INTEGERP (\\\, ARG-FORM)) (\\\, BIGNUM-FORM))))) (T (BQUOTE (((CL:INTEGERP (\\\, ARG-FORM
-)) (\\ILLEGAL.ARG (\\\, ARG-FORM)))))))) (T (CL::%NOT-NONCOMPLEX-NUMBER-ERROR (\\\, ARG-FORM))))))))))
+) (BIGNUM-FORM (CADDDR ARGS))) (BQUOTE (PROG NIL UBLP (SELECTC (NTYPX (\, ARG-FORM)) (\FIXP (SETQ (\, 
+HIGH-VAR) (ffetch (FIXP HINUM) of (\, ARG-FORM))) (SETQ (\, LOW-VAR) (ffetch (FIXP LONUM) of (\, 
+ARG-FORM)))) (\SMALLP (COND ((ILEQ 0 (\, ARG-FORM)) (SETQ (\, HIGH-VAR) 0) (SETQ (\, LOW-VAR) (\, 
+ARG-FORM))) (T (SETQ (\, HIGH-VAR) 65535) (SETQ (\, LOW-VAR) (\LOLOC (\, ARG-FORM)))))) (\FLOATP (SETQ
+ (\, ARG-FORM) (\FIXP.FROM.FLOATP (\, ARG-FORM))) (GO UBLP)) (COND ((TYPENAMEP (\, ARG-FORM) (QUOTE 
+RATIO)) (SETQ (\, ARG-FORM) (IQUOTIENT (CL::RATIO-NUMERATOR (\, ARG-FORM)) (CL::RATIO-DENOMINATOR (\, 
+ARG-FORM)))) (GO UBLP)) (\,@ (COND (BIGNUM-FORM (BQUOTE (((CL:INTEGERP (\, ARG-FORM)) (\, BIGNUM-FORM)
+)))) (T (BQUOTE (((CL:INTEGERP (\, ARG-FORM)) (\ILLEGAL.ARG (\, ARG-FORM)))))))) (T (
+CL::%%NOT-NONCOMPLEX-NUMBER-ERROR (\, ARG-FORM))))))))))
 (PUTPROPS .NEGATE. MACRO ((HY LY) (COND ((EQ 0 LY) (AND (NEQ HY 0) (SETQ HY (ADD1 (IDIFFERENCE 
 MAX.SMALL.INTEGER HY))))) (T (SETQ HY (IDIFFERENCE MAX.SMALL.INTEGER HY)) (SETQ LY (ADD1 (IDIFFERENCE 
 MAX.SMALL.INTEGER LY)))))))
-(PUTPROPS .LLSH1. MACRO ((HI LO) (* \; "shift the pair left one, assuming no overflow") (SETQ HI (LLSH
- HI 1)) (SETQ LO (LLSH (COND ((IGREATERP LO MAX.POS.HINUM) (|add| HI 1) (LOGAND LO MAX.POS.HINUM)) (T 
-LO)) 1))))
+(PUTPROPS .LLSH1. MACRO ((HI LO) (* ; "shift the pair left one, assuming no overflow") (SETQ HI (LLSH 
+HI 1)) (SETQ LO (LLSH (COND ((IGREATERP LO MAX.POS.HINUM) (add HI 1) (LOGAND LO MAX.POS.HINUM)) (T LO)
+) 1))))
 (PUTPROPS .LRSH1. MACRO ((HI LO) (SETQ LO (LRSH LO 1)) (COND ((NEQ (LOGAND HI 1) 0) (SETQ LO (IPLUS LO
- \\SIGNBIT)))) (SETQ HI (LRSH HI 1))))
-(PUTPROPS .BOXIPLUS. MACRO (OPENLAMBDA (X Y) (PROG ((HX (\\GETBASE X 0)) (LX (\\GETBASE X 1)) HY LY) (
+ \SIGNBIT)))) (SETQ HI (LRSH HI 1))))
+(PUTPROPS .BOXIPLUS. MACRO (OPENLAMBDA (X Y) (PROG ((HX (\GETBASE X 0)) (LX (\GETBASE X 1)) HY LY) (
 .UNBOX. Y HY LY) (SETQ HX (COND ((IGREATERP HX (IDIFFERENCE MAX.SMALL.INTEGER HY)) (IDIFFERENCE HX (
-ADD1 (IDIFFERENCE MAX.SMALL.INTEGER HY)))) (T (IPLUS HX HY)))) (* |Add| |high| |parts|) (\\PUTBASE X 1
- (COND ((IGREATERP LX (IDIFFERENCE MAX.SMALL.INTEGER LY)) (* |Carry| |into| |high| |part.|) (SETQ HX (
-COND ((EQ HX MAX.SMALL.INTEGER) 0) (T (ADD1 HX)))) (IDIFFERENCE LX (ADD1 (IDIFFERENCE 
-MAX.SMALL.INTEGER LY)))) (T (IPLUS LX LY)))) (\\PUTBASE X 0 HX) (RETURN X))))
-(PUTPROPS |PutUnboxed| DMACRO (= . \\PUTFIXP))
+ADD1 (IDIFFERENCE MAX.SMALL.INTEGER HY)))) (T (IPLUS HX HY)))) (* Add high parts) (\PUTBASE X 1 (COND 
+((IGREATERP LX (IDIFFERENCE MAX.SMALL.INTEGER LY)) (* Carry into high part.) (SETQ HX (COND ((EQ HX 
+MAX.SMALL.INTEGER) 0) (T (ADD1 HX)))) (IDIFFERENCE LX (ADD1 (IDIFFERENCE MAX.SMALL.INTEGER LY)))) (T (
+IPLUS LX LY)))) (\PUTBASE X 0 HX) (RETURN X))))
+(PUTPROPS PutUnboxed DMACRO (= . \PUTFIXP))
 (PUTPROP (QUOTE LLARITH) (QUOTE IMPORTDATE) (IDATE "16-May-1990 18:47:56"))
 
-(PUTPROPS POLYEVAL DMACRO ((X COEFFS DEGREE) (* \; 
-"execute the POLYEVAL opcode on the value X, the array COEFFS with degree DEGREE") (\\FLOATBOX ((
-OPCODES UBFLOAT3 0) (\\FLOATUNBOX X) (|fetch| (ARRAYP BASE) |of| COEFFS) DEGREE))))
+(PUTPROPS POLYEVAL DMACRO ((X COEFFS DEGREE) (* ; 
+"execute the POLYEVAL opcode on the value X, the array COEFFS with degree DEGREE") (\FLOATBOX ((
+OPCODES UBFLOAT3 0) (\FLOATUNBOX X) (fetch (ARRAYP BASE) of COEFFS) DEGREE))))
 (BLOCKRECORD FLOATP ((SIGNBIT BITS 1) (EXPONENT BITS 8) (HIFRACTION BITS 7) (LOFRACTION BITS 16)) (
 BLOCKRECORD FLOATP ((HIWORD WORD) (LOWORD WORD))) (BLOCKRECORD FLOATP ((NIL BITS 9) (LONGFRACTION BITS
  23))) (BLOCKRECORD FLOATP ((FLOATCONTENTS BITS 32))) (BLOCKRECORD FLOATP ((NIL BITS 1) (
-HIWORDNOSIGNBIT BITS 15))) (CREATE (\\FLOATBOX (\\VAG2 (LOGOR (LLSH SIGNBIT (PLUS 7 8)) (LLSH EXPONENT
- 7) HIFRACTION) LOFRACTION))) LOFRACTION _ 0 HIFRACTION _ 0 EXPONENT _ 0 SIGNBIT _ 0 (ACCESSFNS FLOATP
- ((EXP (LOGAND (LRSH (\\HILOC (\\FLOATUNBOX DATUM)) 7) 255)) (HIFRAC (LOGAND (\\HILOC (\\FLOATUNBOX 
-DATUM)) 127)))))
+HIWORDNOSIGNBIT BITS 15))) (CREATE (\FLOATBOX (\VAG2 (LOGOR (LLSH SIGNBIT (PLUS 7 8)) (LLSH EXPONENT 7
+) HIFRACTION) LOFRACTION))) LOFRACTION _ 0 HIFRACTION _ 0 EXPONENT _ 0 SIGNBIT _ 0 (ACCESSFNS FLOATP (
+(EXP (LOGAND (LRSH (\HILOC (\FLOATUNBOX DATUM)) 7) 255)) (HIFRAC (LOGAND (\HILOC (\FLOATUNBOX DATUM)) 
+127)))))
 (RPAQQ MAX.DIGITS.ACCURACY 9)
 (CONSTANTS (MAX.DIGITS.ACCURACY 9))
-(PUTPROPS \\CALLER.ARGS MACRO (X (LET ((ARGS (CAR X)) (FORMS (CDR X))) (BQUOTE (PROGN (\\SLOWRETURN) (
-LET ((AL (\\MYALINK)) NEXT (\\\,@ (|for| VAR |in| ARGS |collect| (COND ((LISTP VAR) (LIST (CAR VAR) 0)
-) (T VAR))))) (DECLARE (\\\,@ (|for| VAR |in| ARGS |when| (LISTP VAR) |collect| (BQUOTE (TYPE (\\\, (
-SELECTQ (CADR VAR) ((FLOATING FLOATP) (CADR VAR)) (HELP))) (\\\, (CAR VAR))))))) (SETQ NEXT (|fetch| (
-FX NEXTBLOCK) |of| AL)) (\\\,@ (|for| X |in| (REVERSE ARGS) |collect| (LET ((FORMS (BQUOTE (
-\\.GETBASE32 \\STACKSPACE (SETQ NEXT (IDIFFERENCE NEXT WORDSPERCELL)))))) (COND ((LISTP X) (BQUOTE (
-SETQ (\\\, (CAR X)) (\\FLOATBOX (\\\, FORMS))))) (T (BQUOTE (SETQ (\\\, X) (\\\, FORMS)))))))) (
-\\MAKEFREEBLOCK NEXT (TIMES (\\\, (LENGTH ARGS)) WORDSPERCELL)) (|replace| (FX NEXTBLOCK) |of| AL 
-|with| NEXT) (PROGN (\\\,@ FORMS))))))))
+(PUTPROPS \CALLER.ARGS MACRO (X (LET ((ARGS (CAR X)) (FORMS (CDR X))) (BQUOTE (PROGN (\SLOWRETURN) (
+LET ((AL (\MYALINK)) NEXT (\,@ (for VAR in ARGS collect (COND ((LISTP VAR) (LIST (CAR VAR) 0)) (T VAR)
+)))) (DECLARE (\,@ (for VAR in ARGS when (LISTP VAR) collect (BQUOTE (TYPE (\, (SELECTQ (CADR VAR) ((
+FLOATING FLOATP) (CADR VAR)) (HELP))) (\, (CAR VAR))))))) (SETQ NEXT (fetch (FX NEXTBLOCK) of AL)) (
+\,@ (for X in (REVERSE ARGS) collect (LET ((FORMS (BQUOTE (\.GETBASE32 \STACKSPACE (SETQ NEXT (
+IDIFFERENCE NEXT WORDSPERCELL)))))) (COND ((LISTP X) (BQUOTE (SETQ (\, (CAR X)) (\FLOATBOX (\, FORMS))
+))) (T (BQUOTE (SETQ (\, X) (\, FORMS)))))))) (\MAKEFREEBLOCK NEXT (TIMES (\, (LENGTH ARGS)) 
+WORDSPERCELL)) (replace (FX NEXTBLOCK) of AL with NEXT) (PROGN (\,@ FORMS))))))))
 (PUTPROP (QUOTE LLFLOAT) (QUOTE IMPORTDATE) (IDATE "16-May-1990 19:26:51"))
 
 (DEFOPTIMIZER FONTPROP (&REST ARGS) (SELECTQ (AND (EQ (CAADR ARGS) (QUOTE QUOTE)) (CADADR ARGS)) (
@@ -1768,253 +1748,252 @@ ASCENT (LIST (QUOTE FONTASCENT) (CAR ARGS))) (DESCENT (LIST (QUOTE FONTDESCENT)
 LIST (QUOTE FONTHEIGHT) (CAR ARGS))) (QUOTE IGNOREMACRO)))
 (DATATYPE FONTCLASS ((PRETTYFONT# BYTE) DISPLAYFD PRESSFD INTERPRESSFD OTHERFDS FONTCLASSNAME))
 (DATATYPE FONTDESCRIPTOR ((FONTDEVICE POINTER) (FONTFAMILY POINTER) (FONTSIZE POINTER) (FONTFACE 
-POINTER) (|\\SFAscent| WORD) (|\\SFDescent| WORD) (|\\SFHeight| WORD) (ROTATION WORD) (FBBOX 
-SIGNEDWORD) (FBBOY SIGNEDWORD) (FBBDX SIGNEDWORD) (FBBDY SIGNEDWORD) (|\\SFLKerns| POINTER) (
-|\\SFRWidths| POINTER) (FONTDEVICESPEC POINTER) (* \; 
+POINTER) (\SFAscent WORD) (\SFDescent WORD) (\SFHeight WORD) (ROTATION WORD) (FBBOX SIGNEDWORD) (FBBOY
+ SIGNEDWORD) (FBBDX SIGNEDWORD) (FBBDY SIGNEDWORD) (\SFLKerns POINTER) (\SFRWidths POINTER) (
+FONTDEVICESPEC POINTER) (* ; 
 "Holds the spec by which the font is known to the printing device, if coercion has been done") (
-OTHERDEVICEFONTPROPS POINTER) (* \; "For individual devices to hang special information") (FONTSCALE 
-POINTER) (\\SFFACECODE BITS 8) (FONTAVGCHARWIDTH WORD) (* \; 
+OTHERDEVICEFONTPROPS POINTER) (* ; "For individual devices to hang special information") (FONTSCALE 
+POINTER) (\SFFACECODE BITS 8) (FONTAVGCHARWIDTH WORD) (* ; 
 "Set in FONTCREATE, used to fix up the linelength when DSPFONT is called") (FONTIMAGEWIDTHS POINTER) (
-* \; 
+* ; 
 "This is the image width, as opposed to the advanced width;  initial hack for accents, kerning.  Fields is referenced by FONTCREATE."
-) (FONTCHARSETVECTOR POINTER) (* \; 
+) (FONTCHARSETVECTOR POINTER) (* ; 
 "A 256-pointer block, with one pointer per 'character set' --each group of 256 character codes.  Each pointer is either NIL if there's no info for that charset, or is a CHARSETINFO, containing widths, char bitmap, etc for the characters in that charset."
-) (FONTEXTRAFIELD2 POINTER)) FONTCHARSETVECTOR _ (\\CREATEFONTCHARSETVECTOR))
+) (FONTEXTRAFIELD2 POINTER)) FONTCHARSETVECTOR _ (\CREATEFONTCHARSETVECTOR))
 (RECORD FONTFACE (WEIGHT SLOPE EXPANSION) (ACCESSFNS ((COLOR (CDDDR DATUM) (RPLACD (CDDR DATUM) 
 NEWVALUE)) (BACKCOLOR (COND ((CDDDR DATUM) (CAR (CDDDR DATUM)))) (PROGN (COND ((NULL (CDDDR DATUM)) (
 RPLACD (CDDR DATUM) (LIST NIL NIL)))) (RPLACA (CDDDR DATUM) NEWVALUE))) (FORECOLOR (COND ((CDDDR DATUM
 ) (CADR (CDDDR DATUM)))) (PROGN (COND ((NULL (CDDDR DATUM)) (RPLACD (CDDR DATUM) (LIST NIL NIL)))) (
 RPLACA (CDR (CDDDR DATUM)) NEWVALUE))))) WEIGHT _ (QUOTE MEDIUM) SLOPE _ (QUOTE REGULAR) EXPANSION _ (
 QUOTE REGULAR) (TYPE? LISTP))
-(DATATYPE CHARSETINFO (WIDTHS (* \; 
+(DATATYPE CHARSETINFO (WIDTHS (* ; 
 "The advance-width of each character, an array indexed by charcode.  Usually the same as the imagewidth, but can differ for accents, kerns kerns.  This is what should be used for stringwidth calculations."
-) OFFSETS (* \; "Offset of each character into the image bitmap;  X value of left edge") IMAGEWIDTHS (
-* \; "imagewidths is not automagically allocated since it is not always needed") CHARSETBITMAP (* \; 
-"Bitmap containing the character images, indexed by OFFSETS") YWIDTHS (CHARSETASCENT WORD) (* \; 
-"Max ascent for all characters in this CHARSET") (CHARSETDESCENT WORD) (* \; 
-"Max descent for all characters in this CHARSET") LEFTKERN) WIDTHS _ (\\CREATECSINFOELEMENT) OFFSETS _
- (\\CREATECSINFOELEMENT))
-(PUTPROPS FONTASCENT MACRO ((FONTSPEC) (|ffetch| |\\SFAscent| |of| (\\GETFONTDESC FONTSPEC))))
-(PUTPROPS FONTDESCENT MACRO ((FONTSPEC) (|ffetch| |\\SFDescent| |of| (\\GETFONTDESC FONTSPEC))))
-(PUTPROPS FONTHEIGHT MACRO ((FONTSPEC) (|ffetch| |\\SFHeight| |of| (\\GETFONTDESC FONTSPEC))))
-(PUTPROPS \\FGETOFFSET DMACRO ((OFFSETSBLOCK CHAR8CODE) (\\GETBASE OFFSETSBLOCK CHAR8CODE)))
-(PUTPROPS \\FSETOFFSET DMACRO ((OFFSETSBLOCK CHAR8CODE OFFSET) (\\PUTBASE OFFSETSBLOCK CHAR8CODE 
-OFFSET)))
-(PUTPROPS \\FGETWIDTH DMACRO ((WIDTHSBLOCK CHAR8CODE) (\\GETBASE WIDTHSBLOCK CHAR8CODE)))
-(PUTPROPS \\FSETWIDTH DMACRO ((WIDTHSBLOCK INDEX WIDTH) (\\PUTBASE WIDTHSBLOCK INDEX WIDTH)))
-(PUTPROPS \\FGETCHARWIDTH MACRO (OPENLAMBDA (FONTDESC CHARCODE) (\\FGETWIDTH (|ffetch| (CHARSETINFO 
-WIDTHS) |of| (\\GETCHARSETINFO (\\CHARSET CHARCODE) FONTDESC)) (\\CHAR8CODE CHARCODE))))
-(PUTPROPS \\FSETCHARWIDTH MACRO (OPENLAMBDA (FONTDESC CHARCODE WIDTH) (\\FSETWIDTH (|ffetch| (
-CHARSETINFO WIDTHS) |of| (\\GETCHARSETINFO (\\CHARSET CHARCODE) FONTDESC)) (\\CHAR8CODE CHARCODE) 
-WIDTH)))
-(PUTPROPS \\FGETIMAGEWIDTH MACRO ((IMAGEWIDTHSBLOCK CHAR8CODE) (\\GETBASE IMAGEWIDTHSBLOCK CHAR8CODE))
-)
-(PUTPROPS \\FSETIMAGEWIDTH DMACRO ((WIDTHSBLOCK INDEX WIDTH) (\\PUTBASE WIDTHSBLOCK INDEX WIDTH)))
-(PUTPROPS \\GETCHARSETINFO MACRO ((CHARSET FONTDESC NOSLUG?) (* |;;| 
+) OFFSETS (* ; "Offset of each character into the image bitmap;  X value of left edge") IMAGEWIDTHS (*
+ ; "imagewidths is not automagically allocated since it is not always needed") CHARSETBITMAP (* ; 
+"Bitmap containing the character images, indexed by OFFSETS") YWIDTHS (CHARSETASCENT WORD) (* ; 
+"Max ascent for all characters in this CHARSET") (CHARSETDESCENT WORD) (* ; 
+"Max descent for all characters in this CHARSET") LEFTKERN) WIDTHS _ (\CREATECSINFOELEMENT) OFFSETS _ 
+(\CREATECSINFOELEMENT))
+(PUTPROPS FONTASCENT MACRO ((FONTSPEC) (ffetch \SFAscent of (\GETFONTDESC FONTSPEC))))
+(PUTPROPS FONTDESCENT MACRO ((FONTSPEC) (ffetch \SFDescent of (\GETFONTDESC FONTSPEC))))
+(PUTPROPS FONTHEIGHT MACRO ((FONTSPEC) (ffetch \SFHeight of (\GETFONTDESC FONTSPEC))))
+(PUTPROPS \FGETOFFSET DMACRO ((OFFSETSBLOCK CHAR8CODE) (\GETBASE OFFSETSBLOCK CHAR8CODE)))
+(PUTPROPS \FSETOFFSET DMACRO ((OFFSETSBLOCK CHAR8CODE OFFSET) (\PUTBASE OFFSETSBLOCK CHAR8CODE OFFSET)
+))
+(PUTPROPS \FGETWIDTH DMACRO ((WIDTHSBLOCK CHAR8CODE) (\GETBASE WIDTHSBLOCK CHAR8CODE)))
+(PUTPROPS \FSETWIDTH DMACRO ((WIDTHSBLOCK INDEX WIDTH) (\PUTBASE WIDTHSBLOCK INDEX WIDTH)))
+(PUTPROPS \FGETCHARWIDTH MACRO (OPENLAMBDA (FONTDESC CHARCODE) (\FGETWIDTH (ffetch (CHARSETINFO WIDTHS
+) of (\GETCHARSETINFO (\CHARSET CHARCODE) FONTDESC)) (\CHAR8CODE CHARCODE))))
+(PUTPROPS \FSETCHARWIDTH MACRO (OPENLAMBDA (FONTDESC CHARCODE WIDTH) (\FSETWIDTH (ffetch (CHARSETINFO 
+WIDTHS) of (\GETCHARSETINFO (\CHARSET CHARCODE) FONTDESC)) (\CHAR8CODE CHARCODE) WIDTH)))
+(PUTPROPS \FGETIMAGEWIDTH MACRO ((IMAGEWIDTHSBLOCK CHAR8CODE) (\GETBASE IMAGEWIDTHSBLOCK CHAR8CODE)))
+(PUTPROPS \FSETIMAGEWIDTH DMACRO ((WIDTHSBLOCK INDEX WIDTH) (\PUTBASE WIDTHSBLOCK INDEX WIDTH)))
+(PUTPROPS \GETCHARSETINFO MACRO ((CHARSET FONTDESC NOSLUG?) (* ;; 
 "fetches the charsetinfo for charset CHARSET in fontdescriptor FONTDESC.  If NIL, then creates the required charset."
-) (* |;;| 
+) (* ;; 
 "NOSLUG?  means don't create an empty (slug) csinfo if the charset is not found, just return NIL") (OR
- (\\GETBASEPTR (|ffetch| FONTCHARSETVECTOR |of| FONTDESC) (UNFOLD CHARSET 2)) (\\CREATECHARSET CHARSET
- FONTDESC NOSLUG?))))
-(PUTPROPS \\CREATECSINFOELEMENT MACRO (NIL (\\ALLOCBLOCK (FOLDHI (IPLUS \\MAXTHINCHAR 3) WORDSPERCELL)
-)))
-(PUTPROPS \\CREATEFONTCHARSETVECTOR MACRO (NIL (* \; "Allocates a block for the character set records"
-) (\\ALLOCBLOCK (ADD1 \\MAXCHARSET) T)))
-(DEFMACRO \\CREATEKERNELEMENT NIL (BQUOTE (CL:MAKE-ARRAY (IPLUS \\MAXTHINCHAR 3) :ELEMENT-TYPE (QUOTE 
-(SIGNED-BYTE 16)) :INITIAL-ELEMENT 0)))
-(DEFMACRO \\FSETLEFTKERN (LEFTKERNBLOCK INDEX KERNVALUE) (BQUOTE (CL:SETF (CL:AREF (\\\, LEFTKERNBLOCK
-) (\\\, INDEX)) (\\\, KERNVALUE))))
-(DEFMACRO \\FGETLEFTKERN (LEFTKERNBLOCK CHAR8CODE) (BQUOTE (CL:AREF (\\\, LEFTKERNBLOCK) (\\\, 
-CHAR8CODE))))
-(RPAQQ \\MAXNSCHAR 65535)
-(CONSTANTS (\\MAXNSCHAR 65535))
+ (\GETBASEPTR (ffetch FONTCHARSETVECTOR of FONTDESC) (UNFOLD CHARSET 2)) (\CREATECHARSET CHARSET 
+FONTDESC NOSLUG?))))
+(PUTPROPS \CREATECSINFOELEMENT MACRO (NIL (\ALLOCBLOCK (FOLDHI (IPLUS \MAXTHINCHAR 3) WORDSPERCELL))))
+(PUTPROPS \CREATEFONTCHARSETVECTOR MACRO (NIL (* ; "Allocates a block for the character set records") 
+(\ALLOCBLOCK (ADD1 \MAXCHARSET) T)))
+(DEFMACRO \CREATEKERNELEMENT NIL (BQUOTE (CL:MAKE-ARRAY (IPLUS \MAXTHINCHAR 3) :ELEMENT-TYPE (QUOTE (
+SIGNED-BYTE 16)) :INITIAL-ELEMENT 0)))
+(DEFMACRO \FSETLEFTKERN (LEFTKERNBLOCK INDEX KERNVALUE) (BQUOTE (CL:SETF (CL:AREF (\, LEFTKERNBLOCK) (
+\, INDEX)) (\, KERNVALUE))))
+(DEFMACRO \FGETLEFTKERN (LEFTKERNBLOCK CHAR8CODE) (BQUOTE (CL:AREF (\, LEFTKERNBLOCK) (\, CHAR8CODE)))
+)
+(RPAQQ \MAXNSCHAR 65535)
+(CONSTANTS (\MAXNSCHAR 65535))
 (PUTPROP (QUOTE FONT) (QUOTE IMPORTDATE) (IDATE " 9-Feb-2021 11:39:44"))
 
-(BLOCKRECORD KEYACTION ((* |;;| 
+(BLOCKRECORD KEYACTION ((* ;; 
 "KEYACTION Table:  For interpreting keystrokes.  Stored as a 8-cell block of untyped pointer hunk storage."
-) FLAGS (* \; 
+) FLAGS (* ; 
 "Flag byte per key# (one for down-transtion, 1 for up-.) to describe whether lockshifting occrrs, you ignore the transition, etc."
-) CODES (* \; "Table of character codes generated by each key when no shift key is pressed.") 
-SHIFTCODES (* \; "Table of character codes generated by each key when the shift key is pressed.") 
-ARMED (* \; "Not sure...") INTERRUPTLIST (* \; "List of armed interrupts?") ALTGRAPHCODES (* \; 
-"Table of codes to be generated when the ALT-GRAPH key is pressed.") DEADKEYLIST (* \; 
-"Block of dead-key handlers, with the nominal up-transition fields filled by the shifted-case tables.  Each \"table\" is an ALIST of orignal code => accented code.  no entry means punt the accent.."
-)) FLAGS _ (\\ALLOCBLOCK (FOLDHI (IPLUS \\NKEYS \\NKEYS) BYTESPERCELL)) CODES _ (\\ALLOCBLOCK (FOLDHI 
-(PLUS \\NKEYS \\NKEYS) WORDSPERCELL)) SHIFTCODES _ (\\ALLOCBLOCK (FOLDHI (PLUS \\NKEYS \\NKEYS) 
-WORDSPERCELL)) ARMED _ (\\ALLOCBLOCK (FOLDHI (ADD1 \\MAXTHINCHAR) BITSPERCELL)) ALTGRAPHCODES _ (
-\\ALLOCBLOCK (FOLDHI (PLUS \\NKEYS \\NKEYS) WORDSPERCELL)) DEADKEYLIST _ (\\ALLOCBLOCK (PLUS \\NKEYS 
-\\NKEYS \\NKEYS \\NKEYS) T) (CREATE (\\ALLOCBLOCK 7 PTRBLOCK.GCT)) (TYPE? (AND (\\BLOCKDATAP DATUM) (
-IGEQ (\\#BLOCKDATACELLS DATUM) 5) (OR (NULL (FETCH (KEYACTION INTERRUPTLIST) OF DATUM)) (LISTP (FETCH 
-INTERRUPTLIST OF DATUM))) (\\BLOCKDATAP (FETCH (KEYACTION FLAGS) DATUM)) (\\BLOCKDATAP (FETCH (
-KEYACTION CODES) DATUM)) (\\BLOCKDATAP (FETCH (KEYACTION ARMED) DATUM)))))
-(RPAQQ \\NKEYS 112)
-(CONSTANTS \\NKEYS)
-(DEFOPTIMIZER KEYDOWNP (KEYNAME) (BQUOTE (\\NEWKEYDOWNP (\\KEYNAMETONUMBER (\\\, KEYNAME)))))
-(PUTPROPS XKEYDOWNP MACRO ((KEYNAME) (KEYDOWNP1 (\\KEYNAMETONUMBER KEYNAME))))
-(PUTPROPS KEYDOWNP1 MACRO (OPENLAMBDA (KEYNUMBER) (DECLARE (GLOBALVARS \\EM.KBDAD0 \\EM.KBDAD1 
-\\EM.KBDAD2 \\EM.KBDAD3 \\EM.UTILIN \\EM.KBDAD4 \\EM.KBDAD5)) (PROG NIL (RETURN (EQ 0 (LOGAND (LRSH (
-LLSH 1 15) (PROGN (* (IMOD KEYNUMBER BITSPERWORD) - GETD |cause| IMOD |and| BITSPERWORD |not| 
-|exported| |to| |user|) (LOGAND KEYNUMBER 15))) (\\GETBASE (SELECTQ (PROGN (* (FOLDLO KEYNUMBER 
-BITSPERWORD) GETD |follows| |since| FOLDLO |and| BITSPERWORD |not| |exported| |to| |user|) (LRSH 
-KEYNUMBER 4)) (0 \\EM.KBDAD0) (1 \\EM.KBDAD1) (2 \\EM.KBDAD2) (3 \\EM.KBDAD3) (4 \\EM.UTILIN) (5 (OR 
-\\EM.KBDAD4 (RETURN))) (6 (OR \\EM.KBDAD5 (RETURN))) (RETURN)) 0)))))))
-(PUTPROPS \\NEWKEYDOWNP MACRO ((KEYNUMBER) (EQ 0 (\\GETBASEBIT \\LASTKEYSTATE KEYNUMBER))))
-(GLOBALVARS \\KEYBOARD.DEVICE \\KEYBOARD.STREAM)
+) CODES (* ; "Table of character codes generated by each key when no shift key is pressed.") 
+SHIFTCODES (* ; "Table of character codes generated by each key when the shift key is pressed.") ARMED
+ (* ; "Not sure...") INTERRUPTLIST (* ; "List of armed interrupts?") ALTGRAPHCODES (* ; 
+"Table of codes to be generated when the ALT-GRAPH key is pressed.") DEADKEYLIST (* ; 
+"Block of dead-key handlers, with the nominal up-transition fields filled by the shifted-case tables.  Each %"table%" is an ALIST of orignal code => accented code.  no entry means punt the accent.."
+)) FLAGS _ (\ALLOCBLOCK (FOLDHI (IPLUS \NKEYS \NKEYS) BYTESPERCELL)) CODES _ (\ALLOCBLOCK (FOLDHI (
+PLUS \NKEYS \NKEYS) WORDSPERCELL)) SHIFTCODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS) WORDSPERCELL
+)) ARMED _ (\ALLOCBLOCK (FOLDHI (ADD1 \MAXTHINCHAR) BITSPERCELL)) ALTGRAPHCODES _ (\ALLOCBLOCK (FOLDHI
+ (PLUS \NKEYS \NKEYS) WORDSPERCELL)) DEADKEYLIST _ (\ALLOCBLOCK (PLUS \NKEYS \NKEYS \NKEYS \NKEYS) T) 
+(CREATE (\ALLOCBLOCK 7 PTRBLOCK.GCT)) (TYPE? (AND (\BLOCKDATAP DATUM) (IGEQ (\#BLOCKDATACELLS DATUM) 5
+) (OR (NULL (FETCH (KEYACTION INTERRUPTLIST) OF DATUM)) (LISTP (FETCH INTERRUPTLIST OF DATUM))) (
+\BLOCKDATAP (FETCH (KEYACTION FLAGS) DATUM)) (\BLOCKDATAP (FETCH (KEYACTION CODES) DATUM)) (
+\BLOCKDATAP (FETCH (KEYACTION ARMED) DATUM)))))
+(RPAQQ \NKEYS 112)
+(CONSTANTS \NKEYS)
+(DEFOPTIMIZER KEYDOWNP (KEYNAME) (BQUOTE (\NEWKEYDOWNP (\KEYNAMETONUMBER (\, KEYNAME)))))
+(PUTPROPS XKEYDOWNP MACRO ((KEYNAME) (KEYDOWNP1 (\KEYNAMETONUMBER KEYNAME))))
+(PUTPROPS KEYDOWNP1 MACRO (OPENLAMBDA (KEYNUMBER) (DECLARE (GLOBALVARS \EM.KBDAD0 \EM.KBDAD1 
+\EM.KBDAD2 \EM.KBDAD3 \EM.UTILIN \EM.KBDAD4 \EM.KBDAD5)) (PROG NIL (RETURN (EQ 0 (LOGAND (LRSH (LLSH 1
+ 15) (PROGN (* (IMOD KEYNUMBER BITSPERWORD) - GETD cause IMOD and BITSPERWORD not exported to user) (
+LOGAND KEYNUMBER 15))) (\GETBASE (SELECTQ (PROGN (* (FOLDLO KEYNUMBER BITSPERWORD) GETD follows since 
+FOLDLO and BITSPERWORD not exported to user) (LRSH KEYNUMBER 4)) (0 \EM.KBDAD0) (1 \EM.KBDAD1) (2 
+\EM.KBDAD2) (3 \EM.KBDAD3) (4 \EM.UTILIN) (5 (OR \EM.KBDAD4 (RETURN))) (6 (OR \EM.KBDAD5 (RETURN))) (
+RETURN)) 0)))))))
+(PUTPROPS \NEWKEYDOWNP MACRO ((KEYNUMBER) (EQ 0 (\GETBASEBIT \LASTKEYSTATE KEYNUMBER))))
+(GLOBALVARS \KEYBOARD.DEVICE \KEYBOARD.STREAM)
 (RPAQQ HARDCURSORHEIGHT 16)
 (RPAQQ HARDCURSORWIDTH 16)
 (CONSTANTS (HARDCURSORHEIGHT 16) (HARDCURSORWIDTH 16))
 (ADDTOVAR GLOBALVARS LASTMOUSEX LASTMOUSEY LASTSCREEN LASTMOUSEBUTTONS LASTMOUSETIME LASTKEYBOARD)
-(PUTPROPS \\SETMOUSEXY MACRO ((XPOS YPOS) (PROGN (SELECTC \\MACHINETYPE (\\DAYBREAK (
-|\\DoveMisc.SetMousePosition| XPOS YPOS)) (\\MAIKO (SUBRCALL SETMOUSEXY XPOS YPOS)) (\\DANDELION (|do|
- (PROGN (|replace| (IOPAGE NEWMOUSEX) |of| \\IOPAGE |with| XPOS) (|replace| (IOPAGE NEWMOUSEY) |of| 
-\\IOPAGE |with| YPOS)) |repeatuntil| (ILESSP (|fetch| (IOPAGE NEWMOUSESTATE) |of| \\IOPAGE) 32768)) (*
- \; "smash position until mouse says it is not busy") (|replace| (IOPAGE NEWMOUSEX) |of| \\IOPAGE 
-|with| XPOS) (|replace| (IOPAGE NEWMOUSEY) |of| \\IOPAGE |with| YPOS) (|replace| (IOPAGE NEWMOUSESTATE
-) |of| \\IOPAGE |with| 32768)) NIL) (PROGN (\\PUTBASE \\EM.MOUSEX 0 XPOS) (\\PUTBASE \\EM.MOUSEY 0 
-YPOS)))))
-(GLOBALVARS \\EM.MOUSEX \\EM.MOUSEY \\EM.CURSORX \\EM.CURSORY \\EM.UTILIN \\EM.REALUTILIN \\EM.KBDAD0 
-\\EM.KBDAD1 \\EM.KBDAD2 \\EM.KBDAD3 \\EM.KBDAD4 \\EM.KBDAD5 \\EM.DISPINTERRUPT \\EM.DISPLAYHEAD 
-\\EM.CURSORBITMAP \\MACHINETYPE \\DEFAULTKEYACTION \\COMMANDKEYACTION \\CURRENTKEYACTION 
-\\PERIODIC.INTERRUPT \\PERIODIC.INTERRUPT.FREQUENCY)
+(PUTPROPS \SETMOUSEXY MACRO ((XPOS YPOS) (PROGN (SELECTC \MACHINETYPE (\DAYBREAK (
+\DoveMisc.SetMousePosition XPOS YPOS)) (\MAIKO (SUBRCALL SETMOUSEXY XPOS YPOS)) (\DANDELION (do (PROGN
+ (replace (IOPAGE NEWMOUSEX) of \IOPAGE with XPOS) (replace (IOPAGE NEWMOUSEY) of \IOPAGE with YPOS)) 
+repeatuntil (ILESSP (fetch (IOPAGE NEWMOUSESTATE) of \IOPAGE) 32768)) (* ; 
+"smash position until mouse says it is not busy") (replace (IOPAGE NEWMOUSEX) of \IOPAGE with XPOS) (
+replace (IOPAGE NEWMOUSEY) of \IOPAGE with YPOS) (replace (IOPAGE NEWMOUSESTATE) of \IOPAGE with 32768
+)) NIL) (PROGN (\PUTBASE \EM.MOUSEX 0 XPOS) (\PUTBASE \EM.MOUSEY 0 YPOS)))))
+(GLOBALVARS \EM.MOUSEX \EM.MOUSEY \EM.CURSORX \EM.CURSORY \EM.UTILIN \EM.REALUTILIN \EM.KBDAD0 
+\EM.KBDAD1 \EM.KBDAD2 \EM.KBDAD3 \EM.KBDAD4 \EM.KBDAD5 \EM.DISPINTERRUPT \EM.DISPLAYHEAD 
+\EM.CURSORBITMAP \MACHINETYPE \DEFAULTKEYACTION \COMMANDKEYACTION \CURRENTKEYACTION 
+\PERIODIC.INTERRUPT \PERIODIC.INTERRUPT.FREQUENCY)
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE LLKEY) (QUOTE IMPORTDATE) (IDATE "19-Aug-2021 12:06:46"))
+=======
 (PUTPROP (QUOTE LLKEY) (QUOTE IMPORTDATE) (IDATE "11-Jun-2021 09:43:22"))
+>>>>>>> Stashed changes
 
 (DATATYPE PILOTBBT ((PBTDESTLO WORD) (PBTDESTHI WORD) (PBTDESTBIT WORD) (PBTDESTBPL SIGNEDWORD) (
 PBTSOURCELO WORD) (PBTSOURCEHI WORD) (PBTSOURCEBIT WORD) (PBTSOURCEBPL SIGNEDWORD) (PBTWIDTH WORD) (
 PBTHEIGHT WORD) (PBTFLAGS WORD) (NIL 5 WORD)) (BLOCKRECORD PILOTBBT ((NIL 7 WORD) (NIL BITS 4) (
 PBTGRAYOFFSET BITS 4) (PBTGRAYWIDTHLESSONE BITS 4) (PBTGRAYHEIGHTLESSONE BITS 4) (NIL 2 WORD) (
 PBTBACKWARD FLAG) (PBTDISJOINT FLAG) (PBTDISJOINTITEMS FLAG) (PBTUSEGRAY FLAG) (PBTSOURCETYPE BITS 1) 
-(PBTOPERATION BITS 2) (NIL BITS 9))) (ACCESSFNS PILOTBBT ((PBTSOURCE (\\VAG2 (|fetch| PBTSOURCEHI |of|
- DATUM) (|fetch| PBTSOURCELO |of| DATUM)) (PROGN (|replace| PBTSOURCEHI |of| DATUM |with| (\\HILOC 
-NEWVALUE)) (|replace| PBTSOURCELO |of| DATUM |with| (\\LOLOC NEWVALUE)))) (PBTDEST (\\VAG2 (|fetch| 
-PBTDESTHI |of| DATUM) (|fetch| PBTDESTLO |of| DATUM)) (PROGN (|replace| PBTDESTHI |of| DATUM |with| (
-\\HILOC NEWVALUE)) (|replace| PBTDESTLO |of| DATUM |with| (\\LOLOC NEWVALUE)))))) (SYSTEM))
-(DATATYPE \\DISPLAYDATA (DDXPOSITION DDYPOSITION DDXOFFSET DDYOFFSET |DDDestination| 
-|DDClippingRegion| DDFONT |DDSlowPrintingCase| DDWIDTHSCACHE DDOFFSETSCACHE DDCOLOR DDLINEFEED 
-|DDRightMargin| |DDLeftMargin| |DDScroll| DDOPERATION DDSOURCETYPE (|DDClippingLeft| WORD) (
-|DDClippingRight| WORD) (|DDClippingBottom| WORD) (|DDClippingTop| WORD) (NIL WORD) (DDHELDFLG FLAG) (
-XWINDOWHINT XPOINTER) (DDPILOTBBT POINTER) DDXSCALE DDYSCALE DDCHARIMAGEWIDTHS DDEOLFN DDPAGEFULLFN 
-|DDTexture| DDMICAXPOS DDMICAYPOS DDMICARIGHTMARGIN DDCHARSET (DDCHARSETASCENT WORD) (DDCHARSETDESCENT
- WORD) DDCHARHEIGHTDELTA (DDSPACEWIDTH WORD)) DDPILOTBBT _ (|create| PILOTBBT PBTDISJOINT _ T) 
-|DDLeftMargin| _ 0 |DDRightMargin| _ SCREENWIDTH DDXPOSITION _ 0 DDYPOSITION _ 0 DDXOFFSET _ 0 
-DDYOFFSET _ 0 |DDClippingRegion| _ (|create| REGION) |DDDestination| _ |ScreenBitMap| DDXSCALE _ 1 
-DDYSCALE _ 1 |DDTexture| _ 0 (ACCESSFNS ((DDFOREGROUNDCOLOR (PROG ((VAL (|fetch| (\\DISPLAYDATA 
-DDCOLOR) |of| DATUM))) (OR (FIXP VAL) (BITMAPP VAL) (AND (NULL VAL) 1) (CAR VAL) (MAXIMUMCOLOR (
-BITSPERPIXEL (|fetch| (\\DISPLAYDATA |DDDestination|) |of| DATUM)))))) (DDBACKGROUNDCOLOR (OR (|fetch|
- (\\DISPLAYDATA |DDTexture|) |of| DATUM) 0)))) (SYSTEM))
+(PBTOPERATION BITS 2) (NIL BITS 9))) (ACCESSFNS PILOTBBT ((PBTSOURCE (\VAG2 (fetch PBTSOURCEHI of 
+DATUM) (fetch PBTSOURCELO of DATUM)) (PROGN (replace PBTSOURCEHI of DATUM with (\HILOC NEWVALUE)) (
+replace PBTSOURCELO of DATUM with (\LOLOC NEWVALUE)))) (PBTDEST (\VAG2 (fetch PBTDESTHI of DATUM) (
+fetch PBTDESTLO of DATUM)) (PROGN (replace PBTDESTHI of DATUM with (\HILOC NEWVALUE)) (replace 
+PBTDESTLO of DATUM with (\LOLOC NEWVALUE)))))) (SYSTEM))
+(DATATYPE \DISPLAYDATA (DDXPOSITION DDYPOSITION DDXOFFSET DDYOFFSET DDDestination DDClippingRegion 
+DDFONT DDSlowPrintingCase DDWIDTHSCACHE DDOFFSETSCACHE DDCOLOR DDLINEFEED DDRightMargin DDLeftMargin 
+DDScroll DDOPERATION DDSOURCETYPE (DDClippingLeft WORD) (DDClippingRight WORD) (DDClippingBottom WORD)
+ (DDClippingTop WORD) (NIL WORD) (DDHELDFLG FLAG) (XWINDOWHINT XPOINTER) (DDPILOTBBT POINTER) DDXSCALE
+ DDYSCALE DDCHARIMAGEWIDTHS DDEOLFN DDPAGEFULLFN DDTexture DDMICAXPOS DDMICAYPOS DDMICARIGHTMARGIN 
+DDCHARSET (DDCHARSETASCENT WORD) (DDCHARSETDESCENT WORD) DDCHARHEIGHTDELTA (DDSPACEWIDTH WORD)) 
+DDPILOTBBT _ (create PILOTBBT PBTDISJOINT _ T) DDLeftMargin _ 0 DDRightMargin _ SCREENWIDTH 
+DDXPOSITION _ 0 DDYPOSITION _ 0 DDXOFFSET _ 0 DDYOFFSET _ 0 DDClippingRegion _ (create REGION) 
+DDDestination _ ScreenBitMap DDXSCALE _ 1 DDYSCALE _ 1 DDTexture _ 0 (ACCESSFNS ((DDFOREGROUNDCOLOR (
+PROG ((VAL (fetch (\DISPLAYDATA DDCOLOR) of DATUM))) (OR (FIXP VAL) (BITMAPP VAL) (AND (NULL VAL) 1) (
+CAR VAL) (MAXIMUMCOLOR (BITSPERPIXEL (fetch (\DISPLAYDATA DDDestination) of DATUM)))))) (
+DDBACKGROUNDCOLOR (OR (fetch (\DISPLAYDATA DDTexture) of DATUM) 0)))) (SYSTEM))
 (RECORD DISPLAYSTATE (ONOFF))
 (RECORD DISPLAYINFO (DITYPE DIWIDTH DIHEIGHT DIBITSPERPIXEL DIWSOPS))
-(PUTPROPS \\GETDISPLAYDATA MACRO (ARGS (COND ((CADR ARGS) (SUBPAIR (QUOTE (STRM STRMVAR)) ARGS (QUOTE 
-(\\DTEST (|fetch| (STREAM IMAGEDATA) |of| (SETQ STRMVAR (\\OUTSTREAMARG STRM))) (QUOTE \\DISPLAYDATA))
-))) (T (SUBST (CAR ARGS) (QUOTE STRM) (QUOTE (\\DTEST (|fetch| (STREAM IMAGEDATA) |of| (\\OUTSTREAMARG
- STRM)) (QUOTE \\DISPLAYDATA))))))))
-(PUTPROPS \\BITMASK MACRO ((N) (\\WORDELT BITMASKARRAY (LOGAND N 15))))
-(PUTPROPS \\4BITMASK MACRO ((N) (\\WORDELT 4BITMASKARRAY (LOGAND N 3))))
-(PUTPROPS \\NOTBITMASK MACRO ((N) (DECLARE (GLOBALVARS NOTBITMASKARRAY)) (\\WORDELT NOTBITMASKARRAY (
+(PUTPROPS \GETDISPLAYDATA MACRO (ARGS (COND ((CADR ARGS) (SUBPAIR (QUOTE (STRM STRMVAR)) ARGS (QUOTE (
+\DTEST (fetch (STREAM IMAGEDATA) of (SETQ STRMVAR (\OUTSTREAMARG STRM))) (QUOTE \DISPLAYDATA))))) (T (
+SUBST (CAR ARGS) (QUOTE STRM) (QUOTE (\DTEST (fetch (STREAM IMAGEDATA) of (\OUTSTREAMARG STRM)) (QUOTE
+ \DISPLAYDATA))))))))
+(PUTPROPS \BITMASK MACRO ((N) (\WORDELT BITMASKARRAY (LOGAND N 15))))
+(PUTPROPS \4BITMASK MACRO ((N) (\WORDELT 4BITMASKARRAY (LOGAND N 3))))
+(PUTPROPS \NOTBITMASK MACRO ((N) (DECLARE (GLOBALVARS NOTBITMASKARRAY)) (\WORDELT NOTBITMASKARRAY (
 LOGAND N 15))))
-(PUTPROPS \\NOT4BITMASK MACRO ((N) (\\WORDELT NOT4BITMASKARRAY (LOGAND N 3))))
+(PUTPROPS \NOT4BITMASK MACRO ((N) (\WORDELT NOT4BITMASKARRAY (LOGAND N 3))))
 (GLOBALVARS BITMASKARRAY NOTBITMASKARRAY 4BITMASKARRAY NOT4BITMASKARRAY)
 (RPAQQ WORDMASK 65535)
 (CONSTANTS (WORDMASK 65535))
-(PUTPROPS \\INVALIDATEDISPLAYCACHE MACRO ((DISPLAYDATA) (* |This| |marks| |the| |character-printing| 
-|caches| |of| |the| |displaystream| |as| |invalid.| |Needed| |when| |the| |font| |or| Y |position| 
-|changes|) (|freplace| (\\DISPLAYDATA DDCHARSET) |of| DISPLAYDATA |with| MAX.SMALLP) (|freplace| (
-\\DISPLAYDATA DDCHARSETASCENT) |of| DISPLAYDATA |with| MAX.SMALLP)))
-(PUTPROPS \\DSPGETCHARWIDTH MACRO ((CHARCODE DD) (\\FGETWIDTH (|ffetch| (\\DISPLAYDATA DDWIDTHSCACHE) 
-|of| DD) CHARCODE)))
-(PUTPROPS \\DSPGETCHARIMAGEWIDTH MACRO ((CHARCODE DD) (\\FGETIMAGEWIDTH (|ffetch| (\\DISPLAYDATA 
-DDCHARIMAGEWIDTHS) |of| DD) CHARCODE)))
-(PUTPROPS \\DSPGETCHAROFFSET MACRO ((CHARCODE DD) (\\GETBASE (|ffetch| (\\DISPLAYDATA DDOFFSETSCACHE) 
-|of| DD) CHARCODE)))
-(PUTPROPS \\CONVERTOP MACRO ((OP) (* |rrb| "14-NOV-80 11:14") (* |Only| |for| |alto| |bitblt| !!) (
-SELECTQ OP (|replace| 0 |of| NIL |with| NIL) (PAINT 1) (INVERT 2) (ERASE 3) 0)))
-(PUTPROPS |\\SFInvert| MACRO ((|BitMap| \y) (* |corrects| |for| |the| |fact| |that| |alto| |bitmaps| 
-|are| |stored| |with| 0\,0 |as| |upper| |left| |while| |lisp| |bitmaps| |have| 0\,0 |as| |lower| 
-|left.| |The| |correction| |is| |actually| |off| |by| |one| (|greater|) |because| \a |majority| |of| 
-|the| |places| |that| |it| |is| |called| |actually| |need| |one| |more| |than| |corrected| Y |value.|)
- (IDIFFERENCE (|fetch| (BITMAP BITMAPHEIGHT) |of| |BitMap|) \y)))
-(PUTPROPS |\\SFReplicate| MACRO (LAMBDA (|pattern|) (LOGOR |pattern| (LLSH |pattern| 8) (SETQ 
-|pattern| (LLSH |pattern| 4)) (LLSH |pattern| 8))))
-(PUTPROPS \\SETPBTFUNCTION MACRO (OPENLAMBDA (BBT |SourceType| |Operation|) (PROGN (|replace| (
-PILOTBBT PBTOPERATION) |of| BBT |with| (SELECTQ |Operation| (ERASE 1) (PAINT 2) (INVERT 3) 0)) (
-|replace| (PILOTBBT PBTSOURCETYPE) |of| BBT |with| (COND ((EQ (EQ |SourceType| (QUOTE INVERT)) (EQ 
-|Operation| (QUOTE ERASE))) 0) (T 1))))))
-(PUTPROPS \\BITBLT1 MACRO ((|bbt|) (|BitBltSUBR| |bbt|)))
+(PUTPROPS \INVALIDATEDISPLAYCACHE MACRO ((DISPLAYDATA) (* This marks the character-printing caches of 
+the displaystream as invalid. Needed when the font or Y position changes) (freplace (\DISPLAYDATA 
+DDCHARSET) of DISPLAYDATA with MAX.SMALLP) (freplace (\DISPLAYDATA DDCHARSETASCENT) of DISPLAYDATA 
+with MAX.SMALLP)))
+(PUTPROPS \DSPGETCHARWIDTH MACRO ((CHARCODE DD) (\FGETWIDTH (ffetch (\DISPLAYDATA DDWIDTHSCACHE) of DD
+) CHARCODE)))
+(PUTPROPS \DSPGETCHARIMAGEWIDTH MACRO ((CHARCODE DD) (\FGETIMAGEWIDTH (ffetch (\DISPLAYDATA 
+DDCHARIMAGEWIDTHS) of DD) CHARCODE)))
+(PUTPROPS \DSPGETCHAROFFSET MACRO ((CHARCODE DD) (\GETBASE (ffetch (\DISPLAYDATA DDOFFSETSCACHE) of DD
+) CHARCODE)))
+(PUTPROPS \CONVERTOP MACRO ((OP) (* rrb "14-NOV-80 11:14") (* Only for alto bitblt !!) (SELECTQ OP (
+replace 0 of NIL with NIL) (PAINT 1) (INVERT 2) (ERASE 3) 0)))
+(PUTPROPS \SFInvert MACRO ((BitMap y) (* corrects for the fact that alto bitmaps are stored with 0,0 
+as upper left while lisp bitmaps have 0,0 as lower left. The correction is actually off by one (
+greater) because a majority of the places that it is called actually need one more than corrected Y 
+value.) (IDIFFERENCE (fetch (BITMAP BITMAPHEIGHT) of BitMap) y)))
+(PUTPROPS \SFReplicate MACRO (LAMBDA (pattern) (LOGOR pattern (LLSH pattern 8) (SETQ pattern (LLSH 
+pattern 4)) (LLSH pattern 8))))
+(PUTPROPS \SETPBTFUNCTION MACRO (OPENLAMBDA (BBT SourceType Operation) (PROGN (replace (PILOTBBT 
+PBTOPERATION) of BBT with (SELECTQ Operation (ERASE 1) (PAINT 2) (INVERT 3) 0)) (replace (PILOTBBT 
+PBTSOURCETYPE) of BBT with (COND ((EQ (EQ SourceType (QUOTE INVERT)) (EQ Operation (QUOTE ERASE))) 0) 
+(T 1))))))
+(PUTPROPS \BITBLT1 MACRO ((bbt) (BitBltSUBR bbt)))
 (PUTPROP (QUOTE BITBLT) (QUOTE MACRO) (QUOTE (= . BKBITBLT)))
-(PROGN (PUTPROPS \\INSURETOPWDS DMACRO (OPENLAMBDA (DS) (OR (EQ DS \\TOPWDS) (COND ((FMEMB (
-DSPDESTINATION NIL DS) \\SCREENBITMAPS) (\\TOTOPWDS DS)))))) (PUTPROPS \\INSURETOPWDS MACRO ((DS) (* 
-|For| |non-window| |implementations|) (PROGN))))
-(PUTPROPS .WHILE.TOP.DS. MACRO ((FIRST . REST) (PROG (DISPINTERRUPT SOFTCURSORUP) (* FIRST |should| 
-|be| \a |displaystream| |and| \a |variable.| |This| |macro| |may| |also| |take| \a |soft| |cursor| 
-|down,| |similar| |to| |the| |way| .WHILE.CURSOR.DOWN. |does,| |but| |only| |if| |FIRST's| 
-|destination| |is| |the| |same| |as| |the| |soft| |cursor's| |destination.| *) (COND (\\SOFTCURSORP (
-SETQ SOFTCURSORUP (AND \\SOFTCURSORUPP (EQ (DSPDESTINATION NIL FIRST) \\CURSORDESTINATION))) (COND (
-SOFTCURSORUP (SETQ DISPINTERRUPT (\\GETBASE \\EM.DISPINTERRUPT 0)) (\\PUTBASE \\EM.DISPINTERRUPT 0 0) 
-(\\SOFTCURSORDOWN))))) (\\INSURETOPWDS FIRST) (PROGN . REST) (COND (SOFTCURSORUP (
-\\SOFTCURSORUPCURRENT) (\\PUTBASE \\EM.DISPINTERRUPT 0 DISPINTERRUPT))))))
-(PUTPROPS .WHILE.CURSOR.DOWN. MACRO ((FIRST . REST) (PROG (DISPINTERRUPT SOFTCURSORUP) (* |This| 
-|macro| |should| |wrap| |around| |any| |code| |that| |draws| |or| |bitblts| |directly| |from| |or| 
-|to| \a |screen| |bitmap.| E.\g. DRAWGRAYBOX |in| HLDISPLAY |which| |puts| |up| \a |shadow| |box| 
-|during| GETREGION. |The| |purpose| |of| |this| |macro| |is| |that| \a |soft| (|e.g.| |color|) 
-|cursor's| |bits| |not| |be| |taken| |to| |be| |screen| |bits| |while| FIRST & REST |are| |done.| *) (
-COND (\\SOFTCURSORP (SETQ SOFTCURSORUP \\SOFTCURSORUPP) (COND (SOFTCURSORUP (SETQ DISPINTERRUPT (
-\\GETBASE \\EM.DISPINTERRUPT 0)) (\\PUTBASE \\EM.DISPINTERRUPT 0 0) (\\SOFTCURSORDOWN))))) (PROGN 
-FIRST . REST) (COND (SOFTCURSORUP (\\SOFTCURSORUPCURRENT) (\\PUTBASE \\EM.DISPINTERRUPT 0 
-DISPINTERRUPT))))))
-(ADDTOVAR GLOBALVARS \\TOPWDS)
-(DEFOPTIMIZER TTYDISPLAYSTREAM (&REST X) (COND ((NULL (CAR X)) (QUOTE \\TERM.OFD)) (T (QUOTE 
+(PROGN (PUTPROPS \INSURETOPWDS DMACRO (OPENLAMBDA (DS) (OR (EQ DS \TOPWDS) (COND ((FMEMB (
+DSPDESTINATION NIL DS) \SCREENBITMAPS) (\TOTOPWDS DS)))))) (PUTPROPS \INSURETOPWDS MACRO ((DS) (* For 
+non-window implementations) (PROGN))))
+(PUTPROPS .WHILE.TOP.DS. MACRO ((FIRST . REST) (PROG (DISPINTERRUPT SOFTCURSORUP) (* FIRST should be a
+ displaystream and a variable. This macro may also take a soft cursor down, similar to the way 
+.WHILE.CURSOR.DOWN. does, but only if FIRST's destination is the same as the soft cursor's 
+destination. *) (COND (\SOFTCURSORP (SETQ SOFTCURSORUP (AND \SOFTCURSORUPP (EQ (DSPDESTINATION NIL 
+FIRST) \CURSORDESTINATION))) (COND (SOFTCURSORUP (SETQ DISPINTERRUPT (\GETBASE \EM.DISPINTERRUPT 0)) (
+\PUTBASE \EM.DISPINTERRUPT 0 0) (\SOFTCURSORDOWN))))) (\INSURETOPWDS FIRST) (PROGN . REST) (COND (
+SOFTCURSORUP (\SOFTCURSORUPCURRENT) (\PUTBASE \EM.DISPINTERRUPT 0 DISPINTERRUPT))))))
+(PUTPROPS .WHILE.CURSOR.DOWN. MACRO ((FIRST . REST) (PROG (DISPINTERRUPT SOFTCURSORUP) (* This macro 
+should wrap around any code that draws or bitblts directly from or to a screen bitmap. E.g. 
+DRAWGRAYBOX in HLDISPLAY which puts up a shadow box during GETREGION. The purpose of this macro is 
+that a soft (e.g. color) cursor's bits not be taken to be screen bits while FIRST & REST are done. *) 
+(COND (\SOFTCURSORP (SETQ SOFTCURSORUP \SOFTCURSORUPP) (COND (SOFTCURSORUP (SETQ DISPINTERRUPT (
+\GETBASE \EM.DISPINTERRUPT 0)) (\PUTBASE \EM.DISPINTERRUPT 0 0) (\SOFTCURSORDOWN))))) (PROGN FIRST . 
+REST) (COND (SOFTCURSORUP (\SOFTCURSORUPCURRENT) (\PUTBASE \EM.DISPINTERRUPT 0 DISPINTERRUPT))))))
+(ADDTOVAR GLOBALVARS \TOPWDS)
+(DEFOPTIMIZER TTYDISPLAYSTREAM (&REST X) (COND ((NULL (CAR X)) (QUOTE \TERM.OFD)) (T (QUOTE 
 IGNOREMACRO))))
-(GLOBALVARS BELLCNT BELLRATE TTYBACKGROUNDFNS |\\DisplayStoppedForLogout| \\CARET.UP)
-(PUTPROPS \\CHECKCARET MACRO ((X) (AND \\CARET.UP (\\CARET.DOWN X))))
-(PUTPROPS \\DSPTRANSFORMX MACRO ((X DD) (* |transforms| |an| \x |coordinate| |into| |the| 
-|destination| |coordinate.|) (IPLUS X (|fetch| (\\DISPLAYDATA DDXOFFSET) |of| DD))))
-(PUTPROPS \\DSPTRANSFORMY MACRO ((Y DD) (* |transforms| |an| \y |coordinate| |into| |the| 
-|destination| |coordinate.|) (IPLUS Y (|fetch| (\\DISPLAYDATA DDYOFFSET) |of| DD))))
-(PUTPROPS \\OFFSETBOTTOM MACRO ((X) (* |gives| |the| |destination| |coordinate| |address| |of| |the| 
-|origin.|) (|fetch| (\\DISPLAYDATA DDYOFFSET) |of| X)))
-(PUTPROPS \\OFFSETLEFT MACRO ((DD) (* |returns| |the| \x |origin| |of| |display| |data| |destination| 
-|coordinates.|) (|fetch| (\\DISPLAYDATA DDXOFFSET) |of| DD)))
-(PUTPROPS DISPLAYINITIALIZEDP MACRO (NIL (* |always| |initialized| |now|) T))
-(PUTPROPS DISPLAYSTARTEDP MACRO (NIL |\\DisplayStarted|))
-(GLOBALVARS |\\DisplayStarted| |\\DisplayStreamsInitialized| |\\DisplayInitialed| WHOLEDISPLAY 
-WHOLESCREEN SCREENWIDTH SCREENHEIGHT)
-(PUTPROP (QUOTE LLDISPLAY) (QUOTE IMPORTDATE) (IDATE "18-Apr-1994 00:20:42"))
+(GLOBALVARS BELLCNT BELLRATE TTYBACKGROUNDFNS \DisplayStoppedForLogout \CARET.UP)
+(PUTPROPS \CHECKCARET MACRO ((X) (AND \CARET.UP (\CARET.DOWN X))))
+(PUTPROPS \DSPTRANSFORMX MACRO ((X DD) (* transforms an x coordinate into the destination coordinate.)
+ (IPLUS X (fetch (\DISPLAYDATA DDXOFFSET) of DD))))
+(PUTPROPS \DSPTRANSFORMY MACRO ((Y DD) (* transforms an y coordinate into the destination coordinate.)
+ (IPLUS Y (fetch (\DISPLAYDATA DDYOFFSET) of DD))))
+(PUTPROPS \OFFSETBOTTOM MACRO ((X) (* gives the destination coordinate address of the origin.) (fetch 
+(\DISPLAYDATA DDYOFFSET) of X)))
+(PUTPROPS \OFFSETLEFT MACRO ((DD) (* returns the x origin of display data destination coordinates.) (
+fetch (\DISPLAYDATA DDXOFFSET) of DD)))
+(PUTPROPS DISPLAYINITIALIZEDP MACRO (NIL (* always initialized now) T))
+(PUTPROPS DISPLAYSTARTEDP MACRO (NIL \DisplayStarted))
+(GLOBALVARS \DisplayStarted \DisplayStreamsInitialized \DisplayInitialed WHOLEDISPLAY WHOLESCREEN 
+SCREENWIDTH SCREENHEIGHT)
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE LLDISPLAY) (QUOTE IMPORTDATE) (IDATE "13-Aug-2021 23:55:35"))
+=======
+(PUTPROP (QUOTE LLDISPLAY) (QUOTE IMPORTDATE) (IDATE " 5-Aug-2021 14:00:27"))
+>>>>>>> Stashed changes
 
 (RECORD REGION (LEFT BOTTOM WIDTH HEIGHT) LEFT _ -16383 BOTTOM _ -16383 WIDTH _ 32767 HEIGHT _ 32767 (
-ACCESSFNS ((TOP (IPLUS (|fetch| (REGION BOTTOM) |of| DATUM) (|fetch| (REGION HEIGHT) |of| DATUM) -1)) 
-(PTOP (IPLUS (|fetch| (REGION BOTTOM) |of| DATUM) (|fetch| (REGION HEIGHT) |of| DATUM))) (RIGHT (IPLUS
- (|fetch| (REGION LEFT) |of| DATUM) (|fetch| (REGION WIDTH) |of| DATUM) -1)) (PRIGHT (IPLUS (|fetch| (
-REGION LEFT) |of| DATUM) (|fetch| (REGION WIDTH) |of| DATUM))))) (TYPE? (AND (EQLENGTH DATUM 4) (EVERY
- DATUM (FUNCTION NUMBERP)))) (SYSTEM))
+ACCESSFNS ((TOP (IPLUS (fetch (REGION BOTTOM) of DATUM) (fetch (REGION HEIGHT) of DATUM) -1)) (PTOP (
+IPLUS (fetch (REGION BOTTOM) of DATUM) (fetch (REGION HEIGHT) of DATUM))) (RIGHT (IPLUS (fetch (REGION
+ LEFT) of DATUM) (fetch (REGION WIDTH) of DATUM) -1)) (PRIGHT (IPLUS (fetch (REGION LEFT) of DATUM) (
+fetch (REGION WIDTH) of DATUM))))) (TYPE? (AND (EQLENGTH DATUM 4) (EVERY DATUM (FUNCTION NUMBERP)))) (
+SYSTEM))
 (DATATYPE BITMAP ((BITMAPBASE POINTER) (BITMAPRASTERWIDTH WORD) (BITMAPHEIGHT WORD) (BITMAPWIDTH WORD)
- (BITMAPBITSPERPIXEL WORD)) BITMAPBITSPERPIXEL _ 1 (BLOCKRECORD BITMAP ((|BitMapHiLoc| WORD) (
-|BitMapLoLoc| WORD)) (* \; "overlay initial pointer")) (SYSTEM))
+ (BITMAPBITSPERPIXEL WORD)) BITMAPBITSPERPIXEL _ 1 (BLOCKRECORD BITMAP ((BitMapHiLoc WORD) (
+BitMapLoLoc WORD)) (* ; "overlay initial pointer")) (SYSTEM))
 (BLOCKRECORD BITMAPWORD ((BITS WORD)) (SYSTEM))
 (RECORD POSITION (XCOORD . YCOORD) (TYPE? (AND (LISTP DATUM) (NUMBERP (CAR DATUM)) (NUMBERP (CDR DATUM
 )))) (SYSTEM))
-(DATATYPE CURSOR (CUIMAGE CUMASK CUHOTSPOTX CUHOTSPOTY CUDATA) (ACCESSFNS ((CUBITSPERPIXEL (|fetch| (
-BITMAP BITMAPBITSPERPIXEL) |of| (|fetch| (CURSOR CUIMAGE) |of| DATUM))))) (SYSTEM))
+(DATATYPE CURSOR (CUIMAGE CUMASK CUHOTSPOTX CUHOTSPOTY CUDATA) (ACCESSFNS ((CUBITSPERPIXEL (fetch (
+BITMAP BITMAPBITSPERPIXEL) of (fetch (CURSOR CUIMAGE) of DATUM))))) (SYSTEM))
 (RECORD MOUSEEVENT (MOUSEX MOUSEY MOUSEBUTTONS KEYBOARD MOUSETIME) (SYSTEM))
-(RECORD SCREENREGION (SCREEN . REGION) (SUBRECORD REGION) (TYPE? (AND (LISTP DATUM) (|type?| SCREEN (
-CAR DATUM)) (|type?| REGION (CDR DATUM)))) (SYSTEM))
-(RECORD SCREENPOSITION (SCREEN . POSITION) (SUBRECORD POSITION) (TYPE? (AND (LISTP DATUM) (|type?| 
-SCREEN (CAR DATUM)) (|type?| POSITION (CDR DATUM)))) (SYSTEM))
-(PUTPROPS CURSORBITMAP MACRO (NIL |CursorBitMap|))
+(RECORD SCREENREGION (SCREEN . REGION) (SUBRECORD REGION) (TYPE? (AND (LISTP DATUM) (type? SCREEN (CAR
+ DATUM)) (type? REGION (CDR DATUM)))) (SYSTEM))
+(RECORD SCREENPOSITION (SCREEN . POSITION) (SUBRECORD POSITION) (TYPE? (AND (LISTP DATUM) (type? 
+SCREEN (CAR DATUM)) (type? POSITION (CDR DATUM)))) (SYSTEM))
+(PUTPROPS CURSORBITMAP MACRO (NIL CursorBitMap))
 (RPAQQ HARDCURSORHEIGHT 16)
 (RPAQQ HARDCURSORWIDTH 16)
 (CONSTANTS (HARDCURSORHEIGHT 16) (HARDCURSORWIDTH 16))
-(ADDTOVAR GLOBALVARS |CursorBitMap|)
+(ADDTOVAR GLOBALVARS CursorBitMap)
 (ARRAYRECORD POLYNOMIAL (A B C D) (CREATE (ARRAY 4 (QUOTE FLOATP))) (SYSTEM))
-(RECORD SPLINE (\#KNOTS SPLINEX SPLINEY SPLINEDX SPLINEDY SPLINEDDX SPLINEDDY SPLINEDDDX SPLINEDDDY))
+(RECORD SPLINE (%#KNOTS SPLINEX SPLINEY SPLINEDX SPLINEDY SPLINEDDX SPLINEDDY SPLINEDDDX SPLINEDDDY))
 (PUTPROPS HALF MACRO ((X) (LRSH X 1)))
-(PUTPROPS \\FILLCIRCLEBLT MACRO (OPENLAMBDA (CX CY X Y) (* \; 
-"calls bitblt twice to fill in one line of the circle.") (\\LINEBLT FCBBT (IDIFFERENCE CX X) (IPLUS CY
- Y) (IPLUS CX X) DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS
-) (\\LINEBLT FCBBT (IDIFFERENCE CX X) (IDIFFERENCE CY Y) (IPLUS CX X) DESTINATIONBASE RASTERWIDTH LEFT
- RIGHT BOTTOM TOP GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS)))
+(PUTPROPS \FILLCIRCLEBLT MACRO (OPENLAMBDA (CX CY X Y) (* ; 
+"calls bitblt twice to fill in one line of the circle.") (\LINEBLT FCBBT (IDIFFERENCE CX X) (IPLUS CY 
+Y) (IPLUS CX X) DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS)
+ (\LINEBLT FCBBT (IDIFFERENCE CX X) (IDIFFERENCE CY Y) (IPLUS CX X) DESTINATIONBASE RASTERWIDTH LEFT 
+RIGHT BOTTOM TOP GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS)))
 (PUTDEF (QUOTE BITMAPS) (QUOTE FILEPKGCOMS) (QUOTE ((COM MACRO (X (VARS . X))))))
 (PUTDEF (QUOTE CURSORS) (QUOTE FILEPKGCOMS) (QUOTE ((COM MACRO (X (E (MAPC (QUOTE X) (QUOTE 
 PRINTCURSOR))))))))
-(ADDTOVAR GLOBALVARS SCREENHEIGHT SCREENWIDTH |ScreenBitMap|)
+(ADDTOVAR GLOBALVARS SCREENHEIGHT SCREENWIDTH ScreenBitMap)
 (RPAQQ BLACKSHADE 65535)
 (RPAQQ WHITESHADE 0)
 (CONSTANTS (BLACKSHADE 65535) (WHITESHADE 0))
@@ -2024,29 +2003,29 @@ PRINTCURSOR))))))))
 (RECORD RGB (RED GREEN BLUE))
 (PUTPROP (QUOTE ADISPLAY) (QUOTE IMPORTDATE) (IDATE "13-Jun-2021 14:03:35"))
 
-(ADDTOVAR SYSSPECVARS \\INTERRUPTABLE)
+(ADDTOVAR SYSSPECVARS \INTERRUPTABLE)
 (PUTPROPS UNINTERRUPTABLY INFO EVAL)
-(PUTPROPS UNINTERRUPTABLY DMACRO ((X . Y) ((LAMBDA (\\INTERRUPTABLE) (PROGN X . Y)) NIL)))
+(PUTPROPS UNINTERRUPTABLY DMACRO ((X . Y) ((LAMBDA (\INTERRUPTABLE) (PROGN X . Y)) NIL)))
 (ADDTOVAR PRETTYPRINTMACROS (UNINTERRUPTABLY LAMBDA (FORM) (PROG ((POS (IPLUS 4 (POSITION)))) (PRIN1 
 "(") (PRIN2 (CAR FORM)) (OR (EQ COMMENTFLG (CAAR (SETQ FORM (CDR FORM)))) (TAB POS 0)) (PRINTDEF FORM 
 POS T T FNSLST) (PRIN1 ")"))))
-(BLOCKRECORD INTERRUPTSTATE ((* |;;| 
+(BLOCKRECORD INTERRUPTSTATE ((* ;; 
 "This is the structure used to communicate between the emulator and Lisp re interrupts.  There is a bit per interrupt type, plus space for the character code that caused a keyboard interrupt."
-) (* |;;| "This must match the INTSTAT definition in lispemul.h") (* |;;| "PENDING-INTERRUPT FLAGS:") 
-(LOGMSGSPENDING FLAG) (* \; " Log/Console msgs need printing.") (ETHERINTERRUPT FLAG) (* \; 
-"Ether packet read finished.") (IOINTERRUPT FLAG) (GCDISABLED FLAG) (* \; "No mroe room in GC tables."
-) (VMEMFULL FLAG) (* \; "VMEM is full!!") (STACKOVERFLOW FLAG) (* \; "Stack overflowed.") (STORAGEFULL
- FLAG) (* \; "Ran out of storage, atoms, etc.") (WAITINGINTERRUPT FLAG) (* |;;| 
-"INTERRUPTS-IN-PROCESS MASK:") (P-LOGMSGSPENDING FLAG) (* \; " Log/Console msgs need printing.") (
-P-ETHERINTERRUPT FLAG) (* \; "Ether packet read finished.") (P-IOINTERRUPT FLAG) (P-GCDISABLED FLAG) (
-* \; "No mroe room in GC tables.") (P-VMEMFULL FLAG) (* \; "VMEM is full!!") (P-STACKOVERFLOW FLAG) (*
- \; "Stack overflowed.") (P-STORAGEFULL FLAG) (* \; "Ran out of storage, atoms, etc.") (
-P-WAITINGINTERRUPT FLAG) (INTCHARCODE WORD)) (BLOCKRECORD INTERRUPTSTATE ((* |;;| 
-"Alternative view of the structure:") (PENDING BITS 8) (* \; "Pending-interrupt flags") (IN-PROGRESS 
-BITS 8) (* \; "Mask to prevent re-interrupt for an interrupt in progress") (NIL WORD))))
-(PUTPROPS \\TAKEINTERRUPT DMACRO ((PREFORM POSTFORM) (DECLARE (GLOBALVARS \\PENDINGINTERRUPT)) (COND (
-(AND \\PENDINGINTERRUPT (INTERRUPTABLE~=NILUPTHESTACK)) PREFORM ((LAMBDA (\\INTERRUPTABLE) (
-\\CALLINTERRUPTED)) T) POSTFORM))))
+) (* ;; "This must match the INTSTAT definition in lispemul.h") (* ;; "PENDING-INTERRUPT FLAGS:") (
+LOGMSGSPENDING FLAG) (* ; " Log/Console msgs need printing.") (ETHERINTERRUPT FLAG) (* ; 
+"Ether packet read finished.") (IOINTERRUPT FLAG) (GCDISABLED FLAG) (* ; "No mroe room in GC tables.")
+ (VMEMFULL FLAG) (* ; "VMEM is full!!") (STACKOVERFLOW FLAG) (* ; "Stack overflowed.") (STORAGEFULL 
+FLAG) (* ; "Ran out of storage, atoms, etc.") (WAITINGINTERRUPT FLAG) (* ;; 
+"INTERRUPTS-IN-PROCESS MASK:") (P-LOGMSGSPENDING FLAG) (* ; " Log/Console msgs need printing.") (
+P-ETHERINTERRUPT FLAG) (* ; "Ether packet read finished.") (P-IOINTERRUPT FLAG) (P-GCDISABLED FLAG) (*
+ ; "No mroe room in GC tables.") (P-VMEMFULL FLAG) (* ; "VMEM is full!!") (P-STACKOVERFLOW FLAG) (* ; 
+"Stack overflowed.") (P-STORAGEFULL FLAG) (* ; "Ran out of storage, atoms, etc.") (P-WAITINGINTERRUPT 
+FLAG) (INTCHARCODE WORD)) (BLOCKRECORD INTERRUPTSTATE ((* ;; "Alternative view of the structure:") (
+PENDING BITS 8) (* ; "Pending-interrupt flags") (IN-PROGRESS BITS 8) (* ; 
+"Mask to prevent re-interrupt for an interrupt in progress") (NIL WORD))))
+(PUTPROPS \TAKEINTERRUPT DMACRO ((PREFORM POSTFORM) (DECLARE (GLOBALVARS \PENDINGINTERRUPT)) (COND ((
+AND \PENDINGINTERRUPT (INTERRUPTABLE~=NILUPTHESTACK)) PREFORM ((LAMBDA (\INTERRUPTABLE) (
+\CALLINTERRUPTED)) T) POSTFORM))))
 (PUTPROP (QUOTE AINTERRUPT) (QUOTE IMPORTDATE) (IDATE "17-Sep-1992 10:42:38"))
 
 (PUTPROPS UNLESSRDSYS MACRO ((NORMAL RDSYS) NORMAL))
@@ -2055,32 +2034,32 @@ BITS 8) (* \; "Mask to prevent re-interrupt for an interrupt in progress") (NIL
 (PUTPROPS 2ND MACRO ((A B . C) B))
 (PUTPROPS LOCAL MACRO ((X) X))
 (PUTPROPS ALLOCAL MACRO ((X) X))
-(PUTPROPS ADDBASE DMACRO (= . \\ADDBASE))
-(PUTPROPS GETBASE DMACRO (= . \\GETBASE))
-(PUTPROPS GETBASEBYTE DMACRO (= . \\GETBASEBYTE))
-(PUTPROPS GETBASEPTR DMACRO (= . \\GETBASEPTR))
-(PUTPROPS HILOC DMACRO (= . \\HILOC))
-(PUTPROPS LOLOC DMACRO (= . \\LOLOC))
-(PUTPROPS PUTBASE DMACRO (= . \\PUTBASE))
-(PUTPROPS PUTBASEBYTE DMACRO (= . \\PUTBASEBYTE))
-(PUTPROPS PUTBASEPTR DMACRO (= . \\PUTBASEPTR))
-(PUTPROPS REPLACEPTRFIELD DMACRO (= . \\RPLPTR))
-(PUTPROPS VAG2 DMACRO (= . \\VAG2))
-(PUTPROPS PAGEBASE MACRO ((PTR) (|fetch| (POINTER PAGEBASE) |of| PTR)))
-(PUTPROPS PAGELOC MACRO (OPENLAMBDA (PTR) (IPLUS (LLSH (\\HILOC PTR) 8) (LRSH (\\LOLOC PTR) 8))))
+(PUTPROPS ADDBASE DMACRO (= . \ADDBASE))
+(PUTPROPS GETBASE DMACRO (= . \GETBASE))
+(PUTPROPS GETBASEBYTE DMACRO (= . \GETBASEBYTE))
+(PUTPROPS GETBASEPTR DMACRO (= . \GETBASEPTR))
+(PUTPROPS HILOC DMACRO (= . \HILOC))
+(PUTPROPS LOLOC DMACRO (= . \LOLOC))
+(PUTPROPS PUTBASE DMACRO (= . \PUTBASE))
+(PUTPROPS PUTBASEBYTE DMACRO (= . \PUTBASEBYTE))
+(PUTPROPS PUTBASEPTR DMACRO (= . \PUTBASEPTR))
+(PUTPROPS REPLACEPTRFIELD DMACRO (= . \RPLPTR))
+(PUTPROPS VAG2 DMACRO (= . \VAG2))
+(PUTPROPS PAGEBASE MACRO ((PTR) (fetch (POINTER PAGEBASE) of PTR)))
+(PUTPROPS PAGELOC MACRO (OPENLAMBDA (PTR) (IPLUS (LLSH (\HILOC PTR) 8) (LRSH (\LOLOC PTR) 8))))
 (PUTPROP (QUOTE RENAMEMACROS) (QUOTE IMPORTDATE) (IDATE "27-Apr-1994 15:43:27"))
 
 (PUTPROPS MOUSESTATE MACRO (ARGS (LIST (QUOTE PROGN) (QUOTE (GETMOUSESTATE)) (MOUSESTATE-EXPR (CAR 
 ARGS) T))))
 (PUTPROPS LASTMOUSESTATE MACRO (ARGS (MOUSESTATE-EXPR (CAR ARGS) T)))
-(PUTPROPS UNTILMOUSESTATE MACRO (ARGS (COND ((AND (CDR ARGS) (CADR ARGS) (NEQ (CADR ARGS) T)) (* 
-|time| |argument| |is| |given| |and| |is| |not| T |or| NIL\; |compile| |in| |time| |keeping| |loop.|) 
-(LIST (QUOTE PROG) (LIST (LIST (QUOTE TIMEOUT) (LIST (QUOTE IPLUS) (QUOTE (CLOCK 0)) (LIST (QUOTE OR) 
-(LIST (QUOTE NUMBERP) (CADR ARGS)) 100))) (QUOTE (NOWTIME (CLOCK 0)))) (QUOTE LP) (LIST (QUOTE COND) (
-LIST (CONS (QUOTE MOUSESTATE) (LIST (CAR ARGS) T)) (QUOTE (RETURN T)))) (QUOTE (COND ((IGREATERP (
-CLOCK0 NOWTIME) TIMEOUT) (RETURN NIL)) (T (\\BACKGROUND)))) (QUOTE (GO LP)))) (T (LIST (QUOTE PROG) 
-NIL (QUOTE LP) (LIST (QUOTE COND) (LIST (CONS (QUOTE MOUSESTATE) (LIST (CAR ARGS) T)) (QUOTE (RETURN T
-)))) (QUOTE (\\BACKGROUND)) (QUOTE (GO LP)))))))
+(PUTPROPS UNTILMOUSESTATE MACRO (ARGS (COND ((AND (CDR ARGS) (CADR ARGS) (NEQ (CADR ARGS) T)) (* time 
+argument is given and is not T or NIL; compile in time keeping loop.) (LIST (QUOTE PROG) (LIST (LIST (
+QUOTE TIMEOUT) (LIST (QUOTE IPLUS) (QUOTE (CLOCK 0)) (LIST (QUOTE OR) (LIST (QUOTE NUMBERP) (CADR ARGS
+)) 100))) (QUOTE (NOWTIME (CLOCK 0)))) (QUOTE LP) (LIST (QUOTE COND) (LIST (CONS (QUOTE MOUSESTATE) (
+LIST (CAR ARGS) T)) (QUOTE (RETURN T)))) (QUOTE (COND ((IGREATERP (CLOCK0 NOWTIME) TIMEOUT) (RETURN 
+NIL)) (T (\BACKGROUND)))) (QUOTE (GO LP)))) (T (LIST (QUOTE PROG) NIL (QUOTE LP) (LIST (QUOTE COND) (
+LIST (CONS (QUOTE MOUSESTATE) (LIST (CAR ARGS) T)) (QUOTE (RETURN T)))) (QUOTE (\BACKGROUND)) (QUOTE (
+GO LP)))))))
 (PUTPROPS KEYSETSTATE MACRO (ARGS (LIST (QUOTE PROGN) (QUOTE (GETMOUSESTATE)) (MOUSESTATE-EXPR (CAR 
 ARGS)))))
 (PUTPROPS LASTKEYSETSTATE MACRO (ARGS (MOUSESTATE-EXPR (CAR ARGS))))
@@ -2092,192 +2071,190 @@ ARGS)))))
 (PUTPROPS .COPYKEYDOWNP. MACRO (NIL (OR (KEYDOWNP (QUOTE LSHIFT)) (KEYDOWNP (QUOTE RSHIFT)) (KEYDOWNP 
 (QUOTE COPY)))))
 (PUTPROPS WSOP MACRO (ARGS (LET ((METHOD (CADR (CAR ARGS))) (DISPLAY (CADR ARGS)) (OTHERARGS (CDDR 
-ARGS))) (BQUOTE (SPREADAPPLY* (|fetch| (WSOPS (\\\, METHOD)) |of| (|fetch| (FDEV WINDOWOPS) |of| (\\\,
- DISPLAY))) (\\\, DISPLAY) (\\\,@ OTHERARGS))))))
-(PUTPROPS \\COERCETODS MACRO (OPENLAMBDA (X) (COND ((|type?| WINDOW X) (|fetch| (WINDOW DSP) |of| X)) 
-(T (\\ILLEGAL.ARG X)))))
-(PUTPROPS .WHILE.ON.TOP. MACRO ((FIRST . REST) (UNINTERRUPTABLY (\\INTERNALTOTOPW FIRST) . REST)))
+ARGS))) (BQUOTE (SPREADAPPLY* (fetch (WSOPS (\, METHOD)) of (fetch (FDEV WINDOWOPS) of (\, DISPLAY))) 
+(\, DISPLAY) (\,@ OTHERARGS))))))
+(PUTPROPS \COERCETODS MACRO (OPENLAMBDA (X) (COND ((type? WINDOW X) (fetch (WINDOW DSP) of X)) (T (
+\ILLEGAL.ARG X)))))
+(PUTPROPS .WHILE.ON.TOP. MACRO ((FIRST . REST) (UNINTERRUPTABLY (\INTERNALTOTOPW FIRST) . REST)))
 (PUTPROPS WINDOWOP DMACRO (ARGS (LET ((OPNAME (CAR ARGS)) (METHOD-DEVICE (CADR ARGS)) (TAIL (CDDR ARGS
-))) (COND ((AND (LISTP OPNAME) (EQ (CAR OPNAME) (QUOTE QUOTE))) (BQUOTE (SPREADAPPLY* (|fetch| (SCREEN
- (\\\, (CADR OPNAME))) |of| (\\\, METHOD-DEVICE)) (\\\, METHOD-DEVICE) (\\\,@ TAIL)))) (T (ERROR 
+))) (COND ((AND (LISTP OPNAME) (EQ (CAR OPNAME) (QUOTE QUOTE))) (BQUOTE (SPREADAPPLY* (fetch (SCREEN (
+\, (CADR OPNAME))) of (\, METHOD-DEVICE)) (\, METHOD-DEVICE) (\,@ TAIL)))) (T (ERROR 
 "OPNAME not quoted: " OPNAME))))))
-(RPAQQ |MinWindowWidth| 26)
-(RPAQQ |MinWindowHeight| 16)
-(CONSTANTS (|MinWindowWidth| 26) (|MinWindowHeight| 16))
-(DATATYPE WINDOW (DSP (* \; "The display stream you use to actually printto the window.") NEXTW (* \; 
-"Next window in the open-window list") SAVE (* \; "Saved image from anything this window's on top of")
- REG (* \; "Screen region this window occupies") BUTTONEVENTFN (* \; 
-"FN called when left/middle mouse button goes up/down") RIGHTBUTTONFN (* \; 
-"FN called when right mouse button goes up/down") CURSORINFN (* \; 
-"Fn called when mouse enters window") CURSOROUTFN (* \; "Called when mouse leaves window") 
-CURSORMOVEDFN (* \; "Called when mouse moves in window") REPAINTFN (* \; 
-"Redisplay part of thie window") RESHAPEFN (* \; "Called when window is reshaped") EXTENT (* \; 
-"Scrolling limits") USERDATA (* \; "Proplist to hold other window properites") VERTSCROLLREG (* \; 
-"Region of vert scroll bar") HORIZSCROLLREG (* \; "Tegion of horiz scroll bar") SCROLLFN (* \; 
-"Fn to scroll this window") VERTSCROLLWINDOW (* \; "Vert scroll bar") HORIZSCROLLWINDOW (* \; 
-"Horiz scroll bar") CLOSEFN (* \; "Called at close time") MOVEFN (* \; "Called when window is moved") 
-WTITLE (* \; "Window's title string, if any") NEWREGIONFN (* \; "Called to get new window shape") 
-WBORDER (* \; "Window border-width, in pixels") PROCESS (* \; 
-"Medley process associated with this window") WINDOWENTRYFN (* \; 
-"Fn to call when kbd focus is switched here") SCREEN (* \; "Screen this window appears on") (
-NATIVE-HANDLE FIXP) (* \; 
+(RPAQQ MinWindowWidth 26)
+(RPAQQ MinWindowHeight 16)
+(CONSTANTS (MinWindowWidth 26) (MinWindowHeight 16))
+(DATATYPE WINDOW (DSP (* ; "The display stream you use to actually printto the window.") NEXTW (* ; 
+"Next window in the open-window list") SAVE (* ; "Saved image from anything this window's on top of") 
+REG (* ; "Screen region this window occupies") BUTTONEVENTFN (* ; 
+"FN called when left/middle mouse button goes up/down") RIGHTBUTTONFN (* ; 
+"FN called when right mouse button goes up/down") CURSORINFN (* ; "Fn called when mouse enters window"
+) CURSOROUTFN (* ; "Called when mouse leaves window") CURSORMOVEDFN (* ; 
+"Called when mouse moves in window") REPAINTFN (* ; "Redisplay part of thie window") RESHAPEFN (* ; 
+"Called when window is reshaped") EXTENT (* ; "Scrolling limits") USERDATA (* ; 
+"Proplist to hold other window properites") VERTSCROLLREG (* ; "Region of vert scroll bar") 
+HORIZSCROLLREG (* ; "Tegion of horiz scroll bar") SCROLLFN (* ; "Fn to scroll this window") 
+VERTSCROLLWINDOW (* ; "Vert scroll bar") HORIZSCROLLWINDOW (* ; "Horiz scroll bar") CLOSEFN (* ; 
+"Called at close time") MOVEFN (* ; "Called when window is moved") WTITLE (* ; 
+"Window's title string, if any") NEWREGIONFN (* ; "Called to get new window shape") WBORDER (* ; 
+"Window border-width, in pixels") PROCESS (* ; "Medley process associated with this window") 
+WINDOWENTRYFN (* ; "Fn to call when kbd focus is switched here") SCREEN (* ; 
+"Screen this window appears on") (NATIVE-HANDLE FIXP) (* ; 
 "Uniterpreted place for native window to store a C pointer to its private info") (NATIVE-INFO1 FIXP) (
-* \; "Reserved in case the pointer must be 64 bits") (NATIVE-W1 WORD) (* \; 
-"Word for use by native handler") (NATIVE-W2 WORD) (* \; "Word for use by native handler") (NATIVE-P1 
-POINTER) (* \; "Lisp pointer for use by native handler")) BUTTONEVENTFN _ (FUNCTION TOTOPW) WBORDER _ 
-|WBorder| WINDOWENTRYFN _ (FUNCTION GIVE.TTY.PROCESS) (SYSTEM))
+* ; "Reserved in case the pointer must be 64 bits") (NATIVE-W1 WORD) (* ; 
+"Word for use by native handler") (NATIVE-W2 WORD) (* ; "Word for use by native handler") (NATIVE-P1 
+POINTER) (* ; "Lisp pointer for use by native handler")) BUTTONEVENTFN _ (FUNCTION TOTOPW) WBORDER _ 
+WBorder WINDOWENTRYFN _ (FUNCTION GIVE.TTY.PROCESS) (SYSTEM))
 (DATATYPE SCREEN (SCONOFF SCDESTINATION SCWIDTH SCHEIGHT SCTOPW SCTOPWDS SCTITLEDS SCFDEV SCDS SCDATA 
-(* |;;| "Space for native window manager interface to use.") (HANDLE FIXP) (* \; 
-"Handle for emulator to store info about display for C code use.") (HANDLE2 FIXP) (* \; 
-"Reserved in case HANDLE needs to be 64 bits on the C side.") (NATIVE-INFO POINTER) (* \; 
-"POINTER for the private use of the emulator window code") NATIVETYPE (* \; 
-"Symbol to tell what kind of native window system we're using.") (* |;;| 
-"- - - Functional interface to screen management - - -") WINIMAGEOPS (* \; 
-"IMAGEOPS to be used in display streas on this kind of screen") WINFDEV (* \; 
-"FDEV for display streams on this screen") CREATEWFN (* \; "Create a window") OPENWFN (* \; 
-"Open a window") CLOSEWFN (* \; "Close a window") MOVEWFN (* \; "Move a window") RELMOVEWFN (* \; 
-"Move window, relative") SHRINKWFN (* \; "Shrink window to icon") EXPANDWFN (* \; 
-"Expand icon to window") SHAPEWFN (* \; "Reshape a window") REDISPLAYFN (* \; 
-"Redisplay (part of) a window") GETWINDOWPROPFN (* \; "Get window property value") PUTWINDOWPROPFN (* 
-\; "Set window property value") BURYWFN (* \; "Move window behind all others") TOTOPWFN (* \; 
-"Move iwindow in front of all others") IMPORTWFN (* \; 
-"Take a native window and save its state internally") EXPORTWFN (* \; 
+(* ;; "Space for native window manager interface to use.") (HANDLE FIXP) (* ; 
+"Handle for emulator to store info about display for C code use.") (HANDLE2 FIXP) (* ; 
+"Reserved in case HANDLE needs to be 64 bits on the C side.") (NATIVE-INFO POINTER) (* ; 
+"POINTER for the private use of the emulator window code") NATIVETYPE (* ; 
+"Symbol to tell what kind of native window system we're using.") (* ;; 
+"- - - Functional interface to screen management - - -") WINIMAGEOPS (* ; 
+"IMAGEOPS to be used in display streas on this kind of screen") WINFDEV (* ; 
+"FDEV for display streams on this screen") CREATEWFN (* ; "Create a window") OPENWFN (* ; 
+"Open a window") CLOSEWFN (* ; "Close a window") MOVEWFN (* ; "Move a window") RELMOVEWFN (* ; 
+"Move window, relative") SHRINKWFN (* ; "Shrink window to icon") EXPANDWFN (* ; 
+"Expand icon to window") SHAPEWFN (* ; "Reshape a window") REDISPLAYFN (* ; 
+"Redisplay (part of) a window") GETWINDOWPROPFN (* ; "Get window property value") PUTWINDOWPROPFN (* ;
+ "Set window property value") BURYWFN (* ; "Move window behind all others") TOTOPWFN (* ; 
+"Move iwindow in front of all others") IMPORTWFN (* ; 
+"Take a native window and save its state internally") EXPORTWFN (* ; 
 "Take a saved window state and open it on this screen, filling in screen and methods as needed.") 
-DESTROYFN (* \; "Destroy this window, for GC finaliszation") SETCURSORFN (* \; 
-"Set the cursor for this window.") PROMPTW (* \; "The prompt window for this screen") SHOWGCFN (* \; 
+DESTROYFN (* ; "Destroy this window, for GC finaliszation") SETCURSORFN (* ; 
+"Set the cursor for this window.") PROMPTW (* ; "The prompt window for this screen") SHOWGCFN (* ; 
 "Show GC indication; called with ON/OFF arg, t=>show gcing status, NIL=>turn off GC indicator.") 
-DSPCREATEFN (* \; "Create a displaystream on this screen.") BBTTOWIN (* \; 
-"BITBLT from a lisp bitmap to a window") BBTFROMWIN (* \; "BITBLT from a window to a lisp bitmap") 
-BBTWINWIN (* \; "BITBLT from a window to another window.") SCCURSOR (* \; 
-"CURSOR that's in effect for this screen by default.") SCKEYBOARD (* \; 
-"Something about which keyboard we're receiving from.") SCDEPTH (* \; 
-"# of bits per pixel on the screen.  THIS WILL REPLACE SCBITSPERPIXEL ASAP.") SCCLOSEDOWN (* \; 
-"Close down this screen cleanly, saving window state.") SCCLOSESCREEN (* \; 
-"Close down thie screen cleanly, no state saving.") SCREOPEN (* \; "Reopen this screen?") SCCARETFLASH
- (* \; "Function to flash thecaret.") SCGETSCREENPOSITION (* \; "GETSCREENPOSITION") 
-SCGETBOXSCREENPOSITION (* \; "GETBOXPOSITION") SCGETSCREENREGION (* \; "GETREGION") SCMOVEPOINTER (* 
-\; "\\CURSORPOSITION")) SCONOFF _ (QUOTE OFF) (ACCESSFNS ((SCBITSPERPIXEL (COND ((|fetch| (SCREEN 
-SCDESTINATION) |of| DATUM) (|fetch| (BITMAP BITMAPBITSPERPIXEL) |of| (|fetch| (SCREEN SCDESTINATION) 
-|of| DATUM))) (T 1))) (SCREGION (|create| REGION LEFT _ 0 BOTTOM _ 0 WIDTH _ (|fetch| (SCREEN SCWIDTH)
- |of| DATUM) HEIGHT _ (|fetch| (SCREEN SCHEIGHT) |of| DATUM))))) (SYSTEM))
+DSPCREATEFN (* ; "Create a displaystream on this screen.") BBTTOWIN (* ; 
+"BITBLT from a lisp bitmap to a window") BBTFROMWIN (* ; "BITBLT from a window to a lisp bitmap") 
+BBTWINWIN (* ; "BITBLT from a window to another window.") SCCURSOR (* ; 
+"CURSOR that's in effect for this screen by default.") SCKEYBOARD (* ; 
+"Something about which keyboard we're receiving from.") SCDEPTH (* ; 
+"# of bits per pixel on the screen.  THIS WILL REPLACE SCBITSPERPIXEL ASAP.") SCCLOSEDOWN (* ; 
+"Close down this screen cleanly, saving window state.") SCCLOSESCREEN (* ; 
+"Close down thie screen cleanly, no state saving.") SCREOPEN (* ; "Reopen this screen?") SCCARETFLASH 
+(* ; "Function to flash thecaret.") SCGETSCREENPOSITION (* ; "GETSCREENPOSITION") 
+SCGETBOXSCREENPOSITION (* ; "GETBOXPOSITION") SCGETSCREENREGION (* ; "GETREGION") SCMOVEPOINTER (* ; 
+"\CURSORPOSITION")) SCONOFF _ (QUOTE OFF) (ACCESSFNS ((SCBITSPERPIXEL (COND ((fetch (SCREEN 
+SCDESTINATION) of DATUM) (fetch (BITMAP BITMAPBITSPERPIXEL) of (fetch (SCREEN SCDESTINATION) of DATUM)
+)) (T 1))) (SCREGION (create REGION LEFT _ 0 BOTTOM _ 0 WIDTH _ (fetch (SCREEN SCWIDTH) of DATUM) 
+HEIGHT _ (fetch (SCREEN SCHEIGHT) of DATUM))))) (SYSTEM))
 (GLOBALVARS WINDOWUSERFORMS ENDOFWINDOWUSERFORMS PROMPTWINDOW)
-(PUTPROP (QUOTE WINDOW) (QUOTE IMPORTDATE) (IDATE "13-Jun-2021 10:14:32"))
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE WINDOW) (QUOTE IMPORTDATE) (IDATE " 2-Aug-2021 00:44:48"))
+=======
+(PUTPROP (QUOTE WINDOW) (QUOTE IMPORTDATE) (IDATE " 5-Aug-2021 14:00:27"))
+>>>>>>> Stashed changes
 
 (PUTPROPS NNLITATOM MACRO (OPENLAMBDA (X) (AND X (LITATOM X))))
-(PUTPROPS \\NULL.OR.FIXP MACRO (OPENLAMBDA (X) (OR (NULL X) (FIXP X))))
-(PUTPROPS \\CHECKTYPE MACRO (X (PROG ((VAR (CAR X)) (PRED (CADR X))) (|if| (AND (LISTP PRED) (MEMB (
-CAR PRED) (QUOTE (QUOTE FUNCTION)))) |then| (SETQ PRED (LIST (CADR PRED) VAR))) (RETURN (SUBPAIR (
-QUOTE (MSG VAR PRED)) (LIST (CONCAT "
- is not a suitable value for the variable:  " VAR) VAR PRED) (QUOTE (|until| PRED |do| (SETQ VAR (
-ERROR VAR MSG)))))))))
-(PUTPROPS CANONICAL.TIMERUNITS MACRO (OPENLAMBDA (X) (* |Checks| |for| |common| |abbreviations| 
-|before| |calling| |\\CanonicalizeTimerUnits|) (SELECTQ X ((TICKS MILLISECONDS SECONDS) (* |These| 
-|are| |the| |canonical| |forms|) X) (NIL (QUOTE MILLISECONDS)) (|\\CanonicalizeTimerUnits| X))))
-(PUTPROPS \\MACRO.EVAL DMACRO (Z (PROG ((X (EXPANDMACRO (CAR Z) T))) (|if| (EQ X (CAR Z)) |then| (
-ERROR "No macro property -- \\MACRO.EVAL" X) |else| (RETURN (EVAL X))))))
-(DEFOPTIMIZER \\MACRO.MX (FORM) FORM)
+(PUTPROPS \NULL.OR.FIXP MACRO (OPENLAMBDA (X) (OR (NULL X) (FIXP X))))
+(PUTPROPS \CHECKTYPE MACRO (X (PROG ((VAR (CAR X)) (PRED (CADR X))) (if (AND (LISTP PRED) (MEMB (CAR 
+PRED) (QUOTE (QUOTE FUNCTION)))) then (SETQ PRED (LIST (CADR PRED) VAR))) (RETURN (SUBPAIR (QUOTE (MSG
+ VAR PRED)) (LIST (CONCAT "
+ is not a suitable value for the variable:  " VAR) VAR PRED) (QUOTE (until PRED do (SETQ VAR (ERROR 
+VAR MSG)))))))))
+(PUTPROPS CANONICAL.TIMERUNITS MACRO (OPENLAMBDA (X) (* Checks for common abbreviations before calling
+ \CanonicalizeTimerUnits) (SELECTQ X ((TICKS MILLISECONDS SECONDS) (* These are the canonical forms) X
+) (NIL (QUOTE MILLISECONDS)) (\CanonicalizeTimerUnits X))))
+(PUTPROPS \MACRO.EVAL DMACRO (Z (PROG ((X (EXPANDMACRO (CAR Z) T))) (if (EQ X (CAR Z)) then (ERROR 
+"No macro property -- \MACRO.EVAL" X) else (RETURN (EVAL X))))))
+(DEFOPTIMIZER \MACRO.MX (FORM) FORM)
 (PUTPROP (QUOTE MACROAUX) (QUOTE IMPORTDATE) (IDATE "16-May-1990 20:26:31"))
 
-(RPAQQ MASK0WORD1\'S 32767)
-(RPAQQ MASK1WORD0\'S 32768)
-(RPAQQ MASKWORD1\'S 65535)
-(RPAQQ MASKHALFWORD1\'S 255)
+(RPAQQ MASK0WORD1'S 32767)
+(RPAQQ MASK1WORD0'S 32768)
+(RPAQQ MASKWORD1'S 65535)
+(RPAQQ MASKHALFWORD1'S 255)
 (RPAQQ BITSPERHALFWORD 8)
-(CONSTANTS MASK0WORD1\'S MASK1WORD0\'S MASKWORD1\'S MASKHALFWORD1\'S BITSPERHALFWORD)
+(CONSTANTS MASK0WORD1'S MASK1WORD0'S MASKWORD1'S MASKHALFWORD1'S BITSPERHALFWORD)
 (PUTPROPS EQZEROP MACRO ((X) (EQ 0 X)))
-(PUTPROPS \\MOVETOBOX DMACRO (OPENLAMBDA (N D) (SELECTC (NTYPX N) (\\SMALLP (|replace| (FIXP HINUM) 
-|of| D |with| 0) (|replace| (FIXP LONUM) |of| D |with| N)) (\\FIXP (|replace| (FIXP HINUM) |of| D 
-|with| (|fetch| (FIXP HINUM) |of| N)) (|replace| (FIXP LONUM) |of| D |with| (|fetch| (FIXP LONUM) |of|
- N))) (\\ILLEGAL.ARG N))))
-(PUTPROPS .XUNBOX. MACRO ((X HX LX) (|until| (SETQ LX (SELECTC (NTYPX X) (\\SMALLP (COND ((IGEQ X 0) (
-SETQ HX 0) X) (T (SETQ HX MASKWORD1\'S) (\\LOLOC X)))) (\\FIXP (SETQ HX (|fetch| (FIXP HINUM) |of| X))
- (|fetch| (FIXP LONUM) |of| X)) NIL)) |do| (SETQ X (LISPERROR "ILLEGAL ARG" X T)))))
-(PUTPROPS .XLLSH. MACRO ((HI LO N) (|if| (IGEQ N BITSPERWORD) |then| (* \; 
-"Jump 16 bits in a single bound!") (SETQ HI LO) (SETQ LO 0) (SETQ N (IDIFFERENCE N BITSPERWORD))) (
-|if| (IGEQ N BITSPERHALFWORD) |then| (* \; "Jump 8 bits in a single bound!") (SETQ HI (LOGOR (
-.LOHALFWORDHI. HI) (.HIHALFWORDLO. LO))) (SETQ LO (.LOHALFWORDHI. LO)) (SETQ N (IDIFFERENCE N 
-BITSPERHALFWORD))) (|if| (IGEQ N 4) |then| (* \; "Jump 4 bits in a single bound!") (SETQ HI (LOGOR (
-LRSH LO (CONSTANT (IDIFFERENCE BITSPERWORD 4))) (LLSH (LOGAND HI (CONSTANT (MASK.1\'S 0 (IDIFFERENCE 
-BITSPERWORD 4)))) 4))) (SETQ LO (LLSH (LOGAND LO (CONSTANT (MASK.1\'S 0 (IDIFFERENCE BITSPERWORD 4))))
- 4)) (SETQ N (IDIFFERENCE N 4))) (* \; 
-"MASK0WORD1'S should be same as (SUB1 (LSH 1 (SUB1 BITSPERWORD)))") (FRPTQ N (SETQ HI (LLSH (LOGAND HI
- MASK0WORD1\'S) 1)) (SETQ LO (LLSH (|if| (IGEQ LO MASK1WORD0\'S) |then| (|add| HI 1) (LOGAND LO 
-MASK0WORD1\'S) |else| LO) 1)))))
-(PUTPROPS .XLLSH1. MACRO ((HI LO) (SETQ HI (LLSH (LOGAND HI MASK0WORD1\'S) 1)) (SETQ LO (LSH (COND ((
-IGEQ LO MASK1WORD0\'S) (SETQ HI (LOGOR HI 1)) (LOGAND LO MASK0WORD1\'S)) (T LO)) 1))))
-(PUTPROPS .XLRSH. MACRO ((HI LO N) (|if| (IGEQ N BITSPERWORD) |then| (* \; 
-"Jump 10 bits in a single bound!") (SETQ LO HI) (SETQ HI 0) (SETQ N (IDIFFERENCE N BITSPERWORD))) (
-|if| (IGEQ N BITSPERHALFWORD) |then| (* \; "Jump 8 bits in a single bound!") (SETQ LO (LOGOR (
-.HIHALFWORDLO. LO) (.LOHALFWORDHI. HI))) (SETQ HI (.HIHALFWORDLO. HI)) (SETQ N (IDIFFERENCE N 
-BITSPERHALFWORD))) (|if| (IGEQ N 4) |then| (* \; "Jump 4 bits in a single bound!") (SETQ LO (LOGOR (
-LLSH (LOGAND HI (CONSTANT (MASK.1\'S 0 4))) (CONSTANT (IDIFFERENCE BITSPERWORD 4))) (LRSH LO 4))) (
-SETQ HI (LRSH HI 4)) (SETQ N (IDIFFERENCE N 4))) (* \; "MASK1WORD0'S should be same as \\SIGNBIT") (
-FRPTQ N (SETQ LO (|if| (ODDP HI) |then| (LOGOR (LRSH LO 1) MASK1WORD0\'S) |else| (LRSH LO 1))) (SETQ 
-HI (LRSH HI 1)))))
-(PUTPROPS .ADD.2WORD.INTEGERS. MACRO ((HX LX HY LY) (* \; "Ignores carry out of high-order word") (
-SETQ HX (.SUMSMALLMOD. HX HY)) (SETQ LX (.SUMSMALLMOD. LX LY (SETQ HX (|if| (EQ HX MAX.SMALL.INTEGER) 
-|then| 0 |else| (ADD1 HX)))))))
-(PUTPROPS .SUB.2WORD.INTEGERS. MACRO ((HX LX HY LY) (* \; "Ignores carry out of high-order word") (
-SETQ HX (.DIFFERENCESMALLMOD. HX HY)) (SETQ LX (.DIFFERENCESMALLMOD. LX LY (SETQ HX (|if| (EQ HX 0) 
-|then| MAX.SMALL.INTEGER |else| (SUB1 HX)))))))
-(PUTPROPS .32BITMUL. MACRO ((HR LR X Y) (PROG (HX LX HY LY) (|if| (ILESSP X Y) |then| (|swap| X Y)) (*
- \; "Y is the lesser of the two now") (.XUNBOX. X HX LX) (.XUNBOX. Y HY LY) LP (|if| (ODDP LY) |then| 
-(.ADD.2WORD.INTEGERS. HR LR HX LX)) (|if| (EQ HY 0) |then| (SETQ LY (LRSH LY 1)) (|if| (EQ LY 0) 
-|then| (RETURN)) |else| (.LRSH1. HY LY)) (* \; 
-"Trim off highest bits, so that left-shifting doesn't generate FIXPs") (SETQ HX (LOGAND HX 
-MASK0WORD1\'S)) (.LLSH1. HX LX) (GO LP))))
-(PUTPROPS .SUMSMALLMOD. MACRO ((X Y OVERFLOWFORM) ((LAMBDA (|\\SumSmallModVar|) (DECLARE (LOCALVARS 
-|\\SumSmallModVar|)) (IF (ILEQ X |\\SumSmallModVar|) THEN (IPLUS X Y) ELSE OVERFLOWFORM (IDIFFERENCE X
- (ADD1 |\\SumSmallModVar|)))) (IDIFFERENCE MAX.SMALL.INTEGER Y))))
+(PUTPROPS \MOVETOBOX DMACRO (OPENLAMBDA (N D) (SELECTC (NTYPX N) (\SMALLP (replace (FIXP HINUM) of D 
+with 0) (replace (FIXP LONUM) of D with N)) (\FIXP (replace (FIXP HINUM) of D with (fetch (FIXP HINUM)
+ of N)) (replace (FIXP LONUM) of D with (fetch (FIXP LONUM) of N))) (\ILLEGAL.ARG N))))
+(PUTPROPS .XUNBOX. MACRO ((X HX LX) (until (SETQ LX (SELECTC (NTYPX X) (\SMALLP (COND ((IGEQ X 0) (
+SETQ HX 0) X) (T (SETQ HX MASKWORD1'S) (\LOLOC X)))) (\FIXP (SETQ HX (fetch (FIXP HINUM) of X)) (fetch
+ (FIXP LONUM) of X)) NIL)) do (SETQ X (LISPERROR "ILLEGAL ARG" X T)))))
+(PUTPROPS .XLLSH. MACRO ((HI LO N) (if (IGEQ N BITSPERWORD) then (* ; 
+"Jump 16 bits in a single bound!") (SETQ HI LO) (SETQ LO 0) (SETQ N (IDIFFERENCE N BITSPERWORD))) (if 
+(IGEQ N BITSPERHALFWORD) then (* ; "Jump 8 bits in a single bound!") (SETQ HI (LOGOR (.LOHALFWORDHI. 
+HI) (.HIHALFWORDLO. LO))) (SETQ LO (.LOHALFWORDHI. LO)) (SETQ N (IDIFFERENCE N BITSPERHALFWORD))) (if 
+(IGEQ N 4) then (* ; "Jump 4 bits in a single bound!") (SETQ HI (LOGOR (LRSH LO (CONSTANT (IDIFFERENCE
+ BITSPERWORD 4))) (LLSH (LOGAND HI (CONSTANT (MASK.1'S 0 (IDIFFERENCE BITSPERWORD 4)))) 4))) (SETQ LO 
+(LLSH (LOGAND LO (CONSTANT (MASK.1'S 0 (IDIFFERENCE BITSPERWORD 4)))) 4)) (SETQ N (IDIFFERENCE N 4))) 
+(* ; "MASK0WORD1'S should be same as (SUB1 (LSH 1 (SUB1 BITSPERWORD)))") (FRPTQ N (SETQ HI (LLSH (
+LOGAND HI MASK0WORD1'S) 1)) (SETQ LO (LLSH (if (IGEQ LO MASK1WORD0'S) then (add HI 1) (LOGAND LO 
+MASK0WORD1'S) else LO) 1)))))
+(PUTPROPS .XLLSH1. MACRO ((HI LO) (SETQ HI (LLSH (LOGAND HI MASK0WORD1'S) 1)) (SETQ LO (LSH (COND ((
+IGEQ LO MASK1WORD0'S) (SETQ HI (LOGOR HI 1)) (LOGAND LO MASK0WORD1'S)) (T LO)) 1))))
+(PUTPROPS .XLRSH. MACRO ((HI LO N) (if (IGEQ N BITSPERWORD) then (* ; 
+"Jump 10 bits in a single bound!") (SETQ LO HI) (SETQ HI 0) (SETQ N (IDIFFERENCE N BITSPERWORD))) (if 
+(IGEQ N BITSPERHALFWORD) then (* ; "Jump 8 bits in a single bound!") (SETQ LO (LOGOR (.HIHALFWORDLO. 
+LO) (.LOHALFWORDHI. HI))) (SETQ HI (.HIHALFWORDLO. HI)) (SETQ N (IDIFFERENCE N BITSPERHALFWORD))) (if 
+(IGEQ N 4) then (* ; "Jump 4 bits in a single bound!") (SETQ LO (LOGOR (LLSH (LOGAND HI (CONSTANT (
+MASK.1'S 0 4))) (CONSTANT (IDIFFERENCE BITSPERWORD 4))) (LRSH LO 4))) (SETQ HI (LRSH HI 4)) (SETQ N (
+IDIFFERENCE N 4))) (* ; "MASK1WORD0'S should be same as \SIGNBIT") (FRPTQ N (SETQ LO (if (ODDP HI) 
+then (LOGOR (LRSH LO 1) MASK1WORD0'S) else (LRSH LO 1))) (SETQ HI (LRSH HI 1)))))
+(PUTPROPS .ADD.2WORD.INTEGERS. MACRO ((HX LX HY LY) (* ; "Ignores carry out of high-order word") (SETQ
+ HX (.SUMSMALLMOD. HX HY)) (SETQ LX (.SUMSMALLMOD. LX LY (SETQ HX (if (EQ HX MAX.SMALL.INTEGER) then 0
+ else (ADD1 HX)))))))
+(PUTPROPS .SUB.2WORD.INTEGERS. MACRO ((HX LX HY LY) (* ; "Ignores carry out of high-order word") (SETQ
+ HX (.DIFFERENCESMALLMOD. HX HY)) (SETQ LX (.DIFFERENCESMALLMOD. LX LY (SETQ HX (if (EQ HX 0) then 
+MAX.SMALL.INTEGER else (SUB1 HX)))))))
+(PUTPROPS .32BITMUL. MACRO ((HR LR X Y) (PROG (HX LX HY LY) (if (ILESSP X Y) then (swap X Y)) (* ; 
+"Y is the lesser of the two now") (.XUNBOX. X HX LX) (.XUNBOX. Y HY LY) LP (if (ODDP LY) then (
+.ADD.2WORD.INTEGERS. HR LR HX LX)) (if (EQ HY 0) then (SETQ LY (LRSH LY 1)) (if (EQ LY 0) then (RETURN
+)) else (.LRSH1. HY LY)) (* ; "Trim off highest bits, so that left-shifting doesn't generate FIXPs") (
+SETQ HX (LOGAND HX MASK0WORD1'S)) (.LLSH1. HX LX) (GO LP))))
+(PUTPROPS .SUMSMALLMOD. MACRO ((X Y OVERFLOWFORM) ((LAMBDA (\SumSmallModVar) (DECLARE (LOCALVARS 
+\SumSmallModVar)) (IF (ILEQ X \SumSmallModVar) THEN (IPLUS X Y) ELSE OVERFLOWFORM (IDIFFERENCE X (ADD1
+ \SumSmallModVar)))) (IDIFFERENCE MAX.SMALL.INTEGER Y))))
 (PUTPROPS .DIFFERENCESMALLMOD. MACRO ((X Y BORROWFORM) (IF (NOT (IGREATERP Y X)) THEN (IDIFFERENCE X Y
 ) ELSE BORROWFORM (ADD1 (IDIFFERENCE MAX.SMALL.INTEGER (IDIFFERENCE Y X))))))
-(PUTPROPS \\GETBASENIBBLE DMACRO (OPENLAMBDA (BASE OFFST) ((LAMBDA (|\\Byte|) (DECLARE (LOCALVARS 
-|\\Byte|)) (|if| (ODDP OFFST) |then| (LOGAND |\\Byte| (CONSTANT (MASK.1\'S 0 BITSPERNIBBLE))) |else| (
-LRSH |\\Byte| BITSPERNIBBLE))) (\\GETBASEBYTE BASE (FOLDLO OFFST NIBBLESPERBYTE)))))
-(PUTPROPS \\PUTBASENIBBLE DMACRO (OPENLAMBDA (BASE OFFST VAL) ((LAMBDA (|\\ByteNo|) (DECLARE (
-LOCALVARS |\\ByteNo|)) ((LAMBDA (|\\Byte|) (DECLARE (LOCALVARS |\\Byte|)) (\\PUTBASEBYTE BASE 
-|\\ByteNo| (|if| (ODDP OFFST) |then| (LOGOR (LOGAND |\\Byte| (CONSTANT (MASK.1\'S BITSPERNIBBLE 
-BITSPERNIBBLE))) VAL) |else| (LOGOR (LOGAND |\\Byte| (CONSTANT (MASK.1\'S 0 BITSPERNIBBLE))) (LLSH VAL
- BITSPERNIBBLE))))) (\\GETBASEBYTE BASE |\\ByteNo|))) (FOLDLO OFFST NIBBLESPERBYTE))))
-(PUTPROPS \\GETBASEBIT DMACRO (OPENLAMBDA (BASE OFFST) ((LAMBDA (|\\ByteNo| |\\BitMask|) (DECLARE (
-LOCALVARS |\\ByteNo| |\\BitMask|)) (|if| (EQ 0 (LOGAND |\\BitMask| (\\GETBASEBYTE BASE |\\ByteNo|))) 
-|then| 0 |else| 1)) (FOLDLO OFFST BITSPERBYTE) (MASK.1\'S (IDIFFERENCE (CONSTANT (SUB1 BITSPERBYTE)) (
-IMOD OFFST BITSPERBYTE)) 1))))
-(PUTPROPS \\PUTBASEBIT DMACRO (OPENLAMBDA (BASE OFFST VAL) ((LAMBDA (|\\ByteNo| |\\BitMask| |\\Byte|) 
-(DECLARE (LOCALVARS |\\ByteNo| |\\BitMask| |\\Byte|)) (SETQ |\\Byte| (\\GETBASEBYTE BASE |\\ByteNo|)) 
-(|if| (|if| (EQ 0 (LOGAND |\\BitMask| |\\Byte|)) |then| (NOT (EQ 0 VAL)) |else| (EQ 0 VAL)) |then| (
-\\PUTBASEBYTE BASE |\\ByteNo| (LOGXOR |\\BitMask| |\\Byte|))) VAL) (FOLDLO OFFST BITSPERBYTE) (
-MASK.1\'S (IDIFFERENCE (CONSTANT (SUB1 BITSPERBYTE)) (IMOD OFFST BITSPERBYTE)) 1))))
+(PUTPROPS \GETBASENIBBLE DMACRO (OPENLAMBDA (BASE OFFST) ((LAMBDA (\Byte) (DECLARE (LOCALVARS \Byte)) 
+(if (ODDP OFFST) then (LOGAND \Byte (CONSTANT (MASK.1'S 0 BITSPERNIBBLE))) else (LRSH \Byte 
+BITSPERNIBBLE))) (\GETBASEBYTE BASE (FOLDLO OFFST NIBBLESPERBYTE)))))
+(PUTPROPS \PUTBASENIBBLE DMACRO (OPENLAMBDA (BASE OFFST VAL) ((LAMBDA (\ByteNo) (DECLARE (LOCALVARS 
+\ByteNo)) ((LAMBDA (\Byte) (DECLARE (LOCALVARS \Byte)) (\PUTBASEBYTE BASE \ByteNo (if (ODDP OFFST) 
+then (LOGOR (LOGAND \Byte (CONSTANT (MASK.1'S BITSPERNIBBLE BITSPERNIBBLE))) VAL) else (LOGOR (LOGAND 
+\Byte (CONSTANT (MASK.1'S 0 BITSPERNIBBLE))) (LLSH VAL BITSPERNIBBLE))))) (\GETBASEBYTE BASE \ByteNo))
+) (FOLDLO OFFST NIBBLESPERBYTE))))
+(PUTPROPS \GETBASEBIT DMACRO (OPENLAMBDA (BASE OFFST) ((LAMBDA (\ByteNo \BitMask) (DECLARE (LOCALVARS 
+\ByteNo \BitMask)) (if (EQ 0 (LOGAND \BitMask (\GETBASEBYTE BASE \ByteNo))) then 0 else 1)) (FOLDLO 
+OFFST BITSPERBYTE) (MASK.1'S (IDIFFERENCE (CONSTANT (SUB1 BITSPERBYTE)) (IMOD OFFST BITSPERBYTE)) 1)))
+)
+(PUTPROPS \PUTBASEBIT DMACRO (OPENLAMBDA (BASE OFFST VAL) ((LAMBDA (\ByteNo \BitMask \Byte) (DECLARE (
+LOCALVARS \ByteNo \BitMask \Byte)) (SETQ \Byte (\GETBASEBYTE BASE \ByteNo)) (if (if (EQ 0 (LOGAND 
+\BitMask \Byte)) then (NOT (EQ 0 VAL)) else (EQ 0 VAL)) then (\PUTBASEBYTE BASE \ByteNo (LOGXOR 
+\BitMask \Byte))) VAL) (FOLDLO OFFST BITSPERBYTE) (MASK.1'S (IDIFFERENCE (CONSTANT (SUB1 BITSPERBYTE))
+ (IMOD OFFST BITSPERBYTE)) 1))))
 (PUTPROP (QUOTE ADDARITH) (QUOTE IMPORTDATE) (IDATE "16-May-1990 11:46:37"))
 
-(RPAQQ \\MAXFILEPAGE 65534)
-(CONSTANTS \\MAXFILEPAGE)
+(RPAQQ \MAXFILEPAGE 65534)
+(CONSTANTS \MAXFILEPAGE)
 (PUTPROP (QUOTE LLFAULT) (QUOTE IMPORTDATE) (IDATE "21-Mar-2021 21:33:01"))
 
-(PUTPROPS \\UPDATETIMERS MACRO (NIL (* * |Moves| |excess| |time| |from| |the| |processor| |clock| |to|
- |our| |software| |clocks.| |Needs| |to| |be| |run| |often,| |uninterruptably,| |preferably| |from| 
-|the| |vertical| |retrace| |interrupt|) (* |Get| |processor| |clock|) (PROG ((EXCESS (\\BOXIDIFFERENCE
- (\\RCLK (LOCF (|fetch| RCLKTEMP0 |of| \\MISCSTATS))) (LOCF (|fetch| BASECLOCK |of| \\MISCSTATS))))) (
-RETURN (COND ((OR (IGEQ EXCESS \\RCLKSECOND) (ILESSP EXCESS 0)) (* |More| |than| |one| |second| |has| 
-|elapsed| |since| |we| |updated| |clocks|) (\\BOXIPLUS (LOCF (|fetch| BASECLOCK |of| \\MISCSTATS)) 
-\\RCLKSECOND) (* |Increment| |base| |by| |one| |second|) (\\BOXIPLUS (LOCF (|fetch| MILLISECONDSCLOCK 
-|of| \\MISCSTATS)) 1000) (* |Increment| |clocks| |by| 1 |second|) (\\BOXIPLUS (LOCF (|fetch| 
-SECONDSCLOCK |of| \\MISCSTATS)) 1) T))))))
-(RPAQQ \\RTCSECONDS 378)
-(RPAQQ \\RTCMILLISECONDS 380)
-(RPAQQ \\RTCBASE 382)
-(RPAQQ \\OFFSET.SECONDS 0)
-(RPAQQ \\OFFSET.MILLISECONDS 2)
-(RPAQQ \\OFFSET.BASE 4)
-(RPAQQ \\ALTO.RCLKSECOND 1680000)
-(RPAQQ \\ALTO.RCLKMILLISECOND 1680)
-(RPAQQ \\DLION.RCLKMILLISECOND 35)
-(RPAQQ \\DLION.RCLKSECOND 34746)
-(RPAQQ \\DOVE.RCLKMILLISECOND 63)
-(RPAQQ \\DOVE.RCLKSECOND 62500)
-(CONSTANTS (\\RTCSECONDS 378) (\\RTCMILLISECONDS 380) (\\RTCBASE 382) (\\OFFSET.SECONDS 0) (
-\\OFFSET.MILLISECONDS 2) (\\OFFSET.BASE 4) (\\ALTO.RCLKSECOND 1680000) (\\ALTO.RCLKMILLISECOND 1680) (
-\\DLION.RCLKMILLISECOND 35) (\\DLION.RCLKSECOND 34746) (\\DOVE.RCLKMILLISECOND 63) (\\DOVE.RCLKSECOND 
+(PUTPROPS \UPDATETIMERS MACRO (NIL (* * Moves excess time from the processor clock to our software 
+clocks. Needs to be run often, uninterruptably, preferably from the vertical retrace interrupt) (* Get
+ processor clock) (PROG ((EXCESS (\BOXIDIFFERENCE (\RCLK (LOCF (fetch RCLKTEMP0 of \MISCSTATS))) (LOCF
+ (fetch BASECLOCK of \MISCSTATS))))) (RETURN (COND ((OR (IGEQ EXCESS \RCLKSECOND) (ILESSP EXCESS 0)) (
+* More than one second has elapsed since we updated clocks) (\BOXIPLUS (LOCF (fetch BASECLOCK of 
+\MISCSTATS)) \RCLKSECOND) (* Increment base by one second) (\BOXIPLUS (LOCF (fetch MILLISECONDSCLOCK 
+of \MISCSTATS)) 1000) (* Increment clocks by 1 second) (\BOXIPLUS (LOCF (fetch SECONDSCLOCK of 
+\MISCSTATS)) 1) T))))))
+(RPAQQ \RTCSECONDS 378)
+(RPAQQ \RTCMILLISECONDS 380)
+(RPAQQ \RTCBASE 382)
+(RPAQQ \OFFSET.SECONDS 0)
+(RPAQQ \OFFSET.MILLISECONDS 2)
+(RPAQQ \OFFSET.BASE 4)
+(RPAQQ \ALTO.RCLKSECOND 1680000)
+(RPAQQ \ALTO.RCLKMILLISECOND 1680)
+(RPAQQ \DLION.RCLKMILLISECOND 35)
+(RPAQQ \DLION.RCLKSECOND 34746)
+(RPAQQ \DOVE.RCLKMILLISECOND 63)
+(RPAQQ \DOVE.RCLKSECOND 62500)
+(CONSTANTS (\RTCSECONDS 378) (\RTCMILLISECONDS 380) (\RTCBASE 382) (\OFFSET.SECONDS 0) (
+\OFFSET.MILLISECONDS 2) (\OFFSET.BASE 4) (\ALTO.RCLKSECOND 1680000) (\ALTO.RCLKMILLISECOND 1680) (
+\DLION.RCLKMILLISECOND 35) (\DLION.RCLKSECOND 34746) (\DOVE.RCLKMILLISECOND 63) (\DOVE.RCLKSECOND 
 62500))
 (PUTPROPS ALTO.TO.LISP.DATE MACRO ((DATE) (LOGXOR DATE -2147483648)))
 (PUTPROPS LISP.TO.ALTO.DATE MACRO ((DATE) (LOGXOR DATE -2147483648)))
@@ -2285,95 +2262,105 @@ SECONDSCLOCK |of| \\MISCSTATS)) 1) T))))))
 
 (RECORD BRUSH (BRUSHSHAPE BRUSHSIZE BRUSHCOLOR) BRUSHSHAPE _ (QUOTE ROUND) BRUSHSIZE _ 1)
 (PUTPROPS IMAGEOP MACRO (ARGS (CONS (QUOTE SPREADAPPLY*) (CONS (COND ((EQ (CAR (LISTP (CAR ARGS))) (
-QUOTE QUOTE)) (LIST (QUOTE |fetch|) (LIST (QUOTE IMAGEOPS) (CADAR ARGS)) (QUOTE |of|) (LIST (QUOTE 
-|fetch|) (QUOTE (STREAM IMAGEOPS)) (QUOTE |of|) (CADR ARGS)))) (T (HELP "IMAGEOP - OPNAME not quoted:"
- ARGS))) (CDDR ARGS)))))
+QUOTE QUOTE)) (LIST (QUOTE fetch) (LIST (QUOTE IMAGEOPS) (CADAR ARGS)) (QUOTE of) (LIST (QUOTE fetch) 
+(QUOTE (STREAM IMAGEOPS)) (QUOTE of) (CADR ARGS)))) (T (HELP "IMAGEOP - OPNAME not quoted:" ARGS))) (
+CDDR ARGS)))))
 (DATATYPE IMAGEOPS (IMAGETYPE IMCLOSEFN IMXPOSITION IMYPOSITION IMFONT IMLEFTMARGIN IMRIGHTMARGIN 
 IMLINEFEED IMDRAWLINE IMDRAWCURVE IMDRAWCIRCLE IMDRAWELLIPSE IMFILLCIRCLE IMBLTSHADE IMBITBLT 
 IMNEWPAGE IMMOVETO IMSCALE IMTERPRI IMTOPMARGIN IMBOTTOMMARGIN IMSPACEFACTOR IMFONTCREATE IMOPERATION 
 IMCOLOR IMSTRINGWIDTH IMCHARWIDTH IMCHARWIDTHY IMBACKCOLOR IMBITMAPSIZE IMCLIPPINGREGION IMRESET 
 IMDRAWPOLYGON IMFILLPOLYGON IMSCALEDBITBLT IMWRITEPIXEL IMCHARSET IMROTATE IMDRAWARC IMTRANSLATE 
 IMSCALE2 IMPUSHSTATE IMPOPSTATE IMDEFAULTSTATE IMDRAWPOINT IMBLTCHAR IMXOFFSET IMYOFFSET) IMCLOSEFN _ 
-(FUNCTION NILL) IMTERPRI _ (FUNCTION (LAMBDA (STREAM) (\\OUTCHAR STREAM (CHARCODE EOL)))) IMNEWPAGE _ 
-(FUNCTION (LAMBDA (STREAM) (\\OUTCHAR STREAM (CHARCODE ^L)))) IMOPERATION _ (FUNCTION NILL) IMCOLOR _ 
-(FUNCTION NILL) IMCLIPPINGREGION _ (FUNCTION NILL) IMRESET _ (FUNCTION NILL) IMBACKCOLOR _ (FUNCTION 
+(FUNCTION NILL) IMTERPRI _ (FUNCTION (LAMBDA (STREAM) (\OUTCHAR STREAM (CHARCODE EOL)))) IMNEWPAGE _ (
+FUNCTION (LAMBDA (STREAM) (\OUTCHAR STREAM (CHARCODE ^L)))) IMOPERATION _ (FUNCTION NILL) IMCOLOR _ (
+FUNCTION NILL) IMCLIPPINGREGION _ (FUNCTION NILL) IMRESET _ (FUNCTION NILL) IMBACKCOLOR _ (FUNCTION 
 NILL) IMSTRINGWIDTH _ (FUNCTION (LAMBDA (STREAM STR RDTBL) (STRINGWIDTH STR (DSPFONT NIL STREAM) RDTBL
  RDTBL))) IMCHARWIDTH _ (FUNCTION (LAMBDA (STREAM CHARCODE) (CHARWIDTH CHARCODE (DSPFONT NIL STREAM)))
 ) IMMOVETO _ (FUNCTION (LAMBDA (STREAM X Y) (IMAGEOP (QUOTE IMXPOSITION) STREAM STREAM X) (IMAGEOP (
 QUOTE IMYPOSITION) STREAM STREAM Y))) IMBITMAPSIZE _ (FUNCTION (LAMBDA (STREAM BITMAP DIMENSION) (
 SELECTQ DIMENSION (WIDTH (TIMES (DSPSCALE NIL STREAM) (BITMAPWIDTH BITMAP))) (HEIGHT (TIMES (DSPSCALE 
 NIL STREAM) (BITMAPHEIGHT BITMAP))) (NIL (CONS (TIMES (DSPSCALE NIL STREAM) (BITMAPWIDTH BITMAP)) (
-TIMES (DSPSCALE NIL STREAM) (BITMAPHEIGHT BITMAP)))) (\\ILLEGAL.ARG DIMENSION)))) IMWRITEPIXEL _ (
+TIMES (DSPSCALE NIL STREAM) (BITMAPHEIGHT BITMAP)))) (\ILLEGAL.ARG DIMENSION)))) IMWRITEPIXEL _ (
 FUNCTION NILL) IMCHARSET _ (FUNCTION NILL) IMXPOSITION _ (FUNCTION NILL) IMYPOSITION _ (FUNCTION NILL)
  IMFONT _ (FUNCTION NILL) IMLEFTMARGIN _ (FUNCTION NILL) IMRIGHTMARGIN _ (FUNCTION NILL) IMLINEFEED _ 
 (FUNCTION NILL) IMDRAWLINE _ (FUNCTION NILL) IMDRAWCURVE _ (FUNCTION NILL) IMDRAWCIRCLE _ (FUNCTION 
 NILL) IMDRAWELLIPSE _ (FUNCTION NILL) IMFILLCIRCLE _ (FUNCTION NILL) IMBLTSHADE _ (FUNCTION NILL) 
 IMBITBLT _ (FUNCTION NILL) IMSCALE _ (FUNCTION NILL) IMTOPMARGIN _ (FUNCTION NILL) IMBOTTOMMARGIN _ (
 FUNCTION NILL) IMSPACEFACTOR _ (FUNCTION NILL) IMFONTCREATE _ (FUNCTION NILL) IMCHARWIDTHY _ (FUNCTION
- NILL) IMDRAWPOLYGON _ (FUNCTION \\DRAWPOLYGON.GENERIC) IMDRAWPOINT _ (FUNCTION \\DRAWPOINT.GENERIC) 
+ NILL) IMDRAWPOLYGON _ (FUNCTION \DRAWPOLYGON.GENERIC) IMDRAWPOINT _ (FUNCTION \DRAWPOINT.GENERIC) 
 IMFILLPOLYGON _ (FUNCTION NILL) IMSCALEDBITBLT _ (FUNCTION NILL) IMROTATE _ (FUNCTION NILL) IMDRAWARC 
 _ (FUNCTION NILL) IMTRANSLATE _ (FUNCTION NILL) IMPUSHSTATE _ (FUNCTION NILL) IMPOPSTATE _ (FUNCTION 
-NILL) IMSCALE2 _ (FUNCTION NILL) IMDEFAULTSTATE _ (FUNCTION NILL) IMBLTCHAR _ (FUNCTION \\MEDW.BLTCHAR
-) IMXOFFSET _ (FUNCTION \\MEDW.XOFFSET) IMYOFFSET _ (FUNCTION \\MEDW.YOFFSET))
-(GLOBALVARS \\NOIMAGEOPS)
-(PUTPROP (QUOTE IMAGEIO) (QUOTE IMPORTDATE) (IDATE "28-Jun-1999 16:33:59"))
+NILL) IMSCALE2 _ (FUNCTION NILL) IMDEFAULTSTATE _ (FUNCTION NILL) IMBLTCHAR _ (FUNCTION \MEDW.BLTCHAR)
+ IMXOFFSET _ (FUNCTION \MEDW.XOFFSET) IMYOFFSET _ (FUNCTION \MEDW.YOFFSET))
+(GLOBALVARS \NOIMAGEOPS)
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE IMAGEIO) (QUOTE IMPORTDATE) (IDATE " 2-Aug-2021 19:41:35"))
+=======
+(PUTPROP (QUOTE IMAGEIO) (QUOTE IMPORTDATE) (IDATE " 5-Aug-2021 14:00:27"))
+>>>>>>> Stashed changes
 
-(DATATYPE PROCESS ((PROCFX0 WORD) (* \; "= \\STACKHI to make this look like a STACKP") (PROCFX WORD) (
-* \; "Stack pointer to this context when it is asleep") (PROCSTATUS BYTE) (* \; "Running or waiting") 
-(PROCNAME POINTER) (* \; "Name for convenience in type-in reference") (PROCPRIORITY BYTE) (* \; 
-"Priority level, 0-4.  Not currently used.") (PROCQUEUE POINTER) (* \; 
-"Queue of processes at the same priority") (NIL BYTE) (NEXTPROCHANDLE POINTER) (* \; 
-"Pointer to next one") (PROCTIMERSET FLAG) (* \; "True if PROCWAKEUPTIMER has an interesting value") (
-PROCBEINGDELETED FLAG) (* \; "True if proc was deleted, but hasn't been removed from \\PROCESSES yet")
- (PROCDELETED FLAG) (PROCSYSTEMP FLAG) (PROCNEVERSTARTED FLAG) (NIL FLAG) (NIL FLAG) (NIL FLAG) (
-PROCWAKEUPTIMER POINTER) (* \; "a largep recording the time this proc last went to sleep") (
-PROCTIMERLINK POINTER) (* \; "For linking proc in timer queue") (PROCTIMERBOX POINTER) (* \; 
+(DATATYPE PROCESS ((PROCFX0 WORD) (* ; "= \STACKHI to make this look like a STACKP") (PROCFX WORD) (* 
+; "Stack pointer to this context when it is asleep") (PROCSTATUS BYTE) (* ; "Running or waiting") (
+PROCNAME POINTER) (* ; "Name for convenience in type-in reference") (PROCPRIORITY BYTE) (* ; 
+"Priority level, 0-4.  Not currently used.") (PROCQUEUE POINTER) (* ; 
+"Queue of processes at the same priority") (NIL BYTE) (NEXTPROCHANDLE POINTER) (* ; 
+"Pointer to next one") (PROCTIMERSET FLAG) (* ; "True if PROCWAKEUPTIMER has an interesting value") (
+PROCBEINGDELETED FLAG) (* ; "True if proc was deleted, but hasn't been removed from \PROCESSES yet") (
+PROCDELETED FLAG) (PROCSYSTEMP FLAG) (PROCNEVERSTARTED FLAG) (NIL FLAG) (NIL FLAG) (NIL FLAG) (
+PROCWAKEUPTIMER POINTER) (* ; "a largep recording the time this proc last went to sleep") (
+PROCTIMERLINK POINTER) (* ; "For linking proc in timer queue") (PROCTIMERBOX POINTER) (* ; 
 "Scratch box to use for PROCWAKEUPTIMER when user does not give one explicitly") (WAKEREASON POINTER) 
-(* \; "Reason process is being run.  From WAKE.PROCESS or timer or event wakeup;  T from simple BLOCK"
-) (PROCEVENTORLOCK POINTER) (* \; "EVENT or MONITOR lock that this proc is waiting for") (PROCFORM 
-POINTER) (* \; "Form to EVAL to start it going") (RESTARTABLE POINTER) (* \; 
+(* ; "Reason process is being run.  From WAKE.PROCESS or timer or event wakeup;  T from simple BLOCK")
+ (PROCEVENTORLOCK POINTER) (* ; "EVENT or MONITOR lock that this proc is waiting for") (PROCFORM 
+POINTER) (* ; "Form to EVAL to start it going") (RESTARTABLE POINTER) (* ; 
 "T = autorestart on error, HARDRESET = restart only on hard reset, NIL = never restart") (PROCWINDOW 
-POINTER) (* \; "Window this process lives in, if any") (PROCFINISHED POINTER) (* \; 
+POINTER) (* ; "Window this process lives in, if any") (PROCFINISHED POINTER) (* ; 
 "True if proc finished.  Value is indication of how: NORMAL, DELETED, ERROR") (PROCRESULT POINTER) (* 
-\; "Value it returned if it finished normally") (PROCFINISHEVENT POINTER) (* \; 
-"Optional EVENT to be notified when proc finishes") (PROCMAILBOX POINTER) (* \; "Message queue") (
-PROCDRIBBLEOUTPUT POINTER) (* \; "Binding for *DRIBBLE-OUTPUT* in this process") (PROCINFOHOOK POINTER
-) (* \; "Optional user fn that displays info about process") (PROCTYPEAHEAD POINTER) (* \; 
-"Buffer of typeahead destined for this proc") (PROCREMOTEINFO POINTER) (* \; "For Enterprise") (
-PROCUSERDATA POINTER) (* \; "For PROCESSPROP") (PROCEVENTLINK POINTER) (* \; 
-"Used to maintain EVENT queues") (PROCAFTEREXIT POINTER) (* \; 
-"What to do with this process when coming back from a LOGOUT, etc") (PROCBEFOREEXIT POINTER) (* \; 
-"If DON'T, can't logout") (PROCOWNEDLOCKS POINTER) (* \; "Pointer to first lock I currently own") (
-PROCEVAPPLYRESULT POINTER) (* \; "For PROCESS.EVAL and PROCESS.APPLY when WAITFORRESULT is true") (
-PROCTTYENTRYFN POINTER) (* \; "Is applied to a process when it becomes the tty process") (
-PROCTTYEXITFN POINTER) (* \; "Is applied to a process when it ceases to be the tty process") (
-PROCHARDRESETINFO POINTER) (* \; "HARDRESET stores info about unwind-protect cleanups here") (
-PROCRESTARTFORM POINTER) (* \; "use this instead of PROCFORM when restarting") (PROCOLDTTYPROC POINTER
-) (* \; "Process that had the tty when we got it") (NIL POINTER) (* \; "For expansion")) PROCTIMERBOX 
-_ (CREATECELL \\FIXP) PROCFX0 _ \\STACKHI)
-(PUTPROPS THIS.PROCESS MACRO (NIL \\RUNNING.PROCESS))
-(PUTPROPS TTY.PROCESS MACRO (X (COND ((CAR X) (QUOTE IGNOREMACRO)) (T (QUOTE \\TTY.PROCESS)))))
+; "Value it returned if it finished normally") (PROCFINISHEVENT POINTER) (* ; 
+"Optional EVENT to be notified when proc finishes") (PROCMAILBOX POINTER) (* ; "Message queue") (
+PROCDRIBBLEOUTPUT POINTER) (* ; "Binding for *DRIBBLE-OUTPUT* in this process") (PROCINFOHOOK POINTER)
+ (* ; "Optional user fn that displays info about process") (PROCTYPEAHEAD POINTER) (* ; 
+"Buffer of typeahead destined for this proc") (PROCREMOTEINFO POINTER) (* ; "For Enterprise") (
+PROCUSERDATA POINTER) (* ; "For PROCESSPROP") (PROCEVENTLINK POINTER) (* ; 
+"Used to maintain EVENT queues") (PROCAFTEREXIT POINTER) (* ; 
+"What to do with this process when coming back from a LOGOUT, etc") (PROCBEFOREEXIT POINTER) (* ; 
+"If DON'T, can't logout") (PROCOWNEDLOCKS POINTER) (* ; "Pointer to first lock I currently own") (
+PROCEVAPPLYRESULT POINTER) (* ; "For PROCESS.EVAL and PROCESS.APPLY when WAITFORRESULT is true") (
+PROCTTYENTRYFN POINTER) (* ; "Is applied to a process when it becomes the tty process") (PROCTTYEXITFN
+ POINTER) (* ; "Is applied to a process when it ceases to be the tty process") (PROCHARDRESETINFO 
+POINTER) (* ; "HARDRESET stores info about unwind-protect cleanups here") (PROCRESTARTFORM POINTER) (*
+ ; "use this instead of PROCFORM when restarting") (PROCOLDTTYPROC POINTER) (* ; 
+"Process that had the tty when we got it") (NIL POINTER) (* ; "For expansion")) PROCTIMERBOX _ (
+CREATECELL \FIXP) PROCFX0 _ \STACKHI)
+(PUTPROPS THIS.PROCESS MACRO (NIL \RUNNING.PROCESS))
+(PUTPROPS TTY.PROCESS MACRO (X (COND ((CAR X) (QUOTE IGNOREMACRO)) (T (QUOTE \TTY.PROCESS)))))
 (PUTPROPS TTY.PROCESSP MACRO (X (COND ((CAR X) (QUOTE IGNOREMACRO)) (T (QUOTE (OR (NULL (THIS.PROCESS)
 ) (EQ (THIS.PROCESS) (TTY.PROCESS))))))))
-(GLOBALVARS \\RUNNING.PROCESS \\TTY.PROCESS \\PROC.RESTARTME \\PROC.RESETME \\PROC.ABORTME)
+(GLOBALVARS \RUNNING.PROCESS \TTY.PROCESS \PROC.RESTARTME \PROC.RESETME \PROC.ABORTME)
 (PUTPROP (QUOTE PROC) (QUOTE IMPORTDATE) (IDATE "17-Jun-1999 21:58:52"))
 
-(RPAQQ \\NORUNCODE 255)
+(RPAQQ \NORUNCODE 255)
 (RPAQQ NSCHARSETSHIFT 255)
-(CONSTANTS (\\NORUNCODE 255) (NSCHARSETSHIFT 255))
-(PUTPROPS \\RUNCODED MACRO (OPENLAMBDA (STREAM) (* |;;| 
+(CONSTANTS (\NORUNCODE 255) (NSCHARSETSHIFT 255))
+(PUTPROPS \RUNCODED MACRO (OPENLAMBDA (STREAM) (* ;; 
 "returns NIL is the stream is not runcoded, that is, if the stream has 16 bit bytes explicitly represented"
-) (* \; "note that neq is ok since charsets are known to be SMALLP's") (NEQ (|fetch| CHARSET |of| 
-STREAM) \\NORUNCODE)))
+) (* ; "note that neq is ok since charsets are known to be SMALLP's") (NEQ (fetch CHARSET of STREAM) 
+\NORUNCODE)))
 (DEFOPTIMIZER ACCESS-CHARSET (STREAM &OPTIONAL NEWVALUE) (BQUOTE ((OPENLAMBDA (STRM) (FDEVOP (QUOTE 
-CHARSETFN) (|fetch| (STREAM DEVICE) |of| STRM) STRM (\\\, NEWVALUE))) (\\\, STREAM))))
-(PUTPROP (QUOTE XCCS) (QUOTE IMPORTDATE) (IDATE "24-Jun-2021 23:15:05"))
+CHARSETFN) (fetch (STREAM DEVICE) of STRM) STRM (\, NEWVALUE))) (\, STREAM))))
+<<<<<<< Updated upstream
+(PUTPROP (QUOTE XCCS) (QUOTE IMPORTDATE) (IDATE "13-Aug-2021 23:55:35"))
 
-(PUTPROP (QUOTE LLREAD) (QUOTE IMPORTDATE) (IDATE "30-Jul-2021 13:05:48"))
+(PUTPROP (QUOTE LLREAD) (QUOTE IMPORTDATE) (IDATE "19-Aug-2021 12:06:46"))
+=======
+(PUTPROP (QUOTE XCCS) (QUOTE IMPORTDATE) (IDATE " 5-Aug-2021 14:00:27"))
 
-(PUTPROPS EMPASSWORDLOC DMACRO (LAMBDA NIL (* |lmm| "24-MAR-83 06:46") (|fetch| (IFPAGE |UserPswdAddr|
-) |of| |\\InterfacePage|)))
-(PUTPROPS \\DECRYPT.PWD.CHAR MACRO ((CHAR) (LOGXOR CHAR 73)))
+(PUTPROP (QUOTE LLREAD) (QUOTE IMPORTDATE) (IDATE " 5-Aug-2021 14:00:27"))
+>>>>>>> Stashed changes
+
+(PUTPROPS EMPASSWORDLOC DMACRO (LAMBDA NIL (* lmm "24-MAR-83 06:46") (fetch (IFPAGE UserPswdAddr) of 
+\InterfacePage)))
+(PUTPROPS \DECRYPT.PWD.CHAR MACRO ((CHAR) (LOGXOR CHAR 73)))
 (PUTPROP (QUOTE PASSWORDS) (QUOTE IMPORTDATE) (IDATE "16-May-1990 21:02:21"))
 
 (RPAQQ MICASPERINCH 2540)
@@ -2385,21 +2372,21 @@ CHARSETFN) (|fetch| (STREAM DEVICE) |of| STRM) STRM (\\\, NEWVALUE))) (\\\, STRE
 (RPAQQ IHALFMICASPERPT 17)
 (RPAQQ IMICASPERPT 35)
 (CONSTANTS (MICASPERPT (FQUOTIENT 2540 72)) (IHALFMICASPERPT 17) (IMICASPERPT 35))
-(DEFMACRO \\MICASTOPTS (MICAS) (COND ((NUMBERP MICAS) (QUOTIENT MICAS MICASPERPT)) (T (BQUOTE (
-QUOTIENT (\\\, MICAS) MICASPERPT)))))
+(DEFMACRO \MICASTOPTS (MICAS) (COND ((NUMBERP MICAS) (QUOTIENT MICAS MICASPERPT)) (T (BQUOTE (QUOTIENT
+ (\, MICAS) MICASPERPT)))))
 (PUTPROP (QUOTE HARDCOPY) (QUOTE IMPORTDATE) (IDATE " 5-May-2021 19:41:55"))
 
 (FILESLOAD (SYSLOAD FROM VALUEOF DIRECTORIES) CMLARRAY-SUPPORT)
 (PUTPROP (QUOTE CMLARRAY) (QUOTE IMPORTDATE) (IDATE " 6-Jan-1993 12:21:21"))
 
-(RPAQQ \\MISCN-TABLE-LIST ((USER-SUBR 0 \\USER-SUBR-UFN T) (CL:VALUES 1 CL::VALUES-UFN NIL) (CL:SXHASH
- 2 CL::SXHASH-UFN NIL) (CL::EQLHASHBITSFN 3 CL::EQLHASHBITSFN-UFN NIL) (STRINGHASHBITS 4 
-\\STRINGHASHBITS-UFN NIL) (STRING-EQUAL-HASHBITS 5 \\STRING-EQUAL-HASHBITS-UFN NIL) (CL:VALUES-LIST 6 
-CL::VALUES-LIST-UFN NIL) (|LCFetchMethod| 7 |LCFetchMethod| NIL) (|LCFetchMethodOrHelp| 8 NIL NIL) (
-|LCFindVarIndex| 9 NIL NIL) (|LCGetIVValue| 10 NIL NIL) (|LCPutIVValue| 11 NIL NIL)))
-(RPAQQ \\USER-SUBR-LIST ((DUMMY 10 DUMMY-UFN) (SAMPLE-USER-SUBR 0 SAMPLE-USER-SUBR-UFN)))
-(RPAQQ \\INITSUBRS ((YIELD 210) (BACKGROUNDSUBR 6) (CHECKBCPLPASSWORD 7) (DISKPARTITION 8) (DSPBOUT 9)
- (DSPRATE 10) (GATHERSTATS 11) (GETPACKETBUFFER 12) (LISPFINISH 13) (MOREVMEMFILE 14) (RAID 15) (
+(RPAQQ \MISCN-TABLE-LIST ((USER-SUBR 0 \USER-SUBR-UFN T) (CL:VALUES 1 CL::VALUES-UFN NIL) (CL:SXHASH 2
+ CL::SXHASH-UFN NIL) (CL::EQLHASHBITSFN 3 CL::EQLHASHBITSFN-UFN NIL) (STRINGHASHBITS 4 
+\STRINGHASHBITS-UFN NIL) (STRING-EQUAL-HASHBITS 5 \STRING-EQUAL-HASHBITS-UFN NIL) (CL:VALUES-LIST 6 
+CL::VALUES-LIST-UFN NIL) (LCFetchMethod 7 LCFetchMethod NIL) (LCFetchMethodOrHelp 8 NIL NIL) (
+LCFindVarIndex 9 NIL NIL) (LCGetIVValue 10 NIL NIL) (LCPutIVValue 11 NIL NIL)))
+(RPAQQ \USER-SUBR-LIST ((DUMMY 10 DUMMY-UFN) (SAMPLE-USER-SUBR 0 SAMPLE-USER-SUBR-UFN)))
+(RPAQQ \INITSUBRS ((YIELD 210) (BACKGROUNDSUBR 6) (CHECKBCPLPASSWORD 7) (DISKPARTITION 8) (DSPBOUT 9) 
+(DSPRATE 10) (GATHERSTATS 11) (GETPACKETBUFFER 12) (LISPFINISH 13) (MOREVMEMFILE 14) (RAID 15) (
 READRAWPBI 16) (WRITERAWPBI 17) (SETSCREENCOLOR 18) (SHOWDISPLAY 19) (PUPLEVEL1STATE 20) (WRITESTATS 
 21) (CONTEXTSWITCH 22) (COPYSYS0SUBR 23) (WRITEMAP 24) (UFS-GETFILENAME 34) (UFS-DELETEFILE 35) (
 UFS-RENAMEFILE 36) (COM-READPAGES 37) (COM-WRITEPAGES 38) (COM-TRUNCATEFILE 39) (UFS-DIRECTORYNAMEP 41
@@ -2416,7 +2403,7 @@ COM-SETFILEINFO 103) (COM-OPENFILE 104) (COM-CLOSEFILE 105) (DSK-GETFILENAME 106
 DSK-DIRECTORYNAMEP 113) (COM-GETFILEINFO 114) (COM-CHANGEDIR 116) (UNIX-HANDLECOMM 117) (RPC-CALL 119)
  (MESSAGE-READP 120) (MESSAGE-READ 121) (MONITOR-CONTROL 128) (GET-NATIVE-ADDR-FROM-LISP-PTR 131) (
 GET-LISP-PTR-FROM-NATIVE-ADDR 132) (LOAD-NATIVE-FILE 133) (SUSPEND-LISP 134) (NEW-BLTCHAR 135) (
-COLOR-INIT 136) (COLOR-SCREENMODE 137) (COLOR-MAP 138) (COLOR-BASE 139) (|C-SlowBltChar| 140) (
+COLOR-INIT 136) (COLOR-SCREENMODE 137) (COLOR-MAP 138) (COLOR-BASE 139) (C-SlowBltChar 140) (
 UNCOLORIZE-BITMAP 141) (COLORIZE-BITMAP 142) (COLOR-8BPPDRAWLINE 143) (TCP-OP 144) (WITH-SYMBOL 145) (
 CAUSE-INTERRUPT 146) (OPEN-SOCKET 160) (CLOSE-SOCKET 161) (READ-SOCKET 162) (WRITE-SOCKET 163) (
 CALL-C-FUNCTION 167) (DLD-LINK 168) (DLD-UNLINK-BY-FILE 169) (DLD-UNLINK-BY-SYMBOL 170) (
diff --git a/lispusers/THINFILES b/lispusers/THINFILES
index 666823ba..b2e4eaf6 100644
--- a/lispusers/THINFILES
+++ b/lispusers/THINFILES
@@ -1,12 +1,11 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED " 8-Aug-2021 15:05:08" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.;3 8422   
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "18-Aug-2021 20:46:55" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.;5 8653   
 
-      changes to%:  (VARS THINFILESCOMS)
-                    (FNS FB.THINP)
+      changes to%:  (FNS FB.THINCOMMAND)
 
-      previous date%: " 8-Aug-2021 15:00:48" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.;2)
+      previous date%: " 8-Aug-2021 15:05:08" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.;4)
 
 
 (* ; "
@@ -15,16 +14,16 @@ Copyright (c) 1987-1989, 1992, 2021 by Xerox Corporation.
 
 (PRETTYCOMPRINT THINFILESCOMS)
 
-(RPAQQ THINFILESCOMS
-       [(DECLARE%: EVAL@COMPILE DONTCOPY (FILES (LOADCOMP)
-                                                FILEBROWSER))
-        (FNS FB.THINCOMMAND FB.THINP)
-        (INITVARS [THINEXTENSIONS (UNION *COMPILED-EXTENSIONS*
-                                         '(SYSOUT DCOM DATABASE LCOM DFASL MCOM MFASL DRIBBLE]
-               (THINNAMES NIL))
-        (APPENDVARS (FB.MENU.ITEMS (Thin FB.THINCOMMAND 
+(RPAQQ THINFILESCOMS [(DECLARE%: EVAL@COMPILE DONTCOPY (FILES (LOADCOMP)
+                                                                  FILEBROWSER))
+                          (FNS FB.THINCOMMAND FB.THINP)
+                          (INITVARS [THINEXTENSIONS (UNION *COMPILED-EXTENSIONS*
+                                                           '(SYSOUT DCOM DATABASE LCOM DFASL MCOM 
+                                                                   MFASL DRIBBLE]
+                                 (THINNAMES NIL))
+                          (APPENDVARS (FB.MENU.ITEMS (Thin FB.THINCOMMAND 
                      "Delvers non-source files and removes all but the last source file of each day."
-                                         ])
+                                                           ])
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
 (FILESLOAD (LOADCOMP)
@@ -33,38 +32,38 @@ Copyright (c) 1987-1989, 1992, 2021 by Xerox Corporation.
 (DEFINEQ
 
 (FB.THINCOMMAND
-  [LAMBDA (FBROWSER)                                         (* ; "Edited 10-Oct-88 10:06 by jtm:")
-                                                             (* ; "Edited 10-Oct-88 10:05 by jtm:")
-                                                             (* bvm%: "13-Oct-85 16:52")
+  [LAMBDA (FBROWSER)                                    (* ; "Edited 18-Aug-2021 20:46 by rmk:")
+                                                             (* ; "Edited 10-Oct-88 10:05 by jtm:")
+                                                             (* bvm%: "13-Oct-85 16:52")
 
-         (* * FB.THINCOMMAND interfaces between the user and the file browser.
-       It calls FB.THINP on each file to determine if the file should be deleted.
-       Any changes to the heuristic should be made to FB.THINP.)
+         (* * FB.THINCOMMAND interfaces between the user and the file browser.
+       It calls FB.THINP on each file to determine if the file should be deleted.
+       Any changes to the heuristic should be made to FB.THINP.)
 
     (LET (TBROWSER NDELETED FILES NOW ONEDAY SORT#)
 
-         (* * collect the files into a list.)
+         (* * collect the files into a list.)
 
          (SETQ FILES (TB.COLLECT.ITEMS (SETQ TBROWSER (fetch (FILEBROWSER TABLEBROWSER)
                                                          of FBROWSER))
                             (FUNCTION FB.IS.NOT.SUBDIRECTORY.ITEM)))
 
-         (* * sort the files in descending order.)
+         (* * sort the files in descending order.)
 
          [SETQ FILES (SELECTQ (fetch (FILEBROWSER SORTBY) of FBROWSER)
-                         (FB.NAMES.DECREASING.VERSION        (* Just right)
+                         (FB.NAMES.DECREASING.VERSION        (* Just right)
                               FILES)
-                         (FB.NAMES.INCREASING.VERSION        (* Close, but no cigar)
+                         (FB.NAMES.INCREASING.VERSION        (* Close, but no cigar)
                               (FB.SORT.VERSIONS FILES (FUNCTION FB.DECREASING.VERSION)))
                          (SORT FILES (FUNCTION FB.NAMES.DECREASING.VERSION]
 
-         (* * delete the files that satisfy FB.THINP.)
+         (* * delete the files that satisfy FB.THINP.)
 
          (SETQ NOW (IDATE (DATE)))
          (SETQ ONEDAY (IDIFFERENCE (IDATE "31-Aug-87 09:06:06")
                              (IDATE "30-Aug-87 09:06:06")))
 
-         (* * get the position of CREATIONDATE. (code borrowed from FB.SORTCOMMAND))
+         (* * get the position of CREATIONDATE. (code borrowed from FB.SORTCOMMAND))
 
          [SETQ SORT# (OR (CL:POSITION 'CREATIONDATE (fetch (FILEBROWSER INFODISPLAYED)
                                                        of FBROWSER)
@@ -90,10 +89,11 @@ Copyright (c) 1987-1989, 1992, 2021 by Xerox Corporation.
                                      (COND
                                         ((OR (NULL LASTTIMESTAMP)
                                              (NULL TIMESTAMP))
-                                                             (* no creation date was given.)
+                                                             (* no creation date was given.)
                                          NIL)
                                         ((ILESSP LASTTIMESTAMP TIMESTAMP)
-                                         (HELP THISNAME "is out of order."))
+                                         (HELP (fetch (FBFILEDATA FILENAME) of DATA)
+                                               "is out of order."))
                                         ((FB.THINP
                                           THISNAME
                                           (IDIFFERENCE NOW TIMESTAMP)
@@ -105,8 +105,8 @@ Copyright (c) 1987-1989, 1992, 2021 by Xerox Corporation.
                                                                              of
                                                                              (fetch TIDATA
                                                                                 of (CADR TAIL]
-                                          ONEDAY)            (* FB.THINP determines whether or 
-                                                           not the file should be deleted.)
+                                          ONEDAY)            (* FB.THINP determines whether or 
+                                                           not the file should be deleted.)
                                          (COND
                                             ((FB.DELETE.FILE TBROWSER FILE)
                                              (add %#DELETED 1]
@@ -153,5 +153,5 @@ Copyright (c) 1987-1989, 1992, 2021 by Xerox Corporation.
                                      ))
 (PUTPROPS THINFILES COPYRIGHT ("Xerox Corporation" 1987 1988 1989 1992 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1159 7953 (FB.THINCOMMAND 1169 . 6577) (FB.THINP 6579 . 7951)))))
+  (FILEMAP (NIL (1297 8184 (FB.THINCOMMAND 1307 . 6808) (FB.THINP 6810 . 8182)))))
 STOP
diff --git a/lispusers/THINFILES.LCOM b/lispusers/THINFILES.LCOM
index dfb8f3bf..1727e4d8 100644
Binary files a/lispusers/THINFILES.LCOM and b/lispusers/THINFILES.LCOM differ
diff --git a/loadups/full.database.dribble b/loadups/full.database.dribble
new file mode 100644
index 00000000..17ebd04b
--- /dev/null
+++ b/loadups/full.database.dribble
@@ -0,0 +1,653 @@
+
+STARTING MASTERSCOPE PHASE ON 14-Aug-2021 10:05:30
+
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>tmp>exports.all;27
+EXPORTS GATHERED FROM {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources> ON 
+14-Aug-2021 00:29:17
+(new PRETTYPRINTMACROS entry for UNINTERRUPTABLY)
+should I LOADFROM 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARRAY-SUPPORT.;1 ? ...Yes
+File created  2-May-99 14:57:41
+Warning: Possible comment not stripped (* *)
+
+Analyzing PACKAGE-CONVERSION-TABLE
+.
+Analyzing LLFAULT
+............................................................................
+Analyzing LLSUBRS
+.....................................
+Analyzing LLBFS
+.............................
+Analyzing LLNEW
+.............................................
+Analyzing FILEIO
+..........................................................................................
+......................
+Analyzing IMAGEIO
+..............................................................
+Analyzing LLBASIC
+.........................................................
+Analyzing LLGC
+.............................
+Analyzing LLARRAYELT
+..............****Warning: the iterative statement:
+(bind (SETQ IDEALSIZE (IMAX MINKEYS &)) find I from 8 to 16384 by --)
+
+now translates so that  ... by I ... is evaluated BEFORE I is bound and initialized to:
+8
+...........................................................
+Analyzing LLINTERP
+........................................................................................
+Analyzing LLMVS
+.......
+Analyzing DEFSTRUCT-RUN-TIME
+................
+Analyzing SETF-RUNTIME
+...
+Analyzing CMLSEQBASICS
+..Warning: Possible comment not stripped (* amd " 5-Jun-86 17:48")
+........
+Analyzing LLARITH
+..................................................................................
+Analyzing LLFLOAT
+.....................................................
+Analyzing LLBIGNUM
+..............................................
+Analyzing LLREAD
+..............................................
+Analyzing XCCS
+........
+Analyzing LLCHAR
+........................................
+Analyzing LLSTK
+..................................................................
+Analyzing LLDATATYPE
+........................................................
+Analyzing IOCHAR
+....................................
+Analyzing LLKEY
+...............................................................................
+Analyzing LLTIMER
+..........................
+Analyzing ASTACK
+.............................
+Analyzing DTDECLARE
+................
+Analyzing ATBL
+.......................................................
+Analyzing LLCODE
+.................
+Analyzing ACODE
+.................
+Analyzing COREIO
+..............................
+Analyzing AOFD
+..................................
+Analyzing ADIR
+................................
+Analyzing PMAP
+...........................................
+Analyzing VANILLADISK
+...
+Analyzing ATERM
+.........................................
+Analyzing APRINT
+.............................................
+Analyzing ABASIC
+............................................................
+Analyzing AERROR
+........
+Analyzing AINTERRUPT
+.................
+Analyzing MISC
+...............................................................................
+Analyzing BOOTSTRAP
+...............................
+Analyzing CMLMACROS
+.........
+Analyzing CMLEVAL
+..............................................................
+Analyzing CMLPROGV
+..
+Analyzing CMLSPECIALFORMS
+.....
+Analyzing LLRESTART
+
+Analyzing LLERROR
+..
+Analyzing LLSYMBOL
+..................
+Analyzing LLPACKAGE
+................................................................
+Analyzing PACKAGE-STARTUP
+.............................
+Analyzing CONDITION-PACKAGE
+...
+Analyzing XCL-PACKAGE
+...
+Analyzing PROC
+..........................................................................................
+........
+Analyzing CMLARRAY
+..........................................................................................
+...Warning: Possible comment not stripped (* *)
+.......................
+Analyzing DSK
+....
+Analyzing UFS
+...................................................
+Analyzing UFSCALLC
+..................
+Analyzing PASSWORDS
+..............
+Analyzing FONT
+...................................................................
+Analyzing LLDISPLAY
+..........................................................................................
+....
+Analyzing APUTDQ
+.........
+Analyzing COMPATIBILITY
+......
+Analyzing DMISC
+....................................................
+Analyzing CMLLIST
+......................................................................................
+Analyzing CMLCHARACTER
+................................................
+Analyzing CMLREADTABLE
+.............................................
+Analyzing MAIKOLOADUPFNS
+...........................
+Analyzing MAIKOBITBLT
+.....
+Analyzing MACHINEINDEPENDENT
+...........................................................
+Analyzing POSTLOADUP
+
+Analyzing LISP-PACKAGE
+
+Analyzing FASL-PACKAGE
+
+Analyzing D-ASSEM-PACKAGE
+
+Analyzing COMPILER-PACKAGE
+
+Analyzing ERROR-RUNTIME
+.................................
+Analyzing CMLARITH
+..........................................................................................
+...........................
+Analyzing CONDITION-HIERARCHY-SI
+
+Analyzing CONDITION-HIERARCHY-POST-SI
+
+Analyzing CONDITION-HIERARCHY-IL
+
+Analyzing CONDITION-HIERARCHY
+...
+Analyzing CMLHASH
+............
+Analyzing D-ASSEM
+..................................................................................Warning: Possible comment not stripped (* CL:SETQ D-ASSEM::OFFSET (ADD1 D-ASSEM::OFFSET))
+....
+Analyzing FASLOAD
+......................................
+Analyzing DEFFER-RUNTIME
+.......
+Analyzing CMLPRINT
+................
+Analyzing CLSTREAMS
+...................................................................................
+Analyzing CMLSTRING
+.............................
+Analyzing CMLSYMBOL
+
+Analyzing CMLTYPES
+...............................
+Analyzing CMLSEQCOMMON
+
+Analyzing CMLSEQMAPPERS
+..........................
+Analyzing CMLPATHNAME
+............................
+Analyzing CMLFILESYS
+........Warning: Possible comment not stripped (* * "Delete the specified file.")
+.
+Analyzing CMLDEFFER
+.................
+Analyzing ERROR-RUNTIME-AFTER-FASL
+...
+Analyzing WRAPPERS
+................
+Analyzing STACKFNS
+.......
+Analyzing CMLMVS
+..
+Analyzing MACROS
+.........
+Analyzing MACROAUX
+...............
+Analyzing UNWINDMACROS
+....
+Analyzing COMMON
+..............
+Analyzing XCLC-RUNTIME
+.
+Analyzing CL-ERROR
+................
+Analyzing AFONT
+............
+Analyzing EDIT
+........................................................................
+Analyzing WEDIT
+.................
+Analyzing PRETTY
+...............................
+Analyzing DSPRINTDEF
+...........
+Analyzing NEWPRINTDEF
+...........................
+Analyzing FONTPROFILE
+....
+Analyzing SPELLFILE
+.......
+Analyzing PRINTFN
+........
+Analyzing LOADFNS
+......................
+Analyzing DIRECTORY
+.................
+Analyzing FILEPKG
+..........................................................................................
+.......................................
+Analyzing RESOURCE
+.........
+Analyzing HIST
+..................................................
+Analyzing UNDO
+....................................................................
+Analyzing SPELL
+.............
+Analyzing DWIM
+.............................
+Analyzing WTFIX
+...
+Analyzing CLISP
+..
+Analyzing DWIMIFY
+........................................................................................
+Analyzing CLISPIFY
+.....................................
+Analyzing RECORD
+..........................................................................................
+..........
+Analyzing GAINSPACE
+.....
+Analyzing COROUTINE
+.............
+Analyzing ARGLIST
+.
+Analyzing ASKUSER
+.........
+Analyzing SYSPRETTY
+..
+Analyzing COMPARE
+..........
+Analyzing CMLSTEP
+..............
+Analyzing CMLDOC
+....
+Analyzing CMLPARSE
+.........................
+Analyzing CMLSETF
+.......
+Analyzing CMLPRED
+.....
+Analyzing CMLREAD
+............
+Analyzing WALKER
+..........................................
+Analyzing CMLSEQFINDER
+................................
+Analyzing CMLSEQMODIFY
+.............................................
+Analyzing CMLSORT
+..................
+Analyzing DEFSTRUCT
+.................................................................................
+Analyzing CMLMISCIO
+....
+Analyzing CMLCOMPILE
+.................
+Analyzing CMLDESTRUCT
+.
+Analyzing CMLFORMAT
+...................Warning: Possible comment not stripped (* amd " 1-May-86 14:33")
+.........................................................
+Analyzing CMLENVIRONMENT
+...............
+Analyzing CMLLOAD
+.....
+Analyzing CMLFLOAT
+..........................................................................................
+....
+Analyzing CMLTIME
+.......
+Analyzing CMLRAND
+.......
+Analyzing CMLMODULES
+...
+Analyzing PROFILE
+..........................
+Analyzing CMLUNDO
+............
+Analyzing CMLEXEC
+................................................................
+Analyzing EXEC-COMMANDS
+..
+Analyzing DEBUGGER
+.........................................................
+Analyzing IL-ERROR-STUFF
+............
+Analyzing DEBUGEDIT
+....
+Analyzing ADDARITH
+....
+Analyzing HPRINT
+.................................
+Analyzing AARITH
+................
+Analyzing ADISPLAY
+..........................................................................................
+..........
+Analyzing HLDISPLAY
+...............................................................................
+Analyzing MENU
+............................................................
+Analyzing WINDOWOBJ
+.................
+Analyzing WINDOWSCROLL
+............................
+Analyzing PAINTW
+..........
+Analyzing WINDOW
+..........................................................................................
+....................
+Analyzing WINDOWICON
+..........
+Analyzing ATTACHEDWINDOW
+....................................................................
+Analyzing XXGEOM
+.................................
+Analyzing XXFILL
+..............................
+Analyzing DEXEC
+....
+Analyzing INSPECT
+..........................................................................................
+......
+Analyzing DESCRIBE
+................
+Analyzing TWODINSPECTOR
+....................................................................
+Analyzing FREEMENU
+..........................................................................................
+.........................
+Analyzing CMLARRAYINSPECTOR
+.........................
+Analyzing EDITINTERFACE
+............................
+Analyzing TTYIN
+..........................................................................................
+....................................................................................
+Analyzing BREAK-AND-TRACE
+................................
+Analyzing FASDUMP
+............................................
+Analyzing XCLC-ENV-CTXT
+..........................................
+Analyzing XCLC-TREES
+..................................................
+Analyzing XCLC-TOP-LEVEL
+...........................................................................
+Analyzing XCLC-ALPHA
+..................................................
+Analyzing XCLC-OPTIMIZERS
+...
+Analyzing XCLC-ANALYZE
+................................................
+Analyzing XCLC-META-EVAL
+................................................................
+Analyzing XCLC-TRANSFORMS
+....
+Analyzing XCLC-DATABASE
+.
+Analyzing XCLC-ANNOTATE
+.............................................
+Analyzing XCLC-GENCODE
+....................................................
+Analyzing XCLC-PEEPHOLE
+........
+Analyzing XCL-COMPILER
+
+Analyzing ADVISE
+.................................
+Analyzing DLAP
+...............................
+Analyzing BYTECOMPILER
+..........................................................................................
+..............................................................................
+Analyzing COMPILE
+.................................
+Analyzing HARDCOPY
+.......................................................................................
+Analyzing LOGOW
+.
+Analyzing IDLER
+...................
+Analyzing ICONW
+............
+Analyzing SEDIT-ACCESS
+
+Analyzing SEDIT-ATOMIC
+....................................
+Analyzing SEDIT-BASE
+...................................................................................
+Analyzing SEDIT-COMMANDS
+.........................................................................................
+Analyzing SEDIT-COMMENTS
+.....................................
+Analyzing SEDIT-EXPORTS
+
+Analyzing SEDIT-INDENT
+....................
+Analyzing SEDIT-LIST-FORMATS
+
+Analyzing SEDIT-LINEAR
+........................
+Analyzing SEDIT-LISTS
+..................................................
+Analyzing SEDIT-TERMINAL
+.......
+Analyzing SEDIT-TOPLEVEL
+................................
+Analyzing SEDIT-WINDOW
+.....................................................
+Analyzing SEDIT
+
+Analyzing TIME
+..........
+Analyzing BRKDWN
+...............
+Analyzing XCL-EXTRAS
+...
+Analyzing CMLPACKAGE
+...................
+Analyzing CMLSMARTARGS
+..
+Analyzing IMPLICIT-KEY-HASH
+........
+Analyzing CLOSURE-CACHE
+......
+Analyzing PUP
+................................................................
+Analyzing 10MBDRIVER
+............................
+Analyzing LEAF
+.....................................................................................
+Analyzing LLETHER
+.....................................................................
+Analyzing DPUPFTP
+.................................................
+Analyzing LOCALFILE
+..........................................................................................
+..................RemoveLast unsaved
+...................................................................
+Analyzing DSKDISPLAY
+.......
+Analyzing COURIER
+................................................................
+Analyzing LLNS
+....................................................
+Analyzing TRSERVER
+.................
+Analyzing SPP
+..............................................................
+Analyzing NSPRINT
+...................
+Analyzing AUTHENTICATION
+.........................
+Analyzing BSP
+............................................................................
+Analyzing CLEARINGHOUSE
+..........................................
+Analyzing NSFILING
+..........................................................................................
+....
+Analyzing MAIKOETHER
+.....................
+Analyzing POSTSCRIPTSTREAM
+.....................................................................................
+Analyzing CHATTERMINAL
+............................
+Analyzing DMCHAT
+.........
+Analyzing CHAT
+.................................................................
+Analyzing PRESS
+....................................................................
+Analyzing INTERPRESS
+..........................................................................................
+..............................
+Analyzing TEDITDCL
+
+Analyzing PCTREE
+.............
+Analyzing TEXTOFD
+.........................................................
+Analyzing TEDITCOMMAND
+...............
+Analyzing TEDITSCREEN
+.............................
+Analyzing TEDITABBREV
+...
+Analyzing TEDITLOOKS
+...................................................
+Analyzing TEDITFIND
+............
+Analyzing TEDITHISTORY
+...........
+Analyzing TEDITFILE
+.................................................
+Analyzing TEDITWINDOW
+...................................................
+Analyzing TEDITSELECTION
+.....................................
+Analyzing READNUMBER
+.............
+Analyzing EDITBITMAP
+.......................
+Analyzing IMAGEOBJ
+.....................
+Analyzing TFBRAVO
+.....................................
+Analyzing TEDITHCPY
+...............
+Analyzing TEDITPAGE
+........................
+Analyzing TEDITMENU
+..........................................................................................
+.
+Analyzing TEDITFNKEYS
+.......................................
+Analyzing TEDIT
+..........................................
+Analyzing HRULE
+......................
+Analyzing TEDITCHAT
+.....
+Analyzing TABLEBROWSER
+..............................................................
+Analyzing FILEBROWSER
+..........................................................................................
+........................
+Analyzing THINFILES
+..
+Analyzing GRAPHER
+..........................................................................................
+..............................................................
+Analyzing SPY
+............................................
+Analyzing WHERE-IS
+.....................
+Analyzing COPYFILES
+...............
+Analyzing MSANALYZE
+......................
+Analyzing MSPARSE
+...........................................
+Analyzing MSCOMMON
+...
+Analyzing MASTERSCOPE
+..........................................................................................
+..........
+Analyzing UNIXCOMM
+.....................
+Analyzing UNIXPRINT
+.......
+Analyzing UNICODE
+...........................
+Analyzing ISO8859IO
+...............
+Analyzing DINFO
+.........................................
+Analyzing HASH
+...............................
+Analyzing HELPSYS
+.....................
+Analyzing CLIPBOARD
+..........
+Analyzing MODERNIZE
+..............
+Analyzing PRETTYFILEINDEX
+.............................................................
+Analyzing WHO-LINE
+.........................................................................
+Analyzing UNIXCHAT
+......
+Analyzing NSDISPLAYSIZES
+.....
+Analyzing WHEELSCROLL
+.....
+Analyzing SAMEDIR
+..
+Analyzing COMPILEBANG
+.
+Analyzing WDWHACKS
+.......
+Analyzing FILEWATCH
+.......................................
+Analyzing CMLARRAY-SUPPORT
+...............Warning: Possible comment not stripped (* *)
+........
\ No newline at end of file
diff --git a/loadups/full.dribble b/loadups/full.dribble
index bac8e149..9a0be7d6 100644
--- a/loadups/full.dribble
+++ b/loadups/full.dribble
@@ -1,5 +1,5 @@
 
-Full loadup started at 30-Jul-2021 13:12:30 while connected to 
+Full loadup started at 19-Aug-2021 12:07:27 while connected to 
 {DSK}<Users>kaplan>Local>medley3.5>git-medley>
 
 loading POSTSCRIPTSTREAM
@@ -144,7 +144,7 @@ compiled on 29-Apr-2021 22:44:22
 File created 29-Apr-2021 22:44:22
 TEDITMENUCOMS
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFNKEYS.LCOM;1
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFNKEYS.LCOM;3
 compiled on 18-May-2018 09:17:25
 File created  6-May-2018 17:15:13
 TEDITFNKEYSCOMS
@@ -164,7 +164,7 @@ loading READNUMBER
 loading EDITBITMAP
 loading FILEBROWSER
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.LCOM;4
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.LCOM;6
 compiled on  9-Jul-2021 23:09:57
 File created  9-Jul-2021 23:09:57
 
@@ -174,9 +174,9 @@ File created 20-Feb-2021 23:02:39
 TABLEBROWSERCOMS
 loading THINFILES
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.LCOM;1
-compiled on 26-Jun-99 00:47:00
-File created  1-May-92 16:49:39
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.LCOM;4
+compiled on  8-Aug-2021 15:05:08
+File created  8-Aug-2021 15:05:08
 THINFILESCOMS
 loading GRAPHER
 
@@ -204,7 +204,7 @@ Source file created Monday, 11 June 1990, 16:16:54.
 FASL file created Friday, 26 February 1993, 11:23:40.
 
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>CASH-FILE.DFASL;5
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>CASH-FILE.DFASL;1
 XCL Compiler output for source file {DSK}<usr>local>lde>lispcore>library>CASH-FILE.;2
 Source file created 11-Jun-90 14:33:44
 FASL file created Saturday, 19 September 2020, 22:04:31
@@ -218,9 +218,9 @@ COPYFILESCOMS
 loading MSANALYZE
 
 {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MSANALYZE.DFASL;1
-XCL Compiler output for source file {DSK}<home>larry>ilisp>medley>library>MSANALYZE.;2
-Source file created  3-Mar-2021 10:31:16
-FASL file created Wednesday, 3 March 2021, 10:31:16
+XCL Compiler output for source file {DSK}<home>larry>medley>library>MSANALYZE.;5
+Source file created 18-Aug-2021 12:13:11
+FASL file created Wednesday, 18 August 2021, 12:13:11
 
 loading MSPARSE
 
@@ -256,15 +256,15 @@ File created 25-Apr-2018 07:31:56
 UNIXCOMMCOMS
 loading UNICODE
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.LCOM;30
-compiled on 29-Jul-2021 21:16:01
-File created 29-Jul-2021 21:16:01
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.LCOM;43
+compiled on  8-Aug-2021 13:10:17
+File created  8-Aug-2021 13:10:17
 UNICODECOMS
 loading ISO8859IO
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>ISO8859IO.LCOM;13
-compiled on 23-Jun-2021 17:00:30
-File created 23-Jun-2021 17:00:30
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>ISO8859IO.LCOM;23
+compiled on  8-Aug-2021 13:22:32
+File created  8-Aug-2021 13:22:31
 ISO8859IOCOMS
 loading HELPSYS
 
diff --git a/loadups/full.sysout b/loadups/full.sysout
index 5b463847..22217e52 100644
Binary files a/loadups/full.sysout and b/loadups/full.sysout differ
diff --git a/loadups/lisp.dribble b/loadups/lisp.dribble
index beeeb263..8c28c8e2 100644
--- a/loadups/lisp.dribble
+++ b/loadups/lisp.dribble
@@ -284,7 +284,7 @@ File created 19-Jan-93 10:27:05
 DSPRINTDEFCOMS
 loading NEWPRINTDEF
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>NEWPRINTDEF.LCOM;3
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>NEWPRINTDEF.LCOM;1
 compiled on 31-Dec-2000 11:53:35
 File created 31-Dec-2000 11:53:33
 NEWPRINTDEFCOMS
@@ -302,13 +302,13 @@ File created 28-Apr-92 15:38:21
 SPELLFILECOMS
 loading PRINTFN
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.LCOM;17
-compiled on 27-Jun-2021 23:29:20
-File created 27-Jun-2021 23:29:20
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.LCOM;20
+compiled on  8-Aug-2021 15:15:18
+File created  8-Aug-2021 15:15:00
 PRINTFNCOMS
 loading LOADFNS
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOADFNS.LCOM;11
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOADFNS.LCOM;1
 compiled on 16-Apr-2018 17:38:16
 File created 16-Apr-2018 17:38:16
 LOADFNSCOMS
@@ -404,7 +404,7 @@ File created 16-May-90 12:03:44
 ARGLISTCOMS
 loading ASKUSER
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ASKUSER.LCOM;6
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ASKUSER.LCOM;1
 compiled on 12-Feb-2021 17:00:05
 File created 12-Feb-2021 17:00:02
 ASKUSERCOMS
@@ -450,9 +450,9 @@ compiled on 25-Jan-98 10:30:39
 File created 16-May-90 14:19:02
 loading CMLREAD
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLREAD.LCOM;12
-compiled on 29-Jul-2021 20:34:35
-File created 29-Jul-2021 20:34:35
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLREAD.LCOM;18
+compiled on 16-Aug-2021 23:42:49
+File created 16-Aug-2021 23:42:49
 loading WALKER
 
 {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WALKER.DFASL;1
@@ -532,7 +532,7 @@ compiled on 25-Jan-98 10:31:47
 File created 16-May-90 14:21:56
 loading CMLMODULES
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMODULES.DFASL;5
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMODULES.DFASL;1
 XCL Compiler output for source file {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>CMLMODULES.;2
 Source file created Monday, 16 April 2018, 22:46:19.
 FASL file created Monday, 16 April 2018, 22:46:19.
@@ -625,9 +625,9 @@ File created 17-Feb-2021 13:49:06
 WINDOWSCROLLCOMS
 loading WINDOW
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOW.LCOM;2
-compiled on 13-Jun-2021 10:14:32
-File created 13-Jun-2021 10:14:32
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOW.LCOM;4
+compiled on  2-Aug-2021 00:44:48
+File created  2-Aug-2021 00:44:48
 
 {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PAINTW.LCOM;1
 compiled on 16-Jul-99 15:49:39
@@ -659,7 +659,7 @@ File created 13-Jun-2021 14:41:44
 XXFILLCOMS
 loading DEXEC
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.LCOM;13
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.LCOM;1
 compiled on 13-Aug-2020 12:36:18
 File created 13-Aug-2020 12:36:18
 loading INSPECT
@@ -682,7 +682,7 @@ compiled on 25-Jan-98 09:53:09
 File created 31-Dec-93 12:26:35
 CMLARRAYINSPECTORCOMS
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TWODINSPECTOR.LCOM;2
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TWODINSPECTOR.LCOM;1
 compiled on 19-Feb-2021 14:31:33
 File created 19-Feb-2021 14:31:33
 TWODINSPECTORCOMS
@@ -697,9 +697,9 @@ compiled on 25-Jan-98 13:12:33
 File created  7-Nov-91 18:15:13
 loading TTYIN
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.LCOM;3
-compiled on 13-Jun-2021 10:11:51
-File created 13-Jun-2021 10:11:51
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.LCOM;12
+compiled on 14-Aug-2021 00:00:35
+File created 13-Aug-2021 11:07:59
 TTYINCOMS
 loading BREAK-AND-TRACE
 
@@ -732,7 +732,7 @@ Source file created Wednesday, 23 May 1990, 13:17:15.
 FASL file created Monday, 26 January 1998, 14:01:24.
 
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-TOP-LEVEL.DFASL;10
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-TOP-LEVEL.DFASL;1
 XCL Compiler output for source file {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>XCLC-TOP-LEVEL.;10
 Source file created 19-Sep-2020 22:02:59
 FASL file created Saturday, 19 September 2020, 22:02:59
@@ -840,7 +840,7 @@ Source file created Tuesday, 19 January 1993, 11:16:06.
 FASL file created Monday, 26 January 1998, 13:30:23.
 
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-ATOMIC.DFASL;3
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-ATOMIC.DFASL;1
 XCL Compiler output for source file {DSK}<usr>local>lde>lispcore>sources>SEDIT-ATOMIC.;3
 Source file created 16-May-90 21:37:57
 FASL file created Sunday, 20 September 2020, 21:00:28
@@ -852,7 +852,7 @@ Source file created Wednesday, 2 December 1992, 17:40:24.
 FASL file created Monday, 26 January 1998, 13:31:04.
 
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMANDS.DFASL;4
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMANDS.DFASL;8
 XCL Compiler output for source file {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-COMMANDS.;3
 Source file created Monday, 23 April 2018, 18:12:52.
 FASL file created Monday, 23 April 2018, 18:13:51.
@@ -906,7 +906,7 @@ Source file created Wednesday, 10 July 1991, 19:03:29.
 FASL file created Monday, 26 January 1998, 13:36:04.
 
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-WINDOW.DFASL;3
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-WINDOW.DFASL;1
 XCL Compiler output for source file {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-WINDOW.;2
 Source file created Monday, 14 May 2018, 14:12:02.
 FASL file created Monday, 14 May 2018, 14:12:02.
@@ -917,7 +917,7 @@ loading UFSCALLC
 loading MAIKOBITBLT
 loading TIME
 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TIME.LCOM;5
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TIME.LCOM;1
 compiled on 16-Apr-2018 23:05:17
 File created 16-Apr-2018 23:05:10
 loading BRKDWN
diff --git a/loadups/lisp.sysout b/loadups/lisp.sysout
index 74d376d4..19d5b6a4 100644
Binary files a/loadups/lisp.sysout and b/loadups/lisp.sysout differ
diff --git a/loadups/whereis.dribble b/loadups/whereis.dribble
index bc22e112..3afa175d 100644
--- a/loadups/whereis.dribble
+++ b/loadups/whereis.dribble
@@ -2,7 +2,7 @@
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>10MBDRIVER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AARITH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ABASIC.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ACODE.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ACODE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ADDARITH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ADIR.;9 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ADISPLAY.;10 ... done.
@@ -10,19 +10,19 @@
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AERROR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AFONT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AINTERRUPT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AOFD.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>APRINT.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AOFD.;6 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>APRINT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>APUTDQ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ARGLIST.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ASKUSER.;6 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ASKUSER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ASTACK.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;11 .
-Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODEMASKS IL:READMACROCONTEXTS IL:READCLASSES IL:READMACROWAKEUPS IL:READMACROESCAPES) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;11.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;20 .
+Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODEMASKS IL:READMACROCONTEXTS IL:READCLASSES IL:READMACROWAKEUPS IL:READMACROESCAPES) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;20.
 .. done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATERM.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATTACHEDWINDOW.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATERM.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATTACHEDWINDOW.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>AUTHENTICATION.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;50 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;59 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BREAK-AND-TRACE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BRKDWN.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BSP.;1 ... done.
@@ -35,8 +35,8 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CLSTREAMS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARITH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARRAY.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARRAY-SUPPORT.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARRAYINSPECTOR.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARRAY-SUPPORT.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLARRAYINSPECTOR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLCHARACTER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLCOMPILE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLDEFFER.;1 ... done.
@@ -53,7 +53,7 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLLOAD.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMACROS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMISCIO.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMODULES.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMODULES.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLMVS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLPACKAGE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLPARSE.;1 ... done.
@@ -62,8 +62,8 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLPRINT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLPROGV.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLRAND.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLREAD.;11 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLREADTABLE.;5 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLREAD.;17 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLREADTABLE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSEQ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSEQBASICS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSEQCOMMON.;1 ... done.
@@ -71,7 +71,7 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSEQMAPPERS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSEQMODIFY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSETF.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSMARTARGS.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSMARTARGS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSORT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSPECIALFORMS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSTEP.;1 ... done.
@@ -92,9 +92,9 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CONDITION-HIERARCHY-POST-SI.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CONDITION-HIERARCHY-SI.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CONDITION-PACKAGE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>COREIO.;5 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>COREIO.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>COROUTINE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>COURIER.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>COURIER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>D-ASSEM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>D-ASSEM-PACKAGE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEBUGEDIT.;1 ... done.
@@ -104,9 +104,9 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEFSTRUCT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEFSTRUCT-RUN-TIME.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DESCRIBE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.;11 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DFILE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DIRECTORY.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DIRECTORY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DISKDLION.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DISKVMEMDECLS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DLAP.;1 ... done.
@@ -117,7 +117,7 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DSK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DSKDISPLAY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DSPRINTDEF.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DTDECLARE.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DTDECLARE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DWIM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DWIMIFY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>EDIT.;1 ... done.
@@ -128,29 +128,29 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASDUMP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASL-PACKAGE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASL-SUPPORT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;62 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FASLOAD.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;88 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;5 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;6 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FONT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FONTPROFILE.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FONTPROFILE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FONTPROFILEPATCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FREEMENU.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>GAINSPACE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>HARDCOPY.;7 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>HARDCOPY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>HIST.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>HLDISPLAY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>HPRINT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ICONW.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IDLER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IL-ERROR-STUFF.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;5 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMPLICIT-KEY-HASH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>INSPECT.;10 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>INSPECT-CLOSURE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>INTERPRESS.;9 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IOCHAR.;6 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>JAPANESE.;6 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IOCHAR.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>JAPANESE.;18 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LEAF.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LISP-PACKAGE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLARITH.;1 ... done.
@@ -160,70 +160,70 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLBIGNUM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLCHAR.;6 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLCODE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLDATATYPE.;12 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLDISPLAY.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLDATATYPE.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLDISPLAY.;8 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLERROR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLETHER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLFAULT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLFLOAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLGC.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLGC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLINTERP.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLMVS.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLNEW.;16 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLMVS.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLNEW.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLNS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLNSDECLS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLPACKAGE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLPARAMS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;51 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;90 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLRESTART.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLSTK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLSUBRS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLSYMBOL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLTIMER.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOADFNS.;8 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOADFNS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOADUP-FULL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOADUP-LISP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOCALFILE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOGOW.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MACHINEINDEPENDENT.;16 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LOGOW.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MACHINEINDEPENDENT.;24 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MACROAUX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MACROAUX-OPTIMIZERS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MACROS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAIKOBITBLT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAIKOETHER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAIKOINIT.;1 .Warning: Couldn't find IL:MAIKOINITCOMS on {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAIKOINIT.;1.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAIKOLOADUPFNS.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAKEINIT.;7 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAIKOLOADUPFNS.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MAKEINIT.;9 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MEM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MENU.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MISC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MOD44IO.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>MODARITH.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>NEWPRINTDEF.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>NEWPRINTDEF.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>NSFILING.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>NSPRINT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PACKAGE-CONVERSION-TABLE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PACKAGE-STARTUP.;8 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PACKAGE-STARTUP.;12 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PAINTW.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PASSWORDS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PMAP.;6 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PMAP.;8 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>POSTLOADUP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRETTY.;19 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;16 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;19 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PROC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PROFILE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>PUP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>READSYS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>RECORD.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>RENAMEFNS.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>RENAMEMACROS.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>RENAMEFNS.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>RENAMEMACROS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>RESOURCE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-ACCESS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-ATOMIC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-BASE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMANDS.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMANDS.;8 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMENTS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-CONVERT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-DEBUG.;1 ... done.
@@ -235,7 +235,7 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-LISTS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-TERMINAL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-TOPLEVEL.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-WINDOW.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-WINDOW.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SETF-RUNTIME.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SPELL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SPELLFILE.;1 ... done.
@@ -244,25 +244,25 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>STACKFNS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SYSPRETTY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TCPHTE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TIME.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TIME.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TRSERVER.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;5 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TWODINSPECTOR.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>UFS.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>UFSCALLC.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;13 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TWODINSPECTOR.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>UFS.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>UFSCALLC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>UNDO.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>UNWINDMACROS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>VANILLADISK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>VMEM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WALKER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WEDIT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOW.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOW.;4 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOWICON.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOWOBJ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WINDOWSCROLL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WRAPPERS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>WTFIX.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;36 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;49 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCL-COMPILER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCL-EXTRAS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCL-PACKAGE.;1 ... done.
@@ -276,7 +276,7 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-OPTIMIZERS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-PEEPHOLE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-RUNTIME.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-TOP-LEVEL.;11 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-TOP-LEVEL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-TRANSFORMS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCLC-TREES.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XXFILL.;2 ... done.
@@ -294,38 +294,38 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>CLIPBOARD.;6 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>CMLFLOATARRAY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>COLOR.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>COPYFILES.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DANDELIONKEYBOARDS.;3 .Warning: Error attempting to LOADVARS (IL:DANDELIONKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DANDELIONKEYBOARDS.;3.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DATABASEFNS.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>COPYFILES.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DANDELIONKEYBOARDS.;1 .Warning: Error attempting to LOADVARS (IL:DANDELIONKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DANDELIONKEYBOARDS.;1.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DATABASEFNS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DEDIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DEDITPP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DES.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DMCHAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DORADOKEYBOARDS.;3 .Warning: Error attempting to LOADVARS (IL:DORADOKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DORADOKEYBOARDS.;3.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOSPRINT.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOVEKEYBOARDS.;3 .Warning: Error attempting to LOADVARS (IL:DOVEKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOVEKEYBOARDS.;3.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DORADOKEYBOARDS.;1 .Warning: Error attempting to LOADVARS (IL:DORADOKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DORADOKEYBOARDS.;1.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOSPRINT.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOVEKEYBOARDS.;1 .Warning: Error attempting to LOADVARS (IL:DOVEKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOVEKEYBOARDS.;1.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>DOVERS232C.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>EDITBITMAP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>ETHERRECORDS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILE-UPDATE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FILEBROWSER.;6 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FONTSAMPLE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FOREIGN-FUNCTIONS.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FOREIGN-FUNCTIONS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>FX-80DRIVER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>GCHAX.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>GRAPHER.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>GRAPHER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>GRAPHZOOM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>HASH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>HASH-FILE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>HRULE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>IMAGEOBJ.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>IMAGEOBJ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>KEYBOARDCONFIGS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>KEYBOARDEDITOR.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>KEYBOARDEDITOR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>lafite> .Warning: Error attempting to LOADVARS (IL:NILCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>lafite>.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>LLCOLOR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>LOAD-SKETCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MAIKOCOLOR.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MAIKOKEYBOARDS.;3 .Warning: Error attempting to LOADVARS (IL:MAIKOKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MAIKOKEYBOARDS.;3.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MAIKOKEYBOARDS.;1 .Warning: Error attempting to LOADVARS (IL:MAIKOKEYBOARDSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MAIKOKEYBOARDS.;1.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MASTERSCOPE.;6 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MATCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MATMULT.;1 ... done.
@@ -333,37 +333,37 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MSCOMMON.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>MSPARSE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>NSCHAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>NSMAINTAIN.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>NSMAINTAIN.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>patches> .Warning: Error attempting to LOADVARS (IL:NILCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>patches>.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>PCTREE.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>PCTREE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>POSTSCRIPTSTREAM.;11 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>PRESS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>RDSYS.;1 .Warning: Error attempting to LOADVARS (IL:RDSYSCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>RDSYS.;1.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>RDSYS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>READNUMBER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>REMOTEVMEM.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SAMEDIR.;10 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SAMEDIR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SCALEBITMAP.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SEDIT-COMMONLISP.;2 .Warning: Error attempting to LOADVARS (IL:SEDIT-COMMONLISPCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SEDIT-COMMONLISP.;2.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SEDIT-COMMONLISP.;1 .Warning: Error attempting to LOADVARS (IL:SEDIT-COMMONLISPCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SEDIT-COMMONLISP.;1.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHBMELT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHEDIT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHELEMENTS.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHELEMENTS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHOBJ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHOPS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SKETCHSTREAM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SPY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SYSEDIT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TABLEBROWSER.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TABLEBROWSER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TABLEBROWSERDECLS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TBDECLS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITABBREV.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITABBREV.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITCHAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITCOMMAND.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITCOMMAND.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITDCL.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFILE.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFIND.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFNKEYS.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFILE.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFIND.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITFNKEYS.;3 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITHCPY.;2 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITHISTORY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITLOOKS.;1 ... done.
@@ -375,7 +375,7 @@ Warning: Error attempting to LOADVARS (IL:CCECHOMODES IL:TERMCLASSES IL:READCODE
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TELERAID.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEXEC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEXTMODULES.;1 .
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SEDIT-COMMONLISP.DFASL;2
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>SEDIT-COMMONLISP.DFASL;1
 XCL Compiler output for source file {DSK}<home>larry>ilisp>medley>SEDIT-COMMONLISP.;1
 Source file created  4-Jan-2021 22:52:01
 FASL file created Wednesday, 5 May 2021, 10:37:50
@@ -387,15 +387,15 @@ Source file created Wednesday, 16 January 1991, 9:07:18.
 FASL file created Tuesday, 12 July 1994, 12:31:02.
 
 .. done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEXTOFD.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEXTOFD.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TFBRAVO.;3 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TTYCHAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.;179 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNICODE.;192 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXCHAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXCOMM.;2 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXPRINT.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXCOMM.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXPRINT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>UNIXTELNET.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>VIRTUALKEYBOARDS.;9 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>VIRTUALKEYBOARDS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>VT100KP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>VTCHAT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>library>WHERE-IS.;1 ... done.
@@ -444,9 +444,9 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMMON-MAKE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMMWINDOW.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMPARE-PATHS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMPAREDIRECTORIES.;275 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMPARESOURCES.;4 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>comparetext.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMPAREDIRECTORIES.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COMPARESOURCES.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>comparetext.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>compilebang.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COURIERDEFS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>COURIEREVALSERVE.;1 ... done.
@@ -470,13 +470,13 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DIALPHONE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DICOLOR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DICT-WINDOW-TYPES.;1 .Warning: Error attempting to LOADVARS (IL:DICT-WINDOW-TYPESCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DICT-WINDOW-TYPES.;1.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DICTTOOL.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DICTTOOL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DIGEST.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DIGI-CLOCK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DINFO.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DIRGRAPHER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DLIONFNKEYS.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DOC-OBJECTS.;8 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DOC-OBJECTS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>document.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>donz.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>DORADOCOLOR.;1 ... done.
@@ -492,7 +492,7 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>EQUATIONFORMS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>EQUATIONS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>ETHERBOOT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>EVALOBJ.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>EVALOBJ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>EYECON.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>FASTEDITBM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>FILECACHE-FIX.;1 ... done.
@@ -543,7 +543,7 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>IRISNET.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>IRISSTREAM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>IRISVIEW.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>ISO8859IO.;10 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>ISO8859IO.;19 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>KEYOBJ.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>KINETIC.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>KOTOLOGO.;1 ... done.
@@ -551,11 +551,11 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAFITE-INDENT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAFITEABBREV.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAFITEPRIVATEDL.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAFITETIMEDDELETE.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAFITETIMEDDELETE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAMBDATRAN.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LAYOUT-SEDIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LIFE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LISPNERD.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LISPNERD.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LOADIRIS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LOADMENUITEMS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>LoadPatches.;1 ... done.
@@ -592,8 +592,8 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NOVAFONT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSALLOCATION.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSCOPYFILE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSDISPLAYSIZES.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSPROTECTION.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSDISPLAYSIZES.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSPROTECTION.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSREADERPATCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSROUTINGHASH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>NSTALK.;1 ... done.
@@ -614,12 +614,12 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PIXELBLT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLAINTEXTSTREAM.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLAY.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOT.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTANDNC-PATCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTBOXPATCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTEXAMPLES.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTINSKETCH.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTOBJECTS.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTOBJECTS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTOBJECTS1.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PLOTOBJECTS2.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>PORT-CLFILE.;1 ... done.
@@ -643,7 +643,7 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>QIX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READAIS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READAPPLEFONT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READBRUSH.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READBRUSH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READDATATYPE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READDISPLAYFONT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>READEBCDIC.;1 ... done.
@@ -666,7 +666,7 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SEDIT-MENU-ALWAYS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SEDIT-PATCHES.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SEDIT-PROFILE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SETDEFAULTPRINTER.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SETDEFAULTPRINTER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SFFONT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SHOWTIME.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>SIMPLECHAT.;1 ... done.
@@ -690,21 +690,21 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDIT-CLOSE-ON-SHRINK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDIT-LINE-NUMBERING.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>tedit-process-killer.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDITDORADOKEYS.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDITKEY.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDITDORADOKEYS.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDITKEY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEDITTALK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEK4010.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TEK4010CHAT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>THINFILES.;6 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TILED-SEDIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>tkdorado.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-DATE.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-ENDNOTE.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-INDEX.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-NGRAPH.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-NGROUP.;3 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-NUMBER.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-ENDNOTE.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-INDEX.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-NGRAPH.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-NGROUP.;1 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-NUMBER.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TMAX-XREF.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>tmenu.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>TRAJECTORY-FOLLOWER.;1 ... done.
@@ -724,9 +724,9 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>VANILLA-INIT.;1 .Warning: Error attempting to LOADVARS (IL:VANILLA-INITCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>VANILLA-INIT.;1.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>VSTATS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WALKFILES.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WDWHACKS.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WDWHACKS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WHEELSCROLL.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WHO-LINE.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WHO-LINE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WHOCALLS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WINK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>WORDNERD.;1 ... done.
@@ -734,23 +734,23 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>XORCURSORPATCH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>lispusers>XREF.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ABC.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ARCLEANUP.;2 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ARCLEANUP.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>AREDIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ARHACK.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ARINDEX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ARQUERY.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>arreport-test.;1 .Warning: Error attempting to LOADVARS (IL:ARREPORT-TESTCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>arreport-test.;1.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>ARSREPORT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>CALENDARHACKS.;4 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>CALENDARHACKS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>CHANGECONTROL.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>COMPTEST.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>CONDITIONGRAPH.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>CONDITIONGRAPH.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>DICOLOR.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>DO-TEST.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>DUMPFILE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>FASL-DEBUG.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>FLOAT-ARRAY-SUPPORT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>GIVE-AND-TAKE.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>GIVE-AND-TAKE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MACROTEST.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MACROTESTAUX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MAILCLIENT.;1 ... done.
@@ -760,7 +760,7 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MEDLEY-UTILS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MESATYPES.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>msx.;1 .Warning: Error attempting to LOADVARS (IL:MSXCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>msx.;1.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MULTI-COMPILE.;5 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MULTI-COMPILE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>NATIVE-TRANSLATOR.;1 .Warning: Error attempting to LOADVARS (IL:NATIVE-TRANSLATORCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>NATIVE-TRANSLATOR.;1.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>NATIVE-TRANSLATOR-PACKAGE.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>NSTOASCIIDISPLAYFONT.;1 ... done.
@@ -773,10 +773,10 @@ FASL file created Tuesday, 12 July 1994, 12:31:02.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>TYPEHAX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>WHEREIS.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>XCLC-DEBUG.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>INIT.;2 .Warning: Error attempting to LOADVARS (IL:INITCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>INIT.;2.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>LOCAL-INIT.;46 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>INIT.;1 .Warning: Error attempting to LOADVARS (IL:INITCOMS) from {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>INIT.;1.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>LOCAL-INIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>PARC-INIT.;1 ... done.
-;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>SIMPLE-INIT.;3 ... done.
+;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>greetfiles>SIMPLE-INIT.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>docs>Documentation Tools>IMINDEX.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>docs>Documentation Tools>IMNAME.;1 ... done.
 ;;; {DSK}<Users>kaplan>Local>medley3.5>git-medley>docs>Documentation Tools>IMTEDIT.;1 ... done.
diff --git a/loadups/whereis.hash b/loadups/whereis.hash
index 12e572cc..5f685475 100644
Binary files a/loadups/whereis.hash and b/loadups/whereis.hash differ
diff --git a/sources/ATBL b/sources/ATBL
index 99fbfc49..3e83a652 100644
--- a/sources/ATBL
+++ b/sources/ATBL
@@ -1,11 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "17-Aug-2021 15:52:57" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;16 91732  
+(FILECREATED "21-Aug-2021 08:06:49" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;22 91541  
 
-      changes to%:  (VARS ATBLCOMS)
-                    (FNS EQUAL-READER-ENVIRONMENT MAKE-READER-ENVIRONMENT)
+      changes to%:  (FNS \ORIGTERMTABLE)
 
-      previous date%: "16-Aug-2021 23:44:27" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;15)
+      previous date%: "19-Aug-2021 14:45:21" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ATBL.;21)
 
 
 (* ; "
@@ -788,7 +787,7 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
        (T (LISPERROR "ILLEGAL TERMINAL TABLE" TTBL])
 
 (\ORIGTERMTABLE
-  [LAMBDA NIL                                            (* rrb " 5-Oct-85 10:33")
+  [LAMBDA NIL                                           (* ; "Edited 21-Aug-2021 08:06 by rmk:")
 
     (* ;; "Creates the original terminal table")
 
@@ -851,9 +850,8 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
                                  'SIMULATE TBL))
                      NIL))
           (for C from 128 to \MAXTHINCHAR do (ECHOCHAR C 'REAL TBL))
-          (for C from (CHARCODE 1,0) to (CHARCODE 1,377) do (ECHOCHAR
-                                                                             C
-                                                                             'INDICATE TBL))
+          (for C from (CHARCODE Meta,0) to (CHARCODE Meta,377)
+             do (ECHOCHAR C 'INDICATE TBL))
           (RETURN TBL])
 
 (\SETTERMSYNTAX
@@ -1906,22 +1904,22 @@ Copyright (c) 1982-1987, 1990, 1993, 2018, 2021 by Venue & Xerox Corporation.
 (PUTPROPS ATBL COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1990 1993 2018 
 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18106 29258 (GETSYNTAX 18116 . 22947) (SETSYNTAX 22949 . 24022) (SYNTAXP 24024 . 26521)
- (\COPYSYNTAX 26523 . 27240) (\GETCHARCODE 27242 . 27530) (\SETFATSYNCODE 27532 . 28823) (
-\MAPCHARTABLE 28825 . 29256)) (29291 44378 (CONTROL 29301 . 29553) (COPYTERMTABLE 29555 . 29922) (
-DELETECONTROL 29924 . 32565) (GETDELETECONTROL 32567 . 33529) (ECHOCHAR 33531 . 34972) (ECHOCONTROL 
-34974 . 35431) (ECHOMODE 35433 . 35679) (GETECHOMODE 35681 . 35845) (GETCONTROL 35847 . 36013) (
-GETTERMTABLE 36015 . 36082) (RAISE 36084 . 36510) (GETRAISE 36512 . 36674) (RESETTERMTABLE 36676 . 
-37760) (SETTERMTABLE 37762 . 37996) (TERMTABLEP 37998 . 38159) (\GETTERMSYNTAX 38161 . 38432) (
-\GTTERMTABLE 38434 . 38770) (\ORIGTERMTABLE 38772 . 42503) (\SETTERMSYNTAX 42505 . 43140) (
-\TERMCLASSTOCODE 43142 . 43571) (\TERMCODETOCLASS 43573 . 43960) (\LITCHECK 43962 . 44376)) (46908 
-70732 (COPYREADTABLE 46918 . 47116) (FIND-READTABLE 47118 . 47265) (IN-READTABLE 47267 . 47427) (
-ESCAPE 47429 . 47682) (GETBRK 47684 . 47822) (GETREADTABLE 47824 . 47960) (GETSEPR 47962 . 48100) (
-READMACROS 48102 . 48365) (READTABLEP 48367 . 48530) (READTABLEPROP 48532 . 53690) (RESETREADTABLE 
-53692 . 57939) (SETBRK 57941 . 59551) (SETREADTABLE 59553 . 59741) (SETSEPR 59743 . 61285) (
-\GETREADSYNTAX 61287 . 63977) (\GTREADTABLE 63979 . 64204) (\GTREADTABLE1 64206 . 64462) (
-\ORIGREADTABLE 64464 . 66372) (\READCLASSTOCODE 66374 . 66825) (\SETMACROSYNTAX 66827 . 68622) (
-\SETREADSYNTAX 68624 . 69685) (\READTABLEP.DEFPRINT 69687 . 70730)) (83824 88277 (\ATBLSET 83834 . 
-88275)) (88724 91256 (MAKE-READER-ENVIRONMENT 88734 . 89512) (EQUAL-READER-ENVIRONMENT 89514 . 90658) 
-(SET-READER-ENVIRONMENT 90660 . 91254)))))
+  (FILEMAP (NIL (18036 29188 (GETSYNTAX 18046 . 22877) (SETSYNTAX 22879 . 23952) (SYNTAXP 23954 . 26451)
+ (\COPYSYNTAX 26453 . 27170) (\GETCHARCODE 27172 . 27460) (\SETFATSYNCODE 27462 . 28753) (
+\MAPCHARTABLE 28755 . 29186)) (29221 44187 (CONTROL 29231 . 29483) (COPYTERMTABLE 29485 . 29852) (
+DELETECONTROL 29854 . 32495) (GETDELETECONTROL 32497 . 33459) (ECHOCHAR 33461 . 34902) (ECHOCONTROL 
+34904 . 35361) (ECHOMODE 35363 . 35609) (GETECHOMODE 35611 . 35775) (GETCONTROL 35777 . 35943) (
+GETTERMTABLE 35945 . 36012) (RAISE 36014 . 36440) (GETRAISE 36442 . 36604) (RESETTERMTABLE 36606 . 
+37690) (SETTERMTABLE 37692 . 37926) (TERMTABLEP 37928 . 38089) (\GETTERMSYNTAX 38091 . 38362) (
+\GTTERMTABLE 38364 . 38700) (\ORIGTERMTABLE 38702 . 42312) (\SETTERMSYNTAX 42314 . 42949) (
+\TERMCLASSTOCODE 42951 . 43380) (\TERMCODETOCLASS 43382 . 43769) (\LITCHECK 43771 . 44185)) (46717 
+70541 (COPYREADTABLE 46727 . 46925) (FIND-READTABLE 46927 . 47074) (IN-READTABLE 47076 . 47236) (
+ESCAPE 47238 . 47491) (GETBRK 47493 . 47631) (GETREADTABLE 47633 . 47769) (GETSEPR 47771 . 47909) (
+READMACROS 47911 . 48174) (READTABLEP 48176 . 48339) (READTABLEPROP 48341 . 53499) (RESETREADTABLE 
+53501 . 57748) (SETBRK 57750 . 59360) (SETREADTABLE 59362 . 59550) (SETSEPR 59552 . 61094) (
+\GETREADSYNTAX 61096 . 63786) (\GTREADTABLE 63788 . 64013) (\GTREADTABLE1 64015 . 64271) (
+\ORIGREADTABLE 64273 . 66181) (\READCLASSTOCODE 66183 . 66634) (\SETMACROSYNTAX 66636 . 68431) (
+\SETREADSYNTAX 68433 . 69494) (\READTABLEP.DEFPRINT 69496 . 70539)) (83633 88086 (\ATBLSET 83643 . 
+88084)) (88533 91065 (MAKE-READER-ENVIRONMENT 88543 . 89321) (EQUAL-READER-ENVIRONMENT 89323 . 90467) 
+(SET-READER-ENVIRONMENT 90469 . 91063)))))
 STOP
diff --git a/sources/ATBL.LCOM b/sources/ATBL.LCOM
index ea2196f7..a98b7a26 100644
Binary files a/sources/ATBL.LCOM and b/sources/ATBL.LCOM differ
diff --git a/sources/CMLSTRING b/sources/CMLSTRING
index 06e50886..8cd530bb 100644
--- a/sources/CMLSTRING
+++ b/sources/CMLSTRING
@@ -1,26 +1,26 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "16-May-90 14:45:59" {DSK}<usr>local>lde>lispcore>sources>CMLSTRING.;2 28996  
+(FILECREATED "20-Aug-2021 20:44:50" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSTRING.;2 29739  
 
-      changes to%:  (VARS CMLSTRINGCOMS)
-
-      previous date%: "24-Mar-87 16:29:35" {DSK}<usr>local>lde>lispcore>sources>CMLSTRING.;1)
+      previous date%: "16-May-90 14:45:59" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLSTRING.;1)
 
 
 (* ; "
-Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1985-1987, 1990, 2021 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT CMLSTRINGCOMS)
 
 (RPAQQ CMLSTRINGCOMS
        (
-        (* ;; "run-time support ")
+        (* ;; "run-time support ")
 
         (FUNCTIONS CL::SIMPLE-STRING= CL::SIMPLE-STRING-EQUAL)
         (FUNCTIONS %%STRING-BASE-COMPARE %%STRING-BASE-COMPARE-EQUAL %%STRING-UPCASE 
                %%STRING-DOWNCASE)
         
-        (* ;; "User entry points ")
+        (* ;; "User entry points ")
 
         (FUNCTIONS CL:MAKE-STRING CL:NSTRING-CAPITALIZE CL:NSTRING-DOWNCASE CL:NSTRING-UPCASE STRING
                CL:STRING-CAPITALIZE CL:STRING-DOWNCASE STRING-EQUAL CL:STRING-GREATERP 
@@ -29,14 +29,14 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
                CL:STRING< CL:STRING<= CL:STRING= CL:STRING> CL:STRING>=)
         (OPTIMIZERS CL:STRING= STRING-EQUAL)
         
-        (* ;; "Internal macros  ")
+        (* ;; "Internal macros  ")
 
         (DECLARE%: DONTCOPY DOEVAL@COMPILE (FUNCTIONS WITH-ONE-STRING WITH-ONE-STRING-ONLY 
                                                   WITH-STRING WITH-TWO-UNPACKED-STRINGS 
                                                   %%UNPACK-STRING %%ADJUST-FOR-OFFSET %%CHECK-BOUNDS
                                                   %%PARSE-STRING-ARGS %%STRING-LENGTH))
         
-        (* ;; "Compiler options")
+        (* ;; "Compiler options")
 
         (PROP FILETYPE CMLSTRING)
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY (LOCALVARS . T))))
@@ -47,38 +47,38 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 
 (CL:DEFUN CL::SIMPLE-STRING= (STRING1 STRING2)
-   [LET ((END1 (%%STRING-LENGTH STRING1))
-         (END2 (%%STRING-LENGTH STRING2)))
+   [LET ((END1 (%%STRING-LENGTH STRING1))
+         (END2 (%%STRING-LENGTH STRING2)))
         (CL:IF (EQ END1 END2)
             (LET (BASE1 BASE2 OFFSET1 OFFSET2 TYPENUMBER1 TYPENUMBER2)
-                 (%%UNPACK-STRING STRING1 BASE1 OFFSET1 TYPENUMBER1)
-                 (%%UNPACK-STRING STRING2 BASE2 OFFSET2 TYPENUMBER2)
+                 (%%UNPACK-STRING STRING1 BASE1 OFFSET1 TYPENUMBER1)
+                 (%%UNPACK-STRING STRING2 BASE2 OFFSET2 TYPENUMBER2)
                  (CL:IF (NOT (EQ 0 OFFSET1))
                      (SETQ END1 (+ END1 OFFSET1)))
                  (CL:IF (NOT (EQ 0 OFFSET2))
                      (SETQ END2 (+ END2 OFFSET2)))
-                 (EQ END1 (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 OFFSET1 END1 
+                 (EQ END1 (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 OFFSET1 END1
                                  OFFSET2 END2))))])
 
 (CL:DEFUN CL::SIMPLE-STRING-EQUAL (STRING1 STRING2)
-   [LET ((END1 (%%STRING-LENGTH STRING1))
-         (END2 (%%STRING-LENGTH STRING2)))
+   [LET ((END1 (%%STRING-LENGTH STRING1))
+         (END2 (%%STRING-LENGTH STRING2)))
         (CL:IF (EQ END1 END2)
             (LET (BASE1 BASE2 OFFSET1 OFFSET2 TYPENUMBER1 TYPENUMBER2)
-                 (%%UNPACK-STRING STRING1 BASE1 OFFSET1 TYPENUMBER1)
-                 (%%UNPACK-STRING STRING2 BASE2 OFFSET2 TYPENUMBER2)
+                 (%%UNPACK-STRING STRING1 BASE1 OFFSET1 TYPENUMBER1)
+                 (%%UNPACK-STRING STRING2 BASE2 OFFSET2 TYPENUMBER2)
                  (CL:IF (NOT (EQ 0 OFFSET1))
                      (SETQ END1 (+ END1 OFFSET1)))
                  (CL:IF (NOT (EQ 0 OFFSET2))
                      (SETQ END2 (+ END2 OFFSET2)))
-                 (EQ END1 (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 OFFSET1 
-                                 END1 OFFSET2 END2))))])
+                 (EQ END1 (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+                                 OFFSET1 END1 OFFSET2 END2))))])
 
 (CL:DEFUN %%STRING-BASE-COMPARE (BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1 START2 END2)
 
-   (* ;; "Return index into base1 of first inequality ")
+   (* ;; "Return index into base1 of first inequality ")
 
-   (* ;; "Can use eq for character comparisons because they are immediate datatypes. Can use eq for numeric equality since Indices are always in the fixnum range")
+   (* ;; "Can use eq for character comparisons because they are immediate datatypes. Can use eq for numeric equality since Indices are always in the fixnum range")
 
    (CL:IF (EQ START1 START2)
        (CL:DO ((INDEX START1 (CL:1+ INDEX))
@@ -98,11 +98,11 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 (CL:DEFUN %%STRING-BASE-COMPARE-EQUAL (BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1 START2 
                                                  END2)
 
-   (* ;; "Return index into base1 of first case insensitive  inequality ")
+   (* ;; "Return index into base1 of first case insensitive  inequality ")
 
-   (* ;; "Can use eq for character comparisons because they are immediate datatypes. ")
+   (* ;; "Can use eq for character comparisons because they are immediate datatypes. ")
 
-   (* ;; "Char-upcase has been expanded out and simplified below.")
+   (* ;; "Char-upcase has been expanded out and simplified below.")
 
    (CL:IF (EQ START1 START2)
        (CL:DO ((INDEX START1 (CL:1+ INDEX))
@@ -119,28 +119,28 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
                             (%%CHAR-UPCASE-CODE (\LOLOC (%%ARRAY-READ BASE2 TYPENUMBER2 INDEX2]
                INDEX1))))
 
-(CL:DEFUN %%STRING-UPCASE (STRING START END)
+(CL:DEFUN %%STRING-UPCASE (STRING START END)
 
-   (* ;; "Assumes string is a string. Start and end define a subsequence. Destructively upcases string and returns it ")
+   (* ;; "Assumes string is a string. Start and end define a subsequence. Destructively upcases string and returns it ")
 
    (LET ((BASE (%%ARRAY-BASE STRING))
          (OFFSET (%%ARRAY-OFFSET STRING))
          (TYPENUMBER (%%ARRAY-TYPE-NUMBER STRING)))
-        (%%ADJUST-FOR-OFFSET START END OFFSET)
+        (%%ADJUST-FOR-OFFSET START END OFFSET)
         (CL:DO ((INDEX START (CL:1+ INDEX)))
                ((EQ INDEX END)
                 STRING)
             (%%ARRAY-WRITE (CL:CHAR-UPCASE (%%ARRAY-READ BASE TYPENUMBER INDEX))
                    BASE TYPENUMBER INDEX))))
 
-(CL:DEFUN %%STRING-DOWNCASE (STRING START END)
+(CL:DEFUN %%STRING-DOWNCASE (STRING START END)
 
-   (* ;; "Assumes string is a string. Start and end define a subsequence. Destructively downcases string and returns it ")
+   (* ;; "Assumes string is a string. Start and end define a subsequence. Destructively downcases string and returns it ")
 
    (LET ((BASE (%%ARRAY-BASE STRING))
          (OFFSET (%%ARRAY-OFFSET STRING))
          (TYPENUMBER (%%ARRAY-TYPE-NUMBER STRING)))
-        (%%ADJUST-FOR-OFFSET START END OFFSET)
+        (%%ADJUST-FOR-OFFSET START END OFFSET)
         (CL:DO ((INDEX START (CL:1+ INDEX)))
                ((EQ INDEX END)
                 STRING)
@@ -155,84 +155,85 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 (CL:DEFUN CL:MAKE-STRING (SIZE &KEY (INITIAL-ELEMENT NIL INITIAL-ELEMENT-P)
                                    FATP)
    "Makes a simple string"
-   (LET ((STRING (MAKE-VECTOR SIZE :ELEMENT-TYPE 'CL:STRING-CHAR :FATP FATP)))
+   (LET ((STRING (MAKE-VECTOR SIZE :ELEMENT-TYPE 'CL:STRING-CHAR :FATP FATP)))
         (CL:IF INITIAL-ELEMENT-P (FILL-ARRAY STRING INITIAL-ELEMENT))
         STRING))
 
-(CL:DEFUN CL:NSTRING-CAPITALIZE (STRING &KEY START END)
+(CL:DEFUN CL:NSTRING-CAPITALIZE (STRING &KEY START END)
    "Given a string, returns it with the first letter of every word in uppercase and all other letters in lowercase. A word is defined to be a sequence of alphanumeric characters delimited by non-alphanumeric characters"
-   [WITH-ONE-STRING-ONLY STRING START END (CL:DO ((INDEX START (CL:1+ INDEX))
-                                                  (ALPHA-P NIL)
-                                                  (WAS-ALPHA-P NIL ALPHA-P)
-                                                  CHAR)
-                                                 ((EQ INDEX END)
-                                                  STRING)
-                                              (SETQ CHAR (CL:CHAR STRING INDEX))
-                                              (SETQ ALPHA-P (CL:ALPHANUMERICP CHAR))
-                                              (CL:SETF (CL:CHAR STRING INDEX)
-                                                     (CL:IF (AND ALPHA-P (NOT WAS-ALPHA-P))
-                                                         (CL:CHAR-UPCASE CHAR)
-                                                         (CL:CHAR-DOWNCASE CHAR))))])
+   [WITH-ONE-STRING-ONLY STRING START END (CL:DO ((INDEX START (CL:1+ INDEX))
+                                                      (ALPHA-P NIL)
+                                                      (WAS-ALPHA-P NIL ALPHA-P)
+                                                      CHAR)
+                                                     ((EQ INDEX END)
+                                                      STRING)
+                                                  (SETQ CHAR (CL:CHAR STRING INDEX))
+                                                  (SETQ ALPHA-P (CL:ALPHANUMERICP CHAR))
+                                                  (CL:SETF (CL:CHAR STRING INDEX)
+                                                         (CL:IF (AND ALPHA-P (NOT WAS-ALPHA-P))
+                                                             (CL:CHAR-UPCASE CHAR)
+                                                             (CL:CHAR-DOWNCASE CHAR))))])
 
-(CL:DEFUN CL:NSTRING-DOWNCASE (STRING &KEY START END)
+(CL:DEFUN CL:NSTRING-DOWNCASE (STRING &KEY START END)
    "Given a string, returns that string with all uppercase alphabetic characters converted to lowercase."
-   (WITH-ONE-STRING-ONLY STRING START END (%%STRING-DOWNCASE STRING START END)))
+   (WITH-ONE-STRING-ONLY STRING START END (%%STRING-DOWNCASE STRING START END)))
 
-(CL:DEFUN CL:NSTRING-UPCASE (STRING &KEY START END)
+(CL:DEFUN CL:NSTRING-UPCASE (STRING &KEY START END)
    "Given a string, returns that string with all lower case alphabetic characters converted to uppercase."
-   (WITH-ONE-STRING-ONLY STRING START END (%%STRING-UPCASE STRING START END)))
+   (WITH-ONE-STRING-ONLY STRING START END (%%STRING-UPCASE STRING START END)))
 
 (CL:DEFUN STRING (X)
    "Coerces X into a string. If X is a string, X is returned. If X is a symbol, X's pname is returned. If X is a character then a one element string containing that character is returned. If X cannot be coerced into a string, an error occurs."
    (CL:TYPECASE X
        (STRING X)
        (CL:SYMBOL (CL:SYMBOL-NAME X))
-       (CL:CHARACTER (CL:MAKE-STRING 1 :INITIAL-ELEMENT X))
+       (CL:CHARACTER (CL:MAKE-STRING 1 :INITIAL-ELEMENT X))
        (CL:OTHERWISE (CL:ERROR "~S cannot be coerced into a string" X))))
 
-(CL:DEFUN CL:STRING-CAPITALIZE (STRING &KEY START END)
+(CL:DEFUN CL:STRING-CAPITALIZE (STRING &KEY START END)
    "Given a string, returns a new string that is a copy of it with the first letter of every word in uppercase and all other letters in lowercase. A word is defined to be a sequence of alphanumeric characters delimited by non-alphanumeric characters"
-   (WITH-ONE-STRING STRING START END (LET ((NEW-STRING (CL:MAKE-STRING SLEN)))
-                                          (CL:DOTIMES (INDEX START)
-                                              (CL:SETF (CL:SCHAR NEW-STRING INDEX)
-                                                     (CL:CHAR STRING INDEX)))
-                                          (CL:DO ((INDEX START (CL:1+ INDEX))
-                                                  (ALPHA-P NIL)
-                                                  (WAS-ALPHA-P NIL ALPHA-P)
-                                                  CHAR)
-                                                 ((EQ INDEX END))
-                                              (SETQ CHAR (CL:CHAR STRING INDEX))
-                                              (SETQ ALPHA-P (CL:ALPHANUMERICP CHAR))
-                                              (CL:SETF (CL:SCHAR NEW-STRING INDEX)
-                                                     (CL:IF (AND ALPHA-P (NOT WAS-ALPHA-P))
-                                                         (CL:CHAR-UPCASE CHAR)
-                                                         (CL:CHAR-DOWNCASE CHAR))))
-                                          (CL:DO ((INDEX END (CL:1+ INDEX)))
-                                                 ((EQ INDEX SLEN))
-                                              (CL:SETF (CL:SCHAR NEW-STRING INDEX)
-                                                     (CL:CHAR STRING INDEX)))
-                                          NEW-STRING)))
+   (WITH-ONE-STRING STRING START END (LET ((NEW-STRING (CL:MAKE-STRING SLEN)))
+                                              (CL:DOTIMES (INDEX START)
+                                                  (CL:SETF (CL:SCHAR NEW-STRING INDEX)
+                                                         (CL:CHAR STRING INDEX)))
+                                              (CL:DO ((INDEX START (CL:1+ INDEX))
+                                                      (ALPHA-P NIL)
+                                                      (WAS-ALPHA-P NIL ALPHA-P)
+                                                      CHAR)
+                                                     ((EQ INDEX END))
+                                                  (SETQ CHAR (CL:CHAR STRING INDEX))
+                                                  (SETQ ALPHA-P (CL:ALPHANUMERICP CHAR))
+                                                  (CL:SETF (CL:SCHAR NEW-STRING INDEX)
+                                                         (CL:IF (AND ALPHA-P (NOT WAS-ALPHA-P))
+                                                             (CL:CHAR-UPCASE CHAR)
+                                                             (CL:CHAR-DOWNCASE CHAR))))
+                                              (CL:DO ((INDEX END (CL:1+ INDEX)))
+                                                     ((EQ INDEX SLEN))
+                                                  (CL:SETF (CL:SCHAR NEW-STRING INDEX)
+                                                         (CL:CHAR STRING INDEX)))
+                                              NEW-STRING)))
 
-(CL:DEFUN CL:STRING-DOWNCASE (STRING &KEY START END)
+(CL:DEFUN CL:STRING-DOWNCASE (STRING &KEY START END)
    "Given a string, returns a new string that is a copy of it with all uppercase case alphabetic characters converted to lowercase."
-   (WITH-ONE-STRING STRING START END (%%STRING-DOWNCASE (COPY-VECTOR STRING (CL:MAKE-STRING SLEN))
-                                            START END)))
+   (WITH-ONE-STRING STRING START END (%%STRING-DOWNCASE (COPY-VECTOR STRING (CL:MAKE-STRING
+                                                                                     SLEN))
+                                                START END)))
 
 (CL:DEFUN STRING-EQUAL (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Compare two strings for case insensitive equality"
    (CL:IF (OR START1 END1 START2 END2)
-       [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+       [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
               (CL:IF (EQ SLEN1 SLEN2)
-                  (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                         (EQ END1 (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
-                                         START1 END1 START2 END2))))]
-       (CL::SIMPLE-STRING-EQUAL STRING1 STRING2)))
+                  (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                         (EQ END1 (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 
+                                         TYPENUMBER2 START1 END1 START2 END2))))]
+       (CL::SIMPLE-STRING-EQUAL STRING1 STRING2)))
 
 (CL:DEFUN CL:STRING-GREATERP (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Case insensitive version of STRING>"
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
                                       START1 END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
@@ -247,18 +248,18 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (CL:DEFUN CL:STRING-LEFT-TRIM (CHAR-BAG STRING)
    "Trim only on left"
-   (WITH-STRING STRING (LET [(LEFT-END (CL:DO ((INDEX 0 (CL:1+ INDEX)))
-                                              ((OR (EQ INDEX SLEN)
-                                                   (NOT (CL:FIND (CL:CHAR STRING INDEX)
-                                                               CHAR-BAG)))
-                                               INDEX))]
-                            (CL:SUBSEQ STRING LEFT-END SLEN))))
+   (WITH-STRING STRING (LET [(LEFT-END (CL:DO ((INDEX 0 (CL:1+ INDEX)))
+                                                  ((OR (EQ INDEX SLEN)
+                                                       (NOT (CL:FIND (CL:CHAR STRING INDEX)
+                                                                   CHAR-BAG)))
+                                                   INDEX))]
+                                (CL:SUBSEQ STRING LEFT-END SLEN))))
 
 (CL:DEFUN CL:STRING-LESSP (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Case insensitive version of STRING<"
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
                                       START1 END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
@@ -274,10 +275,10 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (CL:DEFUN CL:STRING-NOT-EQUAL (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Compare two string for case insensitive equality"
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1
-                                     END1 START2 END2)))
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+                                     START1 END1 START2 END2)))
                       (CL:IF (AND (EQ INDEX END1)
                                   (EQ SLEN1 SLEN2))
                           NIL
@@ -285,9 +286,9 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (CL:DEFUN CL:STRING-NOT-GREATERP (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Case insensitive version of STRING<="
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
                                       START1 END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
@@ -302,9 +303,9 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (CL:DEFUN CL:STRING-NOT-LESSP (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Case insensitive version of STRING>="
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE-EQUAL BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
                                       START1 END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
@@ -318,42 +319,43 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (CL:DEFUN CL:STRING-RIGHT-TRIM (CHAR-BAG STRING)
    "Trim only on right"
-   (WITH-STRING STRING (LET [(RIGHT-END (CL:DO ((INDEX (CL:1- SLEN)
-                                                       (CL:1- INDEX)))
-                                               ((OR (< INDEX 0)
-                                                    (NOT (CL:FIND (CL:CHAR STRING INDEX)
-                                                                CHAR-BAG)))
-                                                (CL:1+ INDEX)))]
-                            (CL:SUBSEQ STRING 0 RIGHT-END))))
+   (WITH-STRING STRING (LET [(RIGHT-END (CL:DO ((INDEX (CL:1- SLEN)
+                                                           (CL:1- INDEX)))
+                                                   ((OR (< INDEX 0)
+                                                        (NOT (CL:FIND (CL:CHAR STRING INDEX)
+                                                                    CHAR-BAG)))
+                                                    (CL:1+ INDEX)))]
+                                (CL:SUBSEQ STRING 0 RIGHT-END))))
 
 (CL:DEFUN CL:STRING-TRIM (CHAR-BAG STRING)
 
-   (* ;; "Given a set of characters (a list or string) and a string, returns a copy of the string with the characters in the set removed from both ends.")
+   (* ;; "Given a set of characters (a list or string) and a string, returns a copy of the string with the characters in the set removed from both ends.")
 
-   (WITH-STRING STRING (LET* [(LEFT-END (CL:DO ((INDEX 0 (CL:1+ INDEX)))
-                                               ((OR (EQ INDEX SLEN)
-                                                    (NOT (CL:FIND (CL:CHAR STRING INDEX)
-                                                                CHAR-BAG)))
-                                                INDEX)))
-                              (RIGHT-END (CL:DO ((INDEX (CL:1- SLEN)
-                                                        (CL:1- INDEX)))
-                                                ((OR (< INDEX LEFT-END)
-                                                     (NOT (CL:FIND (CL:CHAR STRING INDEX)
-                                                                 CHAR-BAG)))
-                                                 (CL:1+ INDEX)))]
-                             (CL:SUBSEQ STRING LEFT-END RIGHT-END))))
+   (WITH-STRING STRING (LET* [(LEFT-END (CL:DO ((INDEX 0 (CL:1+ INDEX)))
+                                                   ((OR (EQ INDEX SLEN)
+                                                        (NOT (CL:FIND (CL:CHAR STRING INDEX)
+                                                                    CHAR-BAG)))
+                                                    INDEX)))
+                                  (RIGHT-END (CL:DO ((INDEX (CL:1- SLEN)
+                                                            (CL:1- INDEX)))
+                                                    ((OR (< INDEX LEFT-END)
+                                                         (NOT (CL:FIND (CL:CHAR STRING INDEX)
+                                                                     CHAR-BAG)))
+                                                     (CL:1+ INDEX)))]
+                                 (CL:SUBSEQ STRING LEFT-END RIGHT-END))))
 
-(CL:DEFUN CL:STRING-UPCASE (STRING &KEY START END)
+(CL:DEFUN CL:STRING-UPCASE (STRING &KEY START END)
    "Given a string, returns a new string that is a copy of it with all lower case alphabetic characters converted to uppercase."
-   (WITH-ONE-STRING STRING START END (%%STRING-UPCASE (COPY-VECTOR STRING (CL:MAKE-STRING SLEN))
-                                            START END)))
+   (WITH-ONE-STRING STRING START END (%%STRING-UPCASE (COPY-VECTOR STRING (CL:MAKE-STRING
+                                                                                   SLEN))
+                                                START END)))
 
 (CL:DEFUN CL:STRING/= (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Compare two strings for case sensitive inequality"
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1
-                                     START2 END2)))
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 
+                                     END1 START2 END2)))
                       (CL:IF (AND (EQ INDEX END1)
                                   (EQ SLEN1 SLEN2))
                           NIL
@@ -361,10 +363,10 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (CL:DEFUN CL:STRING< (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "A string A is less than a string B if in the first position in which they differ the character of A is less than the corresponding character of B according to char< or if string A is a proper prefix of string B (of shorter length and matching in all the characters of A). Returns either NIL or an index into STRING1"
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1
-                                      START2 END2))
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1
+                                      END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
                           ((EQ INDEX END1)
@@ -378,10 +380,10 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
                            (- INDEX OFFSET1])
 
 (CL:DEFUN CL:STRING<= (STRING1 STRING2 &KEY START1 END1 START2 END2)
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1
-                                      START2 END2))
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1
+                                      END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
                           ((EQ INDEX END1)
@@ -396,18 +398,18 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 (CL:DEFUN CL:STRING= (STRING1 STRING2 &KEY START1 END1 START2 END2)
    "Compare two strings for case sensitive equality"
    (CL:IF (OR START1 END1 START2 END2)
-       [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+       [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
               (CL:IF (EQ SLEN1 SLEN2)
-                  (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                         (EQ END1 (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 
-                                         END1 START2 END2))))]
-       (CL::SIMPLE-STRING= STRING1 STRING2)))
+                  (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                         (EQ END1 (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 
+                                         START1 END1 START2 END2))))]
+       (CL::SIMPLE-STRING= STRING1 STRING2)))
 
 (CL:DEFUN CL:STRING> (STRING1 STRING2 &KEY START1 END1 START2 END2)
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1
-                                      START2 END2))
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1
+                                      END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
                           ((EQ REL-INDEX SLEN2)
@@ -420,10 +422,10 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
                            (- INDEX OFFSET1])
 
 (CL:DEFUN CL:STRING>= (STRING1 STRING2 &KEY START1 END1 START2 END2)
-   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
-          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
-                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1 END1
-                                      START2 END2))
+   [%%PARSE-STRING-ARGS STRING1 STRING2 START1 END1 START2 END2
+          (WITH-TWO-UNPACKED-STRINGS STRING1 STRING2 START1 END1 START2 END2
+                 (LET* ((INDEX (%%STRING-BASE-COMPARE BASE1 TYPENUMBER1 BASE2 TYPENUMBER2 START1
+                                      END1 START2 END2))
                         (REL-INDEX (- INDEX START1)))
                        (COND
                           ((EQ REL-INDEX SLEN2)
@@ -437,12 +439,12 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 (DEFOPTIMIZER CL:STRING= (STRING1 STRING2 &REST OPTIONS)
                              (CL:IF OPTIONS
                                  'COMPILER:PASS
-                                 `(CL::SIMPLE-STRING= ,STRING1 ,STRING2)))
+                                 `(CL::SIMPLE-STRING= ,STRING1 ,STRING2)))
 
 (DEFOPTIMIZER STRING-EQUAL (STRING1 STRING2 &REST OPTIONS)
                                (CL:IF OPTIONS
                                    'COMPILER:PASS
-                                   `(CL::SIMPLE-STRING-EQUAL ,STRING1 ,STRING2)))
+                                   `(CL::SIMPLE-STRING-EQUAL ,STRING1 ,STRING2)))
 
 
 
@@ -450,38 +452,38 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (DECLARE%: DONTCOPY DOEVAL@COMPILE 
 
-(DEFMACRO WITH-ONE-STRING (STRING START END &REST FORMS)
+(DEFMACRO WITH-ONE-STRING (STRING START END &REST FORMS)
    "WITH-ONE-STRING is used to set up string operations. The keywords are parsed, and STRING is coerced into a string. SLEN is bound to the string length"
-   `(LET [(SLEN (VECTOR-LENGTH (SETQ ,STRING (STRING ,STRING]
-         (%%CHECK-BOUNDS ,START ,END SLEN)
+   `(LET [(SLEN (VECTOR-LENGTH (SETQ ,STRING (STRING ,STRING]
+         (%%CHECK-BOUNDS ,START ,END SLEN)
          ,@FORMS))
 
-(DEFMACRO WITH-ONE-STRING-ONLY (STRING START END &REST FORMS)
+(DEFMACRO WITH-ONE-STRING-ONLY (STRING START END &REST FORMS)
 
-   (* ;; "Like WITH-ONE-STRING but only strings allowed")
+   (* ;; "Like WITH-ONE-STRING but only strings allowed")
 
    `(PROGN (CL:IF (NOT (CL:STRINGP ,STRING))
                (CL:ERROR 'CONDITIONS:SIMPLE-TYPE-ERROR :EXPECTED-TYPE 'STRING :CULPRIT ,STRING))
            (LET [(SLEN (VECTOR-LENGTH ,STRING]
-                (%%CHECK-BOUNDS ,START ,END SLEN)
+                (%%CHECK-BOUNDS ,START ,END SLEN)
                 ,@FORMS)))
 
-(DEFMACRO WITH-STRING (STRING &REST FORMS)
+(DEFMACRO WITH-STRING (STRING &REST FORMS)
 
-   (* ;; "WITH-STRING is like WITH-ONE-STRING, but doesn't process keywords")
+   (* ;; "WITH-STRING is like WITH-ONE-STRING, but doesn't process keywords")
 
-   `(LET [(SLEN (VECTOR-LENGTH (SETQ ,STRING (STRING ,STRING]
+   `(LET [(SLEN (VECTOR-LENGTH (SETQ ,STRING (STRING ,STRING]
          ,@FORMS))
 
 (DEFMACRO WITH-TWO-UNPACKED-STRINGS (STRING1 STRING2 START1 END1 START2 END2 &REST FORMS)
 
-   (* ;; "Used to set up string comparison operations. String1 and string2 are unpacked and start1, end1, start2, end2 are adjusted for non-zero offsets. Base1 and base2, typenumber1, typenumber2 , offset1 and offset2 are bound to the appropriate unpacked quantities")
+   (* ;; "Used to set up string comparison operations. String1 and string2 are unpacked and start1, end1, start2, end2 are adjusted for non-zero offsets. Base1 and base2, typenumber1, typenumber2 , offset1 and offset2 are bound to the appropriate unpacked quantities")
 
    `(LET (BASE1 BASE2 OFFSET1 OFFSET2 TYPENUMBER1 TYPENUMBER2)
-         (%%UNPACK-STRING ,STRING1 BASE1 OFFSET1 TYPENUMBER1)
-         (%%UNPACK-STRING ,STRING2 BASE2 OFFSET2 TYPENUMBER2)
-         (%%ADJUST-FOR-OFFSET ,START1 ,END1 OFFSET1)
-         (%%ADJUST-FOR-OFFSET ,START2 ,END2 OFFSET2)
+         (%%UNPACK-STRING ,STRING1 BASE1 OFFSET1 TYPENUMBER1)
+         (%%UNPACK-STRING ,STRING2 BASE2 OFFSET2 TYPENUMBER2)
+         (%%ADJUST-FOR-OFFSET ,START1 ,END1 OFFSET1)
+         (%%ADJUST-FOR-OFFSET ,START2 ,END2 OFFSET2)
          ,@FORMS))
 
 (DEFMACRO %%UNPACK-STRING (OBJECT BASE OFFSET TYPENUMBER &OPTIONAL LENGTH)
@@ -524,24 +526,24 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 
 (DEFMACRO %%PARSE-STRING-ARGS (STRING1 STRING2 START1 END1 START2 END2 &REST FORMS)
 
-   (* ;; "Used to set up string comparison operations. The keywords are defaulted, bounds are checked and  Slen1 and Slen1 are bound to substring lengths%"")
+   (* ;; "Used to set up string comparison operations. The keywords are defaulted, bounds are checked and  Slen1 and Slen1 are bound to substring lengths%"")
 
-   `(LET [(SLEN1 (%%STRING-LENGTH ,STRING1))
-          (SLEN2 (%%STRING-LENGTH ,STRING2]
-         (%%CHECK-BOUNDS ,START1 ,END1 SLEN1)
-         (%%CHECK-BOUNDS ,START2 ,END2 SLEN2)
+   `(LET [(SLEN1 (%%STRING-LENGTH ,STRING1))
+          (SLEN2 (%%STRING-LENGTH ,STRING2]
+         (%%CHECK-BOUNDS ,START1 ,END1 SLEN1)
+         (%%CHECK-BOUNDS ,START2 ,END2 SLEN2)
          (SETQ SLEN1 (- ,END1 ,START1))
          (SETQ SLEN2 (- ,END2 ,START2))
          ,@FORMS))
 
-(DEFMACRO %%STRING-LENGTH (STRING)
+(DEFMACRO %%STRING-LENGTH (STRING)
    `(COND
        ((%%STRINGP ,STRING)
         (fetch (ARRAY-HEADER FILL-POINTER) of ,STRING))
        ((CL:SYMBOLP ,STRING)
         (fetch (LITATOM PNAMELENGTH) of ,STRING))
        [(CL:CHARACTERP ,STRING)
-        (VECTOR-LENGTH (SETQ ,STRING (STRING ,STRING]
+        (VECTOR-LENGTH (SETQ ,STRING (STRING ,STRING]
        (T (CL:ERROR 'XCL:TYPE-MISMATCH :EXPECTED-TYPE '(OR STRING CL:SYMBOL CL:CHARACTER)
                  :NAME
                  ,STRING :VALUE ,STRING :MESSAGE "a string, symbol or character"))))
@@ -559,7 +561,20 @@ Copyright (c) 1985, 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights r
 (LOCALVARS . T)
 )
 )
-(PUTPROPS CMLSTRING COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990))
+(PUTPROPS CMLSTRING COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL)))
+  (FILEMAP (NIL (1837 2573 (CL::SIMPLE-STRING= 1837 . 2573)) (2575 3323 (CL::SIMPLE-STRING-EQUAL 2575 . 
+3323)) (3325 4321 (%%STRING-BASE-COMPARE 3325 . 4321)) (4323 5506 (%%STRING-BASE-COMPARE-EQUAL 4323 . 
+5506)) (5508 6096 (%%STRING-UPCASE 5508 . 6096)) (6098 6692 (%%STRING-DOWNCASE 6098 . 6692)) (6730 
+7047 (CL:MAKE-STRING 6730 . 7047)) (7049 8278 (CL:NSTRING-CAPITALIZE 7049 . 8278)) (8280 8536 (
+CL:NSTRING-DOWNCASE 8280 . 8536)) (8538 8791 (CL:NSTRING-UPCASE 8538 . 8791)) (8793 9273 (STRING 8793
+ . 9273)) (9275 11185 (CL:STRING-CAPITALIZE 9275 . 11185)) (11187 11637 (CL:STRING-DOWNCASE 11187 . 
+11637)) (11639 12234 (STRING-EQUAL 11639 . 12234)) (12236 13199 (CL:STRING-GREATERP 12236 . 13199)) (
+13201 13721 (CL:STRING-LEFT-TRIM 13201 . 13721)) (13723 14718 (CL:STRING-LESSP 13723 . 14718)) (14720 
+15346 (CL:STRING-NOT-EQUAL 14720 . 15346)) (15348 16300 (CL:STRING-NOT-GREATERP 15348 . 16300)) (16302
+ 17210 (CL:STRING-NOT-LESSP 16302 . 17210)) (17212 17811 (CL:STRING-RIGHT-TRIM 17212 . 17811)) (17813 
+18947 (CL:STRING-TRIM 17813 . 18947)) (18949 19389 (CL:STRING-UPCASE 18949 . 19389)) (19391 20004 (
+CL:STRING/= 19391 . 20004)) (20006 21264 (CL:STRING< 20006 . 21264)) (21266 22147 (CL:STRING<= 21266
+ . 22147)) (22149 22729 (CL:STRING= 22149 . 22729)) (22731 23630 (CL:STRING> 22731 . 23630)) (23632 
+24475 (CL:STRING>= 23632 . 24475)))))
 STOP
diff --git a/sources/CMLSTRING.LCOM b/sources/CMLSTRING.LCOM
index fee8e878..d09ccc18 100644
Binary files a/sources/CMLSTRING.LCOM and b/sources/CMLSTRING.LCOM differ
diff --git a/sources/FILEPKG b/sources/FILEPKG
index e8de8c96..a04d19f5 100644
--- a/sources/FILEPKG
+++ b/sources/FILEPKG
@@ -1,12 +1,11 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED " 3-Jul-2021 11:08:42" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;5 284528 
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "23-Aug-2021 16:42:18" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;6 284495 
 
-      changes to%:  (FNS MAKEFILE)
-                    (VARS FILEPKGCOMS)
+      changes to%:  (FNS GATHEREXPORTS)
 
-      previous date%: "29-Jun-2021 17:25:04" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;4)
+      previous date%: " 3-Jul-2021 11:08:42" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEPKG.;5)
 
 
 (* ; "
@@ -3115,14 +3114,14 @@ compiling " T)
 
 
 (ADDTOVAR USERMACROS
-          (M NIL (MAKE FILE FILE))
           (M (X . Y)
              (E (MARKASCHANGED (COND ((LISTP 'X)
                                       (CAR 'X))
                                      (T 'X))
                        'USERMACROS)
                 T)
-             (ORIGINAL (M X . Y))))
+             (ORIGINAL (M X . Y)))
+          (M NIL (MAKE FILE FILE)))
 
 (ADDTOVAR EDITMACROS
           (M (X . Y)
@@ -4872,16 +4871,16 @@ compiling " T)
         (for FILE in FILES do (IMPORTFILE (CADR FILE])
 
 (GATHEREXPORTS
-  [LAMBDA (FROMFILES TOFILE FLG)                         (* bvm%: "14-Oct-86 23:12")
-                                                             (* ; 
-                                        "Copies all exported definitions from FROMFILES to TOFILE.")
+  [LAMBDA (FROMFILES TOFILE FLG)                        (* ; "Edited 23-Aug-2021 16:40 by rmk:")
+                                                             (* ; 
+                                        "Copies all exported definitions from FROMFILES to TOFILE.")
     (RESETLST
         [RESETSAVE NIL (LIST (FUNCTION CLOSE-AND-MAYBE-DELETE)
                              (SETQ TOFILE (OPENSTREAM TOFILE 'OUTPUT]
         (RESETSAVE (OUTPUT TOFILE))
         (LET ((ENV *DEFAULT-MAKEFILE-ENVIRONMENT*))
              (SETQ ENV (if ENV
-                           then (\DO-DEFINE-FILE-INFO NIL ENV)
+                           then (\DO-DEFINE-FILE-INFO TOFILE ENV)
                          else *OLD-INTERLISP-READ-ENVIRONMENT*))
              (WITH-READER-ENVIRONMENT ENV
                  (PRINT-READER-ENVIRONMENT ENV)
@@ -5037,46 +5036,46 @@ compiling " T)
 (PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1987 1988 1989 
 1990 1991 1992 1993 1995 2018 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (20669 22374 (SEARCHPRETTYTYPELST 20679 . 21658) (PRETTYDEFMACROS 21660 . 22118) (
-FILEPKGCOMPROPS 22120 . 22372)) (23176 57665 (CLEANUP 23186 . 24574) (COMPILEFILES 24576 . 24852) (
-COMPILEFILES0 24854 . 25574) (CONTINUEDIT 25576 . 26996) (MAKEFILE 26998 . 39006) (FILECHANGES 39008
- . 41343) (FILEPKG.MERGECHANGES 41345 . 42168) (FILEPKG.CHANGEDFNS 42170 . 42482) (MAKEFILE1 42484 . 
-46711) (COMPILE-FILE? 46713 . 48270) (MAKEFILES 48272 . 49965) (ADDFILE 49967 . 52488) (ADDFILE0 52490
- . 56626) (LISTFILES 56628 . 57663)) (58361 93601 (FILEPKGCHANGES 58371 . 59721) (GETFILEPKGTYPE 59723
- . 62796) (MARKASCHANGED 62798 . 64435) (FILECOMS 64437 . 64821) (WHEREIS 64823 . 66243) (
-SMASHFILECOMS 66245 . 66480) (FILEFNSLST 66482 . 66644) (FILECOMSLST 66646 . 67130) (UPDATEFILES 67132
- . 72432) (INFILECOMS? 72434 . 74337) (INFILECOMTAIL 74339 . 75479) (INFILECOMS 75481 . 75642) (
-INFILECOM 75644 . 85853) (INFILECOMSVALS 85855 . 86182) (INFILECOMSVAL 86184 . 87186) (INFILECOMSPROP 
-87188 . 88017) (IFCPROPS 88019 . 89280) (IFCEXPRTYPE 89282 . 89793) (IFCPROPSCAN 89795 . 90848) (
-IFCDECLARE 90850 . 92161) (INFILEPAIRS 92163 . 92495) (INFILECOMSMACRO 92497 . 93599)) (93636 125056 (
-FILES? 93646 . 95839) (FILES?1 95841 . 96539) (FILES?PRINTLST 96541 . 97323) (ADDTOFILES? 97325 . 
-108371) (ADDTOFILE 108373 . 109289) (WHATIS 109291 . 111267) (ADDTOCOMS 111269 . 112913) (ADDTOCOM 
-112915 . 119462) (ADDTOCOM1 119464 . 120635) (ADDNEWCOM 120637 . 121687) (MAKENEWCOM 121689 . 123532) 
-(DEFAULTMAKENEWCOM 123534 . 125054)) (125126 127943 (MERGEINSERT 125136 . 127479) (MERGEINSERT1 127481
- . 127941)) (128097 129454 (ADDTOFILEKEYLST 128107 . 129452)) (129571 140483 (DELFROMFILES 129581 . 
-130431) (DELFROMCOMS 130433 . 132112) (DELFROMCOM 132114 . 137982) (DELFROMCOM1 137984 . 138781) (
-REMOVEITEM 138783 . 139657) (MOVETOFILE 139659 . 140481)) (140697 143066 (SAVEPUT 140707 . 143064)) (
-143191 151515 (UNMARKASCHANGED 143201 . 144909) (PREEDITFN 144911 . 147422) (POSTEDITPROPS 147424 . 
-149925) (POSTEDITALISTS 149927 . 151513)) (151664 172218 (ALISTS.GETDEF 151674 . 152053) (
-ALISTS.WHENCHANGED 152055 . 152699) (CLEARCLISPARRAY 152701 . 153875) (EXPRESSIONS.WHENCHANGED 153877
- . 154251) (MAKEALISTCOMS 154253 . 155326) (MAKEFILESCOMS 155328 . 156765) (MAKELISPXMACROSCOMS 156767
- . 158785) (MAKEPROPSCOMS 158787 . 159485) (MAKEUSERMACROSCOMS 159487 . 161287) (PROPS.WHENCHANGED 
-161289 . 161910) (FILEGETDEF.LISPXMACROS 161912 . 163354) (FILEGETDEF.ALISTS 163356 . 163975) (
-FILEGETDEF.RECORDS 163977 . 164908) (FILEGETDEF.PROPS 164910 . 165702) (FILEGETDEF.MACROS 165704 . 
-166764) (FILEGETDEF.VARS 166766 . 167182) (FILEGETDEF.FNS 167184 . 168548) (FILEPKGCOMS.PUTDEF 168550
- . 170990) (FILES.PUTDEF 170992 . 171949) (VARS.PUTDEF 171951 . 172094) (FILES.WHENCHANGED 172096 . 
-172216)) (174240 181673 (RENAME 174250 . 175651) (CHANGECALLERS 175653 . 181671)) (181674 229622 (
-SHOWDEF 181684 . 182477) (COPYDEF 182479 . 184953) (GETDEF 184955 . 187231) (GETDEFCOM 187233 . 188199
-) (GETDEFCOM0 188201 . 189547) (GETDEFCURRENT 189549 . 195969) (GETDEFERR 195971 . 197272) (
-GETDEFFROMFILE 197274 . 201554) (GETDEFSAVED 201556 . 202660) (PUTDEF 202662 . 203365) (EDITDEF 203367
- . 204344) (DEFAULT.EDITDEF 204346 . 207182) (EDITDEF.FILES 207184 . 207385) (LOADDEF 207387 . 207563)
- (DWIMDEF 207565 . 208419) (DELDEF 208421 . 211435) (DELFROMLIST 211437 . 211941) (HASDEF 211943 . 
-218265) (GETFILEDEF 218267 . 218789) (SAVEDEF 218791 . 220450) (UNSAVEDEF 220452 . 221348) (
-COMPAREDEFS 221350 . 224652) (COMPARE 224654 . 225358) (TYPESOF 225360 . 229620)) (229689 234732 (
-FIXEDITDATE 229699 . 233202) (EDITDATE? 233204 . 234730)) (235151 243922 (FILEPKGCOM 235161 . 240094) 
-(FILEPKGTYPE 240096 . 243920)) (255959 270891 (FINDCALLERS 255969 . 256484) (EDITCALLERS 256486 . 
-264396) (EDITFROMFILE 264398 . 270206) (FINDATS 270208 . 270480) (LOOKIN 270482 . 270889)) (270892 
-272619 (SEPRCASE 270902 . 272617)) (273136 278678 (IMPORTFILE 273146 . 274120) (IMPORTEVAL 274122 . 
-275002) (IMPORTFILESCAN 275004 . 275425) (CHECKIMPORTS 275427 . 276763) (GATHEREXPORTS 276765 . 278088
-) (\DUMPEXPORTS 278090 . 278676)) (279016 281224 (CLEARFILEPKG 279026 . 281222)))))
+  (FILEMAP (NIL (20621 22326 (SEARCHPRETTYTYPELST 20631 . 21610) (PRETTYDEFMACROS 21612 . 22070) (
+FILEPKGCOMPROPS 22072 . 22324)) (23128 57617 (CLEANUP 23138 . 24526) (COMPILEFILES 24528 . 24804) (
+COMPILEFILES0 24806 . 25526) (CONTINUEDIT 25528 . 26948) (MAKEFILE 26950 . 38958) (FILECHANGES 38960
+ . 41295) (FILEPKG.MERGECHANGES 41297 . 42120) (FILEPKG.CHANGEDFNS 42122 . 42434) (MAKEFILE1 42436 . 
+46663) (COMPILE-FILE? 46665 . 48222) (MAKEFILES 48224 . 49917) (ADDFILE 49919 . 52440) (ADDFILE0 52442
+ . 56578) (LISTFILES 56580 . 57615)) (58313 93553 (FILEPKGCHANGES 58323 . 59673) (GETFILEPKGTYPE 59675
+ . 62748) (MARKASCHANGED 62750 . 64387) (FILECOMS 64389 . 64773) (WHEREIS 64775 . 66195) (
+SMASHFILECOMS 66197 . 66432) (FILEFNSLST 66434 . 66596) (FILECOMSLST 66598 . 67082) (UPDATEFILES 67084
+ . 72384) (INFILECOMS? 72386 . 74289) (INFILECOMTAIL 74291 . 75431) (INFILECOMS 75433 . 75594) (
+INFILECOM 75596 . 85805) (INFILECOMSVALS 85807 . 86134) (INFILECOMSVAL 86136 . 87138) (INFILECOMSPROP 
+87140 . 87969) (IFCPROPS 87971 . 89232) (IFCEXPRTYPE 89234 . 89745) (IFCPROPSCAN 89747 . 90800) (
+IFCDECLARE 90802 . 92113) (INFILEPAIRS 92115 . 92447) (INFILECOMSMACRO 92449 . 93551)) (93588 125008 (
+FILES? 93598 . 95791) (FILES?1 95793 . 96491) (FILES?PRINTLST 96493 . 97275) (ADDTOFILES? 97277 . 
+108323) (ADDTOFILE 108325 . 109241) (WHATIS 109243 . 111219) (ADDTOCOMS 111221 . 112865) (ADDTOCOM 
+112867 . 119414) (ADDTOCOM1 119416 . 120587) (ADDNEWCOM 120589 . 121639) (MAKENEWCOM 121641 . 123484) 
+(DEFAULTMAKENEWCOM 123486 . 125006)) (125078 127895 (MERGEINSERT 125088 . 127431) (MERGEINSERT1 127433
+ . 127893)) (128049 129406 (ADDTOFILEKEYLST 128059 . 129404)) (129523 140435 (DELFROMFILES 129533 . 
+130383) (DELFROMCOMS 130385 . 132064) (DELFROMCOM 132066 . 137934) (DELFROMCOM1 137936 . 138733) (
+REMOVEITEM 138735 . 139609) (MOVETOFILE 139611 . 140433)) (140649 143018 (SAVEPUT 140659 . 143016)) (
+143143 151467 (UNMARKASCHANGED 143153 . 144861) (PREEDITFN 144863 . 147374) (POSTEDITPROPS 147376 . 
+149877) (POSTEDITALISTS 149879 . 151465)) (151616 172170 (ALISTS.GETDEF 151626 . 152005) (
+ALISTS.WHENCHANGED 152007 . 152651) (CLEARCLISPARRAY 152653 . 153827) (EXPRESSIONS.WHENCHANGED 153829
+ . 154203) (MAKEALISTCOMS 154205 . 155278) (MAKEFILESCOMS 155280 . 156717) (MAKELISPXMACROSCOMS 156719
+ . 158737) (MAKEPROPSCOMS 158739 . 159437) (MAKEUSERMACROSCOMS 159439 . 161239) (PROPS.WHENCHANGED 
+161241 . 161862) (FILEGETDEF.LISPXMACROS 161864 . 163306) (FILEGETDEF.ALISTS 163308 . 163927) (
+FILEGETDEF.RECORDS 163929 . 164860) (FILEGETDEF.PROPS 164862 . 165654) (FILEGETDEF.MACROS 165656 . 
+166716) (FILEGETDEF.VARS 166718 . 167134) (FILEGETDEF.FNS 167136 . 168500) (FILEPKGCOMS.PUTDEF 168502
+ . 170942) (FILES.PUTDEF 170944 . 171901) (VARS.PUTDEF 171903 . 172046) (FILES.WHENCHANGED 172048 . 
+172168)) (174192 181625 (RENAME 174202 . 175603) (CHANGECALLERS 175605 . 181623)) (181626 229574 (
+SHOWDEF 181636 . 182429) (COPYDEF 182431 . 184905) (GETDEF 184907 . 187183) (GETDEFCOM 187185 . 188151
+) (GETDEFCOM0 188153 . 189499) (GETDEFCURRENT 189501 . 195921) (GETDEFERR 195923 . 197224) (
+GETDEFFROMFILE 197226 . 201506) (GETDEFSAVED 201508 . 202612) (PUTDEF 202614 . 203317) (EDITDEF 203319
+ . 204296) (DEFAULT.EDITDEF 204298 . 207134) (EDITDEF.FILES 207136 . 207337) (LOADDEF 207339 . 207515)
+ (DWIMDEF 207517 . 208371) (DELDEF 208373 . 211387) (DELFROMLIST 211389 . 211893) (HASDEF 211895 . 
+218217) (GETFILEDEF 218219 . 218741) (SAVEDEF 218743 . 220402) (UNSAVEDEF 220404 . 221300) (
+COMPAREDEFS 221302 . 224604) (COMPARE 224606 . 225310) (TYPESOF 225312 . 229572)) (229641 234684 (
+FIXEDITDATE 229651 . 233154) (EDITDATE? 233156 . 234682)) (235103 243874 (FILEPKGCOM 235113 . 240046) 
+(FILEPKGTYPE 240048 . 243872)) (255911 270843 (FINDCALLERS 255921 . 256436) (EDITCALLERS 256438 . 
+264348) (EDITFROMFILE 264350 . 270158) (FINDATS 270160 . 270432) (LOOKIN 270434 . 270841)) (270844 
+272571 (SEPRCASE 270854 . 272569)) (273088 278645 (IMPORTFILE 273098 . 274072) (IMPORTEVAL 274074 . 
+274954) (IMPORTFILESCAN 274956 . 275377) (CHECKIMPORTS 275379 . 276715) (GATHEREXPORTS 276717 . 278055
+) (\DUMPEXPORTS 278057 . 278643)) (278983 281191 (CLEARFILEPKG 278993 . 281189)))))
 STOP
diff --git a/sources/FILEPKG.LCOM b/sources/FILEPKG.LCOM
index 615b4aae..9dac1105 100644
Binary files a/sources/FILEPKG.LCOM and b/sources/FILEPKG.LCOM differ
diff --git a/sources/LLREAD b/sources/LLREAD
index cdaf7be8..cffe27de 100644
--- a/sources/LLREAD
+++ b/sources/LLREAD
@@ -1,11 +1,11 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED "14-Aug-2021 00:27:49" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;85 102555 
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "21-Aug-2021 13:00:01" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;98 103410 
 
-      changes to%:  (FNS \BACKCCODE \BACKCCODE.EOLC)
+      changes to%:  (FNS CHARCODE.DECODE)
 
-      previous date%: "13-Aug-2021 14:19:45" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;84)
+      previous date%: "20-Aug-2021 00:02:20" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;96)
 
 
 (* ; "
@@ -274,8 +274,7 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
 (CL:PARSE-INTEGER
   [CL:LAMBDA
    (STRING &KEY START END (RADIX 10)
-          JUNK-ALLOWED)                                      (* ; 
-                                                           "Edited  8-Feb-91 13:24 by gadener")
+          JUNK-ALLOWED)                                 (* ; "Edited 20-Aug-2021 00:02 by rmk:")
    (CL:IF (NOT (CL:STRINGP STRING))
        (ERROR "This is not a string : ~S" STRING)
        (PROG ((SA (fetch (READTABLEP READSA) of CMLRDTBL))
@@ -303,28 +302,28 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                                         RADIX -11)))
              (while (AND (< INDEX STOP)
                              (EQ (\SYNCODE SA (\GETBASECHAR FATP BASE INDEX))
-                                 SEPRCHAR.RC)) do        (* ; "Skip over separators")
+                                 SEPRCHAR.RC)) do        (* ; "Skip over separators")
                                                      (SETQ INDEX (CL:1+ INDEX)))
              [COND
-                ((>= INDEX STOP)                             (* ; "no characters remain")
+                ((>= INDEX STOP)                             (* ; "no characters remain")
                  (RETURN (COND
-                            (JUNK-ALLOWED                    (* ; "don't error")
+                            (JUNK-ALLOWED                    (* ; "don't error")
                                    (CL:VALUES NIL STOP))
                             (T (SETQ ERR "No non-whitespace characters in integer string: ~S")
                                (GO FAIL]
 
-        (* ;; "Start parsing a number.  Allowed to start with a single sign, then digits in radix, nothing else.  Assume collating sequence is (+, -) < digits < uppercase letters < lowercase letters.")
+        (* ;; "Start parsing a number.  Allowed to start with a single sign, then digits in radix, nothing else.  Assume collating sequence is (+, -) < digits < uppercase letters < lowercase letters.")
 
              (do (SETQ CHAR (\GETBASECHAR FATP BASE INDEX))
                     (if (<= CHAR MAXDIGITCODE)
-                        then                             (* ; "sign or digit")
+                        then                             (* ; "sign or digit")
                               (if (>= CHAR (CHARCODE 0))
-                                  then                   (* ; " digit")
+                                  then                   (* ; " digit")
                                         (OR STARTINT (SETQ STARTINT INDEX))
                                 elseif (AND (NOT SIGN)
                                                 (NOT STARTINT))
-                                  then                   (* ; 
-                                                           "maybe sign.  No good if not at start")
+                                  then                   (* ; 
+                                                           "maybe sign.  No good if not at start")
                                         (SELCHARQ CHAR
                                              (- (SETQ SIGN '-))
                                              (+ (SETQ SIGN '+))
@@ -332,12 +331,12 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                                 else (RETURN))
                       elseif (AND MAXALPHACODE (<= (if (>= CHAR (CHARCODE "a"))
                                                            then 
-                                                             (* ; "uppercase it first")
+                                                             (* ; "uppercase it first")
                                                                  (- CHAR (- (CHARCODE "a")
                                                                             (CHARCODE "A")))
                                                          else CHAR)
                                                        MAXALPHACODE))
-                        then                             (* ; "is alphabetic digit")
+                        then                             (* ; "is alphabetic digit")
                               (OR STARTINT (SETQ STARTINT INDEX))
                       else (RETURN)) repeatwhile (< (add INDEX 1)
                                                             STOP))
@@ -348,12 +347,12 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                                              (do (if (NEQ (\SYNCODE SA CHAR)
                                                                   SEPRCHAR.RC)
                                                          then 
-                                                             (* ; " junk found")
+                                                             (* ; " junk found")
                                                                (RETURN NIL)
                                                        elseif (EQ (add INDEX 1)
                                                                       STOP)
                                                          then 
-                                                             (* ; "at end of string, win")
+                                                             (* ; "at end of string, win")
                                                                (RETURN T)
                                                        else (SETQ CHAR (\GETBASECHAR FATP BASE 
                                                                                   INDEX]
@@ -1397,14 +1396,17 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                                                          (READ-EXTENDED-TOKEN STREAM])
 
 (CHARCODE.DECODE
-  [LAMBDA (C NOERROR)                                        (* ; 
-                                                           "Edited  1-Aug-2020 18:52 by rmk:")
-                                                             (* ; "Edited 18-Feb-87 22:03 by bvm:")
+  [LAMBDA (C NOERROR)                                   (* ; "Edited 21-Aug-2021 12:59 by rmk:")
+                                                             (* ; "Edited 18-Feb-87 22:03 by bvm:")
     (DECLARE (GLOBALVARS CHARACTERNAMES CHARACTERSETNAMES))
 
-    (* ;; "RMK 2020:  Added hexstring decoding for  Unicode:  no commas or other delimiters")
+    (* ;; "RMK 2020:  Added hexstring decoding for  Unicode:  no commas or other delimiters")
 
-    (* ;; "This overrides the definition in LLREAD.  It should be placed there, but for some reason it is not possible to then recompile that file:  loading a new .LCOM says that \INVALID.SYMBOL is a bad compiled function, and then it loses track of the keyword package. Could be a load-sequence problem that would be resolved if this is installed in a new INIT.SYSOUT rather than an overlay of files already loaded into the LISP.SYSOUT")
+    (* ;; "RMK 2021:  Moved single chars above atom test to be more precise about digits.")
+
+    (* ;; "Moved Unicode up, out of comma testing, allowed lower-case u.")
+
+    (* ;; "Also disallowed unknown junk in the parse-integer strings and substrings so we know what's happening")
 
     (COND
        ((NOT C)
@@ -1414,70 +1416,89 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                      NOERROR)
               (CHARCODE.DECODE (CDR C)
                      NOERROR)))
-       ((NOT (OR (ATOM C)
-                 (STRINGP C)))
+       ((EQ (NCHARS C)
+            1)                                               (* ; 
+                           "Includes singleton digits 0-9, the only FIXP's allowed. 0 is 0, not 48")
+        (CHCON1 C))
+       ((NOT (OR (LITATOM C)
+                 (STRINGP C)))                               (* ; 
+                                               "LITATOM instead of ATOM stops numbers right here. ")
         (AND (NOT NOERROR)
              (ERROR "BAD CHARACTER SPECIFICATION" C)))
-       ((EQ (NCHARS C)
-            1)
-        (CHCON1 C))
+       [(AND (SELCHARQ (CHCON1 C)
+                  (0                                         (* ; "Hex?  0X or 0x")
+                     (FMEMB (NTHCHARCODE C 2)
+                            (CHARCODE (x X))))
+                  ((U u)                                     (* ; "Unicode  U+ or u+")
+                       (EQ (NTHCHARCODE C 2)
+                           (CHARCODE +)))
+                  NIL)
+             (CAR (NLSETQ (CL:PARSE-INTEGER (SUBSTRING C 3)
+                                 :RADIX 16]
        (T
         (SELCHARQ (CHCON1 C)
              (^ (AND (SETQ C (CHARCODE.DECODE (SUBSTRING C 2 -1)
                                     NOERROR))
                      (LOGAND C (LOGNOT 96))))
              (%# 
-                 (* ;; "We use IPLUS instead of LOGOR here because some people want ##char to read as Xerox Meta, i.e., 1,char")
+                 (* ;; "We use IPLUS instead of LOGOR here because some people want ##char to read as Xerox Meta, i.e., 1,char")
+
+                 (* ;; "RMK:  I don't understand that comment:  %"X,#a%" would map to the high panel corresponding to %"a%" in any character set X, including Meta or Function, wherever they happen to be.  Won't adding and orring be the same?")
 
                  (AND (SETQ C (CHARCODE.DECODE (SUBSTRING C 2 -1)
                                      NOERROR))
                       (IPLUS C 128)))
-             (LET
-              ((STR (MKSTRING C)))
-              (for X in CHARACTERNAMES when (STRING.EQUAL (CAR X)
-                                                               STR)
-                 do (RETURN (OR (NUMBERP (CADR X))
-                                    (CHARCODE.DECODE (CADR X)
-                                           NOERROR)))
-                 finally
-                 (RETURN (LET ((POS (STRPOSL '(%, - "." "|")
-                                           STR))
-                               CH CSET)                      (* ; "In the form charset,char")
-                              (COND
-                                 ((AND POS (SETQ CH (OR (CL:PARSE-INTEGER STR :START POS :RADIX 8
-                                                               :JUNK-ALLOWED T)
-                                                        (CHARCODE.DECODE (SUBSTRING STR
-                                                                                    (ADD1 POS))
-                                                               NOERROR)))
-                                       (< CH 256)
-                                       (>= CH 0))            (* ; 
-                                        "parsed the char part as an octal number or character spec")
-                                  (if (AND [SETQ CSET (OR (CL:PARSE-INTEGER STR :END
-                                                                     (SUB1 POS)
-                                                                     :RADIX 8 :JUNK-ALLOWED T)
-                                                              (for PAIR in CHARACTERSETNAMES
-                                                                 first (SETQ POS
-                                                                            (SUBSTRING STR 1
-                                                                                   (SUB1 POS)))
-                                                                 when (STRING.EQUAL (CAR PAIR)
-                                                                                 POS)
-                                                                 do (RETURN (CADR PAIR]
-                                               (< CSET 256)
-                                               (>= CSET 0))
-                                      then               (* ; 
-                              "parsed the charset part as an octal number or standard charset name")
-                                            (LOGOR CH (LLSH CSET 8))
-                                    elseif (NOT NOERROR)
-                                      then (ERROR "BAD CHARACTERSET SPECIFICATION" C)))
-                                 ((AND (NOT (FIXP C))
-                                       (CL:PARSE-INTEGER (CL:IF (EQ 1 (OR (STRPOS "0x" STR)
-                                                                              (STRPOS "0X" STR)
-                                                                              (STRPOS "U+" STR)))
-                                                                 (SUBSTRING STR 3)
-                                                                 STR)
-                                              :RADIX 16 :JUNK-ALLOWED T)))
-                                 ((NOT NOERROR)
-                                  (ERROR "BAD CHARACTER SPECIFICATION" C])
+             (for X in CHARACTERNAMES when (STRING.EQUAL (CAR X)
+                                                              C)
+                do (RETURN (OR (NUMBERP (CADR X))
+                                   (CHARCODE.DECODE (CADR X)
+                                          NOERROR)))
+                finally
+                (RETURN (LET ((POS (STRPOSL '(%, - "." "|")
+                                          C))
+                              CH CSET SSTR)                  (* ; "In the form charset,char")
+
+                             (* ;; "The character set loop is like the character loop with a different search list and no recursion for character sets.")
+
+                             (COND
+                                ((AND POS (SETQ CH (OR (CAR (NLSETQ (CL:PARSE-INTEGER
+                                                                     (SETQ SSTR (SUBSTRING
+                                                                                 C
+                                                                                 (ADD1 POS)))
+                                                                     :RADIX 8)))
+                                                       (CHARCODE.DECODE SSTR NOERROR)))
+                                      (< CH 256)
+                                      (>= CH 0)
+                                      [SETQ CSET
+                                       (OR (CAR (NLSETQ (CL:PARSE-INTEGER (SETQ SSTR
+                                                                               (SUBSTRING
+                                                                                C 1 (SUB1 POS)))
+                                                               :RADIX 8)))
+                                           (CADR (find PAIR in CHARACTERSETNAMES
+                                                    suchthat 
+
+                                                          (* ;; 
+                                             "No recursion, if not a number the list is bad, not C")
+
+                                                          (STRING.EQUAL (CAR PAIR)
+                                                                 SSTR)))
+                                           (AND (SELCHARQ (CHCON1 SSTR)
+                                                     (0      (* ; "Hex?  0X or 0x")
+                                                        (FMEMB (NTHCHARCODE SSTR 2)
+                                                               (CHARCODE (x X))))
+                                                     ((U u)  (* ; "Unicode  U+ or u+")
+                                                          (EQ (NTHCHARCODE SSTR 2)
+                                                              (CHARCODE +)))
+                                                     NIL)
+                                                (CAR (NLSETQ (CL:PARSE-INTEGER (SUBSTRING SSTR 3)
+                                                                    :RADIX 16]
+                                      (< CSET 256)
+                                      (>= CSET 0))           (* ; 
+                              "parsed the charset part as an octal,  standard charset name, or hex")
+                                 (LOGOR (LLSH CSET 8)
+                                        CH))
+                                ((NOT NOERROR)
+                                 (ERROR "BAD CHARACTER SPECIFICATION" C])
 )
 
 (RPAQQ CHARACTERNAMES
@@ -1503,8 +1524,8 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
         ("Linefeed" 10)
         ("LF" 10)))
 
-(RPAQQ CHARACTERSETNAMES ((Meta 1)
-                              (Function 2)
+(RPAQQ CHARACTERSETNAMES (("Meta" 1)
+                              ("Function" 2)
                               ("Greek" 38)
                               ("Cyrillic" 39)
                               ("Hira" 36)
@@ -1891,20 +1912,20 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
 (PUTPROPS LLREAD COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
 1991 1993 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3501 11730 (LASTC 3511 . 3817) (PEEKC 3819 . 4207) (PEEKCCODE 4209 . 4502) (RATOM 4504
- . 5585) (READ 5587 . 6147) (READC 6149 . 6790) (READCCODE 6792 . 7551) (READP 7553 . 8105) (
-SETREADMACROFLG 8107 . 8406) (SKIPSEPRCODES 8408 . 9391) (SKIPSEPRS 9393 . 9779) (SKREAD 9781 . 11728)
-) (11776 20451 (CL:READ 11786 . 12335) (CL:READ-PRESERVING-WHITESPACE 12337 . 13059) (
-CL:READ-DELIMITED-LIST 13061 . 13976) (CL:PARSE-INTEGER 13978 . 20449)) (20544 33021 (RSTRING 20554 . 
-21286) (READ-EXTENDED-TOKEN 21288 . 25160) (\RSTRING2 25162 . 33019)) (33057 64197 (\TOP-LEVEL-READ 
-33067 . 35050) (\SUBREAD 35052 . 60613) (\SUBREADCONCAT 60615 . 61238) (\ORIG-READ.SYMBOL 61240 . 
-62308) (\ORIG-INVALID.SYMBOL 62310 . 63209) (\APPLYREADMACRO 63211 . 63627) (INREADMACROP 63629 . 
-64195)) (64356 64531 (READQUOTE 64366 . 64529)) (64556 76460 (READVBAR 64566 . 65897) (READHASHMACRO 
-65899 . 71709) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71711 . 71931) (DIGITBASEP 71933 . 72667) (
-READNUMBERINBASE 72669 . 74555) (ESTIMATE-DIMENSIONALITY 74557 . 74882) (SKIP.HASH.COMMENT 74884 . 
-75852) (CMLREAD.FEATURE.PARSER 75854 . 76458)) (76504 83037 (CHARACTER.READ 76514 . 77768) (
-CHARCODE.DECODE 77770 . 83035)) (87505 99999 (\OUTCHAR 87515 . 88651) (\INCCODE 88653 . 89839) (
-\BACKCCODE 89841 . 90735) (\BACKCCODE.EOLC 90737 . 93500) (\PEEKCCODE 93502 . 93818) (
-\PEEKCCODE.NOEOLC 93820 . 94082) (\INCCODE.EOLC 94084 . 95943) (\FORMATBYTESTREAM 95945 . 97431) (
-\CHECKEOLC.CRLF 97433 . 99997)))))
+  (FILEMAP (NIL (3476 11705 (LASTC 3486 . 3792) (PEEKC 3794 . 4182) (PEEKCCODE 4184 . 4477) (RATOM 4479
+ . 5560) (READ 5562 . 6122) (READC 6124 . 6765) (READCCODE 6767 . 7526) (READP 7528 . 8080) (
+SETREADMACROFLG 8082 . 8381) (SKIPSEPRCODES 8383 . 9366) (SKIPSEPRS 9368 . 9754) (SKREAD 9756 . 11703)
+) (11751 20360 (CL:READ 11761 . 12310) (CL:READ-PRESERVING-WHITESPACE 12312 . 13034) (
+CL:READ-DELIMITED-LIST 13036 . 13951) (CL:PARSE-INTEGER 13953 . 20358)) (20453 32930 (RSTRING 20463 . 
+21195) (READ-EXTENDED-TOKEN 21197 . 25069) (\RSTRING2 25071 . 32928)) (32966 64106 (\TOP-LEVEL-READ 
+32976 . 34959) (\SUBREAD 34961 . 60522) (\SUBREADCONCAT 60524 . 61147) (\ORIG-READ.SYMBOL 61149 . 
+62217) (\ORIG-INVALID.SYMBOL 62219 . 63118) (\APPLYREADMACRO 63120 . 63536) (INREADMACROP 63538 . 
+64104)) (64265 64440 (READQUOTE 64275 . 64438)) (64465 76369 (READVBAR 64475 . 65806) (READHASHMACRO 
+65808 . 71618) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71620 . 71840) (DIGITBASEP 71842 . 72576) (
+READNUMBERINBASE 72578 . 74464) (ESTIMATE-DIMENSIONALITY 74466 . 74791) (SKIP.HASH.COMMENT 74793 . 
+75761) (CMLREAD.FEATURE.PARSER 75763 . 76367)) (76413 83888 (CHARACTER.READ 76423 . 77677) (
+CHARCODE.DECODE 77679 . 83886)) (88360 100854 (\OUTCHAR 88370 . 89506) (\INCCODE 89508 . 90694) (
+\BACKCCODE 90696 . 91590) (\BACKCCODE.EOLC 91592 . 94355) (\PEEKCCODE 94357 . 94673) (
+\PEEKCCODE.NOEOLC 94675 . 94937) (\INCCODE.EOLC 94939 . 96798) (\FORMATBYTESTREAM 96800 . 98286) (
+\CHECKEOLC.CRLF 98288 . 100852)))))
 STOP
diff --git a/sources/LLREAD.LCOM b/sources/LLREAD.LCOM
index 65999b28..40e542c7 100644
Binary files a/sources/LLREAD.LCOM and b/sources/LLREAD.LCOM differ
diff --git a/sources/SEDIT-COMMANDS b/sources/SEDIT-COMMANDS
index 2454db5b..873ddfa0 100644
--- a/sources/SEDIT-COMMANDS
+++ b/sources/SEDIT-COMMANDS
@@ -1,14 +1,14 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE (DEFPACKAGE SEDIT (USE LISP XCL)))
-(IL:FILECREATED "23-Apr-2018 18:12:52" 
-IL:|{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-COMMANDS.;3| 124949 
+(DEFINE-FILE-INFO PACKAGE (DEFPACKAGE SEDIT (USE LISP XCL)) READTABLE "XCL" BASE 10)
+(IL:FILECREATED "15-Aug-2021 21:22:22" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMANDS.;7| 125181 
 
-      IL:|changes| IL:|to:|  (IL:FUNCTIONS GET-SELECTION)
+      IL:|changes| IL:|to:|  (IL:VARS IL:SEDIT-COMMANDSCOMS)
 
-      IL:|previous| IL:|date:| "22-Apr-2018 17:13:59" 
-IL:|{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-COMMANDS.;2|)
+      IL:|previous| IL:|date:| "14-Aug-2021 12:59:29" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>SEDIT-COMMANDS.;6|)
 
 
-; Copyright (c) 1986, 1987, 1988, 1990, 1991, 2018 by Venue & Xerox Corporation.  All rights reserved.
+; Copyright (c) 1986-1988, 1990-1991, 2018, 2021 by Venue & Xerox Corporation.
 
 (IL:PRETTYCOMPRINT IL:SEDIT-COMMANDSCOMS)
 
@@ -112,13 +112,13 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-COMMANDS.;2|)
      ((VERIFY-STRUCTURE NIL T T)
       NIL NIL "^L")
      ((VERIFY-STRUCTURE NIL T NIL)
-      NIL NIL "1,^L")
+      NIL NIL "Meta,^L")
 
      (IL:* IL:|;;| "COMPLETION")
 
      ((COMPLETE :ABORT NIL)
       ("Abort" "M-A" "Complete this edit without installing changes.")
-      NIL "1,A" "1,a" (ABORT))
+      NIL "Meta,A" "Meta,a" (ABORT))
      (NULL ("" "" "")
            NIL 0)
      ((COMPLETE :DONE NIL)
@@ -126,93 +126,92 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-COMMANDS.;2|)
       NIL "^X" (DONE))
      ((COMPLETE :CLOSE)
       ("Done & Close" "C-M-X" "Complete this edit and close the window.")
-      NIL "1,^X" (EXIT))
+      NIL "Meta,^X" (EXIT))
      ((COMPLETE :DONE T)
       ("Done & Compile" "C-C" "Complete this edit, compile, and leave the window open.")
       NIL "^C" (COMPILE))
      ((COMPLETE :CLOSE T)
       ("Done, Compile, & Close" "C-M-C" "Complete this edit, compile, and close the window.")
-      NIL "1,^C")
+      NIL "Meta,^C")
 
      (IL:* IL:|;;| "COMMANDS")
 
      (NULL ("" "" "")
            NIL 0)
      (UNDO ("Undo" "M-U" "Undo the last change made.")
-            NIL "1,U" "1,u" 516 (UNDO))
+            NIL "Meta,U" "Meta,u" "Function,^D" (UNDO))
      (REDO ("Redo" "M-R" "Redo the last change undone.")
-            NIL "1,R" "1,r" 520 (REDO))
+            NIL "Meta,R" "Meta,r" "Function,Bs" (REDO))
      (NULL ("" "" "")
            NIL 0)
      (FIND-OBJ ("Find" "M-F" "Find the current selection, or prompt for structure to Find.")
-            T "1,F" "1,f" 515 (FIND))
+            T "Meta,F" "Meta,f" "Function,^C" (FIND))
      ((FIND-OBJ NIL T)
       ("Reverse Find" "C-M-F" "Find the current selection, or prompt for structure to Find.")
-      T "1,^F")
+      T "Meta,^F")
      ((SUBSTITUTE-OBJ NIL NIL T)
       ("Remove" "C-M-S" "Remove structures from within the current selection.")
-      NIL "1,^S")
+      NIL "Meta,^S")
      (SUBSTITUTE-OBJ ("Substitute" "M-S" "Substitute structures within the current selection.")
-            NIL "1,S" "1,s" 547 (SUBSTITUTE))
+            NIL "Meta,S" "Meta,s" "Function,#" (SUBSTITUTE))
      (SKIP-TO-GAP ("Find Gap" "M-N" "Skip to the next fill in gap.")
-            T "1,N" "1,n" 530)
+            T "Meta,N" "Meta,n" "Function,^R")
      (NULL ("" "" "")
            NIL 0)
      (EDIT-HELP ("Arglist" "M-H" "Show the argument list for the selected function.")
-            NIL "1,H" "1,h" 513 (ARGLIST))
+            NIL "Meta,H" "Meta,h" "Function,^A" (ARGLIST))
      (CONVERT-COMMENT ("Convert Comment" "M-;" 
                                  "Convert the old style comments in the current selection.")
-            NIL "1,;")
-     (COMMENT-OUT-SELECTION NIL NIL "1,^;")
+            NIL "Meta,;")
+     (COMMENT-OUT-SELECTION NIL NIL "Meta,^;")
      (EDIT-SELECTION ("Edit" "M-O" "Edit the definition of the current selection.")
-            NIL "1,O" "1,o" (EDIT))
+            NIL "Meta,O" "Meta,o" (EDIT))
      ((EDIT-SELECTION (:CURRENT))
       ("Edit Fast" "C-M-O" "Edit the current definition of the selection.")
-      NIL "1,^O")
+      NIL "Meta,^O")
      (EVAL-SELECTION ("Eval" "M-E" "Evaluate the current selection.")
-            NIL "1,E" "1,e" (EVAL))
+            NIL "Meta,E" "Meta,e" (EVAL))
      (EXPAND ("Expand" "M-X" "Replace the current selection with its definition.")
-            NIL "1,X" "1,x" IL:ESC 532 (EXPAND))
+            NIL "Meta,X" "Meta,x" IL:ESC "Function,^T" (EXPAND))
      (EXTRACT-CURRENT-SELECTION ("Extract" "M-/" 
                                            "Extract one level of structure: unquote or unlist.")
-            NIL "1,/" (EXTRACT))
+            NIL "Meta,/" (EXTRACT))
      (INSPECT-SELECTION ("Inspect" "M-I" "Inspect the current selection.")
-            NIL "1,I" "1,i" (INSPECT))
+            NIL "Meta,I" "Meta,i" (INSPECT))
      (JOIN ("Join" "M-J" "Join selected items together.")
-            NIL "1,J" "1,j" (JOIN))
+            NIL "Meta,J" "Meta,j" (JOIN))
      (MUTATE ("Mutate" "M-Z" "Prompt for a function to operate on the current selection.")
-            NIL "1,Z" "1,z")
+            NIL "Meta,Z" "Meta,z")
      ((PARENTHESIZE-CURRENT-SELECTION NIL)
       ("Parenthesize" "M-(" "Parenthesize the current selection.")
-      NIL "1,(" "1,71" (PAREN))
+      NIL "Meta,(" "Meta,71" (PAREN))
      ((PARENTHESIZE-CURRENT-SELECTION T)
-      NIL NIL "1,)" "1,60")
+      NIL NIL "Meta,)" "Meta,60")
      ((QUOTE-CURRENT-SELECTION QUOTE)
       ("Quote" "M-'" "Quote the current selection.")
-      NIL "1,'" (QUOTE))
+      NIL "Meta,'" (QUOTE))
      ((QUOTE-CURRENT-SELECTION IL:BQUOTE)
-      NIL NIL "1,`")
+      NIL NIL "Meta,`")
      ((QUOTE-CURRENT-SELECTION IL:COMMA)
-      NIL NIL "1,,")
+      NIL NIL "Meta,,")
      ((QUOTE-CURRENT-SELECTION COMMA-AT)
-      NIL NIL "1,@" "1,62")
+      NIL NIL "Meta,@" "Meta,62")
      ((QUOTE-CURRENT-SELECTION COMMA-DOT)
-      NIL NIL "1,.")
+      NIL NIL "Meta,.")
      ((QUOTE-CURRENT-SELECTION FUNCTION)
-      NIL NIL "1,#" "1,63")
+      NIL NIL "Meta,#" "Meta,63")
      (NULL ("" "" "")
            NIL 0)
      (CHANGE-PRINTBASE ("Set Print-Base" "M-B" "Set the print-base for this edit.")
-            NIL "1,B" "1,b" (SET-PRINT-BASE))
+            NIL "Meta,B" "Meta,b" (SET-PRINT-BASE))
      (CHANGE-PACKAGE ("Set Package" "M-P" "Set the package to edit in.")
-            NIL "1,P" "1,p" (SET-PACKAGE))
+            NIL "Meta,P" "Meta,p" (SET-PACKAGE))
      (ADD-MENU ("Attach Menu" "M-M" "Attach a command menu.")
-            NIL "1,M" "1,m")
+            NIL "Meta,M" "Meta,m")
 
      (IL:* IL:|;;| "RANDOM: tells Meta-Space or Meta-Return to scroll to the selection, using the auto-scroller for free.")
 
-     (TRUE NIL T "1, " "1,
-")))
+     (TRUE NIL T "Meta, " "Meta,CR")))
 
 (DEFPARAMETER *EDIT-FN* 'DEFAULT-EDIT-FN)
 
@@ -1587,41 +1586,41 @@ IL:|{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>SEDIT-COMMANDS.;2|)
 )
 )
 (IL:PUTPROPS IL:SEDIT-COMMANDS IL:COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1991 2018
-))
+ 2021))
 (IL:DECLARE\: IL:DONTCOPY
-  (IL:FILEMAP (NIL (13416 13986 (PSEUDO-SELECTION-FROM-SELECTION 13416 . 13986)) (13988 14742 (
-COMPOSE-PSEUDO-SELECTION 13988 . 14742)) (14744 15283 (DECOMPOSE-PSEUDO-SELECTION 14744 . 15283)) (
-15285 16082 (SELECTION-FROM-PSEUDO-SELECTION 15285 . 16082)) (16084 16387 (SELECT-PSEUDO-SEGMENT 16084
- . 16387)) (16452 17342 (ADD-COMMAND 16452 . 17342)) (17344 19507 (GET-SELECTION 17344 . 19507)) (
-19509 20689 (REPLACE-SELECTION 19509 . 20689)) (20691 21183 (RESET-COMMANDS 20691 . 21183)) (21185 
-21354 (DEFAULT-COMMANDS 21185 . 21354)) (21832 22935 (EQUALIZE-STRING-WIDTHS 21832 . 22935)) (22937 
-23135 (MINIMUM-STRING-WIDTH 22937 . 23135)) (23137 23335 (MAXIMUM-STRING-WIDTH 23137 . 23335)) (23337 
-24208 (FIND-AND-DISPLAY-STRUCTURE 23337 . 24208)) (24210 24894 (FIND-AND-DISPLAY-STRUCTURE-BACKWARDS 
-24210 . 24894)) (24896 25800 (FIND-AND-DISPLAY-SUBSTRUCTURE 24896 . 25800)) (25802 26505 (
-FIND-AND-DISPLAY-SUBSTRUCTURE-BACKWARDS 25802 . 26505)) (26507 27148 (FIND-NTH-STRUCTURE 26507 . 27148
-)) (27150 29880 (FIND-NODE-SUBSTRUCTURE 27150 . 29880)) (29882 31135 (FIND-NODE-SUBSTRUCTURE-BACKWARDS
- 29882 . 31135)) (31137 32116 (FIND-OBJ 31137 . 32116)) (32118 33518 (FIND-SELECTION 32118 . 33518)) (
-33520 35212 (FIND-SELECTION-BACKWARDS 33520 . 35212)) (35214 37943 (FIND-STRUCTURE 35214 . 37943)) (
-37945 40292 (FIND-STRUCTURE-BACKWARDS 37945 . 40292)) (40294 43223 (FIND-SUBSTRUCTURE 40294 . 43223)) 
-(43225 45525 (FIND-SUBSTRUCTURE-BACKWARDS 43225 . 45525)) (45527 45763 (GET-USER-STRING 45527 . 45763)
-) (45765 49473 (SEARCH-OBJ 45765 . 49473)) (49475 53140 (SEARCH-OBJ-BACKWARDS 49475 . 53140)) (53142 
-57968 (SUBSTITUTE-OBJ 53142 . 57968)) (57970 62626 (SUBSTITUTE-STRUCTURE 57970 . 62626)) (62628 65800 
-(SUBSTITUTE-SUBSTRUCTURE 62628 . 65800)) (65802 66964 (STRUCTURE-FROM-SELECTION 65802 . 66964)) (66966
- 67809 (STRUCTURE-FROM-STRING 66966 . 67809)) (67811 69952 (COMMENT-OUT-SELECTION 67811 . 69952)) (
-69953 124814 (ADD-MENU 69966 . 70629) (BACKSPACE 70631 . 71610) (CHANGE-PACKAGE 71612 . 74412) (
-CHANGE-PRINTBASE 74414 . 76596) (CHANGE-QUOTE 76598 . 76953) (CONVERT-COMMENT 76955 . 78715) (
-CONVERT-COMMENT-STRUCTURE 78717 . 80020) (CONVERT-COMMENT-TAIL 80022 . 81422) (CREATE-COMMAND-TABLE 
-81424 . 83402) (DEFAULT-EDIT-FN 83404 . 83541) (DELETE-SELECTION 83543 . 84225) (DELETE-WORD 84227 . 
-86328) (DO-MUTATION 86330 . 86878) (EDIT-SELECTION 86880 . 87328) (EVAL-SELECTION 87330 . 89199) (
-EXPAND 89201 . 90330) (EXTRACT-CURRENT-SELECTION 90332 . 92700) (FIND-COMMENT 92702 . 93396) (GET-MENU
- 93398 . 93775) (EDIT-HELP 93777 . 94852) (HELPMENU 94854 . 97643) (INPUT-DOT 97645 . 99777) (
-INPUT-ESCAPE 99779 . 100027) (INPUT-NORMAL-CHAR 100029 . 102062) (INPUT-QUOTE 102064 . 105146) (
-INPUT-SQUARE-BRACKET 105148 . 105499) (INPUT-STRINGDELIM 105501 . 106900) (INPUT-TOKENDELIM 106902 . 
-107882) (INSERT-MULTI-ESCAPE 107884 . 109012) (INSERT-SPECIAL-CHARACTER 109014 . 110274) (
-INSPECT-SELECTION 110276 . 110811) (JOIN 110813 . 114483) (MENU-CLOSEFN 114485 . 114703) (
-MENU-FIND-SELECTEDFN 114705 . 115405) (MENU-INIT-STATE 115407 . 116214) (MENU-PACKAGE-SELECTEDFN 
-116216 . 117267) (MENU-PRINTBASE-SELECTEDFN 117269 . 118145) (MENU-SELECTEDFN 118147 . 118573) (
-MENU-SUBSTITUTE-SELECTEDFN 118575 . 119535) (MUTATE 119537 . 120647) (QUOTE-CURRENT-SELECTION 120649
- . 121416) (REDISPLAY 121418 . 121657) (REDO 121659 . 122153) (SELECTED-FN-NAME 122155 . 122600) (
-SKIP-TO-GAP 122602 . 123379) (UNDO 123381 . 124181) (UNDO-EXTRACT 124183 . 124812)))))
+  (IL:FILEMAP (NIL (13643 14213 (PSEUDO-SELECTION-FROM-SELECTION 13643 . 14213)) (14215 14969 (
+COMPOSE-PSEUDO-SELECTION 14215 . 14969)) (14971 15510 (DECOMPOSE-PSEUDO-SELECTION 14971 . 15510)) (
+15512 16309 (SELECTION-FROM-PSEUDO-SELECTION 15512 . 16309)) (16311 16614 (SELECT-PSEUDO-SEGMENT 16311
+ . 16614)) (16679 17569 (ADD-COMMAND 16679 . 17569)) (17571 19734 (GET-SELECTION 17571 . 19734)) (
+19736 20916 (REPLACE-SELECTION 19736 . 20916)) (20918 21410 (RESET-COMMANDS 20918 . 21410)) (21412 
+21581 (DEFAULT-COMMANDS 21412 . 21581)) (22059 23162 (EQUALIZE-STRING-WIDTHS 22059 . 23162)) (23164 
+23362 (MINIMUM-STRING-WIDTH 23164 . 23362)) (23364 23562 (MAXIMUM-STRING-WIDTH 23364 . 23562)) (23564 
+24435 (FIND-AND-DISPLAY-STRUCTURE 23564 . 24435)) (24437 25121 (FIND-AND-DISPLAY-STRUCTURE-BACKWARDS 
+24437 . 25121)) (25123 26027 (FIND-AND-DISPLAY-SUBSTRUCTURE 25123 . 26027)) (26029 26732 (
+FIND-AND-DISPLAY-SUBSTRUCTURE-BACKWARDS 26029 . 26732)) (26734 27375 (FIND-NTH-STRUCTURE 26734 . 27375
+)) (27377 30107 (FIND-NODE-SUBSTRUCTURE 27377 . 30107)) (30109 31362 (FIND-NODE-SUBSTRUCTURE-BACKWARDS
+ 30109 . 31362)) (31364 32343 (FIND-OBJ 31364 . 32343)) (32345 33745 (FIND-SELECTION 32345 . 33745)) (
+33747 35439 (FIND-SELECTION-BACKWARDS 33747 . 35439)) (35441 38170 (FIND-STRUCTURE 35441 . 38170)) (
+38172 40519 (FIND-STRUCTURE-BACKWARDS 38172 . 40519)) (40521 43450 (FIND-SUBSTRUCTURE 40521 . 43450)) 
+(43452 45752 (FIND-SUBSTRUCTURE-BACKWARDS 43452 . 45752)) (45754 45990 (GET-USER-STRING 45754 . 45990)
+) (45992 49700 (SEARCH-OBJ 45992 . 49700)) (49702 53367 (SEARCH-OBJ-BACKWARDS 49702 . 53367)) (53369 
+58195 (SUBSTITUTE-OBJ 53369 . 58195)) (58197 62853 (SUBSTITUTE-STRUCTURE 58197 . 62853)) (62855 66027 
+(SUBSTITUTE-SUBSTRUCTURE 62855 . 66027)) (66029 67191 (STRUCTURE-FROM-SELECTION 66029 . 67191)) (67193
+ 68036 (STRUCTURE-FROM-STRING 67193 . 68036)) (68038 70179 (COMMENT-OUT-SELECTION 68038 . 70179)) (
+70180 125041 (ADD-MENU 70193 . 70856) (BACKSPACE 70858 . 71837) (CHANGE-PACKAGE 71839 . 74639) (
+CHANGE-PRINTBASE 74641 . 76823) (CHANGE-QUOTE 76825 . 77180) (CONVERT-COMMENT 77182 . 78942) (
+CONVERT-COMMENT-STRUCTURE 78944 . 80247) (CONVERT-COMMENT-TAIL 80249 . 81649) (CREATE-COMMAND-TABLE 
+81651 . 83629) (DEFAULT-EDIT-FN 83631 . 83768) (DELETE-SELECTION 83770 . 84452) (DELETE-WORD 84454 . 
+86555) (DO-MUTATION 86557 . 87105) (EDIT-SELECTION 87107 . 87555) (EVAL-SELECTION 87557 . 89426) (
+EXPAND 89428 . 90557) (EXTRACT-CURRENT-SELECTION 90559 . 92927) (FIND-COMMENT 92929 . 93623) (GET-MENU
+ 93625 . 94002) (EDIT-HELP 94004 . 95079) (HELPMENU 95081 . 97870) (INPUT-DOT 97872 . 100004) (
+INPUT-ESCAPE 100006 . 100254) (INPUT-NORMAL-CHAR 100256 . 102289) (INPUT-QUOTE 102291 . 105373) (
+INPUT-SQUARE-BRACKET 105375 . 105726) (INPUT-STRINGDELIM 105728 . 107127) (INPUT-TOKENDELIM 107129 . 
+108109) (INSERT-MULTI-ESCAPE 108111 . 109239) (INSERT-SPECIAL-CHARACTER 109241 . 110501) (
+INSPECT-SELECTION 110503 . 111038) (JOIN 111040 . 114710) (MENU-CLOSEFN 114712 . 114930) (
+MENU-FIND-SELECTEDFN 114932 . 115632) (MENU-INIT-STATE 115634 . 116441) (MENU-PACKAGE-SELECTEDFN 
+116443 . 117494) (MENU-PRINTBASE-SELECTEDFN 117496 . 118372) (MENU-SELECTEDFN 118374 . 118800) (
+MENU-SUBSTITUTE-SELECTEDFN 118802 . 119762) (MUTATE 119764 . 120874) (QUOTE-CURRENT-SELECTION 120876
+ . 121643) (REDISPLAY 121645 . 121884) (REDO 121886 . 122380) (SELECTED-FN-NAME 122382 . 122827) (
+SKIP-TO-GAP 122829 . 123606) (UNDO 123608 . 124408) (UNDO-EXTRACT 124410 . 125039)))))
 IL:STOP
diff --git a/sources/SEDIT-COMMANDS.DFASL b/sources/SEDIT-COMMANDS.DFASL
index b1acd733..490401d3 100644
Binary files a/sources/SEDIT-COMMANDS.DFASL and b/sources/SEDIT-COMMANDS.DFASL differ
diff --git a/sources/TTYIN b/sources/TTYIN
index 7afc2305..045144e3 100644
--- a/sources/TTYIN
+++ b/sources/TTYIN
@@ -1,10 +1,11 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED "13-Aug-2021 11:07:59" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;7 329042 
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "16-Aug-2021 23:40:36" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;12 329478 
 
-      changes to%:  (FNS TTYIN.SCRATCHFILE)
+      changes to%:  (FNS \TTYIN.RPEOF)
 
-      previous date%: "13-Jun-2021 10:11:51" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;5)
+      previous date%: "14-Aug-2021 10:55:39" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;10)
 
 
 (* ; "
@@ -5608,11 +5609,19 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
     TTYINEDIT.SCRATCH])
 
 (\TTYIN.RPEOF
-  [LAMBDA (STREAM)                                       (* lmm "14-Nov-86 17:06")
-                                                             (* ; 
-             "End of stream op for ttyin scratch file -- supplies as many closing parens as needed")
+  [LAMBDA (STREAM)                                      (* ; "Edited 16-Aug-2021 23:40 by rmk:")
 
-    (CHARCODE ")"])
+    (* ;; "End of stream op for ttyin scratch file -- supplies as many closing parens as needed")
+
+    (LET (BYTESTREAM)
+         (CL:UNLESS (SETQ BYTESTREAM (STREAMPROP STREAM 'BYTESTREAM))
+             (SETQ BYTESTREAM (\FORMATBYTESTREAM STREAM NIL))(* ; "First time, set it up")
+             (STREAMPROP STREAM 'BYTESTREAM BYTESTREAM)
+             (\OUTCHAR BYTESTREAM (CHARCODE ")"))
+             (SETFILEPTR BYTESTREAM 0))
+         (OR (BIN BYTESTREAM)
+             (PROGN (SETFILEPTR BYTESTREAM 0)
+                    (BIN BYTESTREAM])
 )
 
 (RPAQ? TTYINEDIT.SCRATCH )
@@ -5845,13 +5854,14 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
 
 (PUTPROPS METACHARP MACRO ((C)
                                    (EQ (LRSH C 8)
-                                       1)))
+                                       (LRSH (CHARCODE Meta,0)
+                                             8))))
 
 (PUTPROPS NONMETACHARBITS MACRO ((C)
                                          (LOGAND C 255)))
 
 (PUTPROPS METACHAR MACRO ((C)
-                                  (LOGOR C 256)))
+                                  (LOGOR C (CHARCODE Meta,0))))
 
 (PUTPROPS COMPLEXCHARP MACRO (= . LISTP))
 
@@ -6089,62 +6099,62 @@ DONTEVAL@LOAD EVAL@COMPILE
 (PUTPROPS TTYIN COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991 
 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (7722 207400 (TTYIN 7732 . 20965) (TTYIN.SETUP 20967 . 24043) (TTYIN.CLEANUP 24045 . 
-24873) (TTYIN1 24875 . 51393) (TTYIN1RESTART 51395 . 52659) (TTYIN.FINISH 52661 . 62078) (
-TTYIN.BALANCE 62080 . 63206) (ADDCHAR 63208 . 65394) (TTMAKECOMPLEXCHAR 65396 . 65870) (ADDNAKEDCHAR 
-65872 . 67382) (TTADDTAB 67384 . 68319) (ADJUSTLINE 68321 . 82232) (ADJUSTLINE.AND.RESTORE 82234 . 
-82672) (AT.END.OF.SCREEN 82674 . 82962) (AT.END.OF.TEXT 82964 . 83419) (AUTOCR? 83421 . 83895) (
-BACKSKREAD 83897 . 88482) (BACKWARD.DELETE.TO 88484 . 88666) (BREAKLINE 88668 . 90935) (BUFTAILP 90937
- . 91255) (CHECK.MARGIN 91257 . 91880) (CLEAR.LINE? 91882 . 92175) (CURRENT.WORD 92177 . 94577) (
-DELETE.TO.END 94579 . 95298) (DELETELINE 95300 . 98257) (DELETETO 98259 . 100081) (DELETETO1 100083 . 
-101426) (DO.EDIT.COMMAND 101428 . 118747) (DO.EDIT.PP 118749 . 121411) (TTDOTABS 121413 . 122783) (
-EDITCOLUMN 122785 . 123241) (EDITNUMBERP 123243 . 123474) (END.DELETE.MODE 123476 . 123993) (ENDREAD? 
-123995 . 126430) (FIND.LINE 126432 . 127968) (FIND.LINE.BREAK 127970 . 128640) (FIND.MATCHING.QUOTE 
-128642 . 129487) (FIND.NEXT.WORD 129489 . 130868) (FIND.NON.SPACE 130870 . 131143) (FIND.START.OF.WORD
- 131145 . 131508) (FORWARD.DELETE.TO 131510 . 133732) (GO.TO.ADDRESSING 133734 . 134690) (
-GO.TO.FREELINE 134692 . 135273) (GO.TO.RELATIVE 135275 . 136055) (INIT.CURSOR 136057 . 136954) (
-INSERT.NODE 136956 . 137478) (INSERTLINE 137480 . 138984) (KILL.LINES 138986 . 139524) (KILLSEGMENT 
-139526 . 140649) (L-CASECODE 140651 . 140812) (MOVE.BACK.TO 140814 . 141043) (MOVE.FORWARD.TO 141045
- . 141466) (MOVE.TO.LINE 141468 . 142383) (MOVE.TO.NEXT.LINE 142385 . 142655) (MOVE.TO.START.OF.WORD 
-142657 . 143421) (MOVE.TO.WHEREVER 143423 . 143646) (NTH.COLUMN.OF 143648 . 143979) (
-NTH.RELATIVE.COLUMN.OF 143981 . 145281) (OVERFLOW? 145283 . 146231) (OVERFLOWLINE? 146233 . 146559) (
-PREVLINE 146561 . 147741) (PREVWORD 147743 . 149884) (PROPERTAILP 149886 . 150093) (READFROMBUF 150095
- . 152684) (RENUMBER.LINES 152686 . 153079) (RESTORE.CURSOR 153081 . 153235) (RESTOREBUF 153237 . 
-155421) (RETYPE.BUFFER 155423 . 157686) (SAVE.CURSOR 157688 . 157860) (SCANBACK 157862 . 159220) (
-SCANFORWARD 159222 . 160090) (SCRATCHCONS 160092 . 160694) (SEGMENT.LENGTH 160696 . 161232) (
-SEGMENT.BIT.LENGTH 161234 . 161841) (SETLASTC 161843 . 162140) (SETTAIL? 162142 . 162958) (
-SHOW.MATCHING.PAREN 162960 . 165460) (SKIP/ZAP 165462 . 167941) (START.NEW.LINE 167943 . 168275) (
-START.OF.PARAGRAPH? 168277 . 168658) (TTADJUSTWORD 168660 . 169834) (TTBIN 169836 . 171042) (
-TTBITWIDTH 171044 . 171193) (TTCRLF 171195 . 171402) (TTCRLF.ACCOUNT 171404 . 172044) (TTDELETECHAR 
-172046 . 173190) (TTDELETELINE 173192 . 175140) (TTDELETEWORD 175142 . 175810) (TTECHO.TO.FILE 175812
- . 179360) (TTGIVEHELP 179362 . 180627) (TTGIVEHELP1 180629 . 181211) (TTGIVEHELP2 181213 . 181908) (
-TTLASTLINE 181910 . 182278) (TTLOADBUF 182280 . 185794) (TTNEXTLINE 185796 . 186116) (TTNEXTNODE 
-186118 . 186357) (TTNLEFT 186359 . 187586) (TTNTH 187588 . 188047) (TTNTHLINE 188049 . 188581) (
-TTPRIN1 188583 . 192396) (TTPRINSPACE 192398 . 192791) (TTPRIN1COMMENT 192793 . 193117) (TTPRIN2 
-193119 . 195438) (TTPROMPTCHAR 195440 . 196336) (TTRUBOUT 196338 . 197301) (TTUNREADBUF 197303 . 
-197712) (TTWAITFORINPUT 197714 . 201922) (TTYINSTRING 201924 . 202883) (TYPE.BUFFER 202885 . 204637) (
-U-CASECODE 204639 . 204798) (U/L-CASE 204800 . 207398)) (207555 217268 (TTRATOM 207565 . 208009) (
-TTREADLIST 208011 . 208378) (TTSKIPSEPR 208380 . 208754) (TTSKREAD 208756 . 213396) (TTYIN.READ 213398
- . 217266)) (217315 237359 (FIND.MATCHING.WORD 217325 . 217853) (TTCOMPLETEWORD 217855 . 232283) (
-WORD.MATCHES.BUFFER 232285 . 233845) (TTYIN.SHOW.?ALTERNATIVES 233847 . 237357)) (237393 255703 (
-DO?CMD 237403 . 243305) (TTYIN.PRINTARGS 243307 . 254165) (TTYIN.READ?=ARGS 254167 . 254948) (
-DO?CMD.ERRORHANDLER 254950 . 255701)) (255737 263810 (BEEP 255747 . 255922) (BITBLT.DELETE 255924 . 
-256571) (BITBLT.ERASE 256573 . 256758) (BITBLT.INSERT 256760 . 257071) (DO.CRLF 257073 . 257392) (
-DO.DELETE.LINES 257394 . 258438) (DO.INSERT.LINE 258440 . 260374) (DO.LF 260376 . 260542) (
-ERASE.TO.END.OF.LINE 260544 . 260869) (ERASE.TO.END.OF.PAGE 260871 . 261476) (INSERT.TEXT 261478 . 
-261982) (TTDELSECTION 261984 . 262282) (TTADJUSTWIDTH 262284 . 263148) (TTINSERTSECTION 263150 . 
-263489) (TTSETCURSOR 263491 . 263808)) (263845 268822 (TTYINBUFFERDEVICE 263855 . 265171) (
-TTYINBUFFERSTREAM 265173 . 265935) (TTYINBUFFERBIN 265937 . 266473) (TTYINBUFFERPEEK 266475 . 266953) 
-(TTYINBUFFERREADP 266955 . 267210) (TTYINBUFFEREOFP 267212 . 267464) (TTYINBUFFERBACKPTR 267466 . 
-268018) (TTYINWORDRDTBL 268020 . 268820)) (268983 294540 (DO.MOUSE 268993 . 271750) (
-DO.SHIFTED.SELECTION 271752 . 282191) (COPY.SEGMENT 282193 . 282397) (DELETE.LONG.SEGMENT 282399 . 
-282758) (DELETE.LONG.SEGMENT1 282760 . 285236) (INVERT.LONG.SEGMENT 285238 . 286267) (INVERT.SEGMENT 
-286269 . 287784) (BRACKET.CURRENT.WORD 287786 . 289320) (TTBEFOREPOS 289322 . 290052) (TTNEXTPOS 
-290054 . 290762) (TTRACKMOUSE 290764 . 294538)) (294684 299940 (SETREADFN 294694 . 295172) (
-TTYINENTRYFN 295174 . 295599) (TTYINREADP 295601 . 296066) (TTYINREAD 296068 . 297462) (TTYINFIX 
-297464 . 298663) (CHARMACRO? 298665 . 299232) (TTYINMETA 299234 . 299362) (TTYIN.LASTINPUT 299364 . 
-299938)) (299941 308210 (TTYINEDIT 299951 . 302068) (SIMPLETEXTEDIT 302070 . 305114) (
-SET.TTYINEDIT.WINDOW 305116 . 306267) (TTYIN.PPTOFILE 306269 . 308208)) (308268 308445 (
-MAKE-TTSCRATCHFILE 308278 . 308443)) (308592 309357 (TTYIN.SCRATCHFILE 308602 . 309048) (\TTYIN.RPEOF 
-309050 . 309355)) (309569 313202 (TTYINPROMPTFORWORD 309579 . 313200)))))
+  (FILEMAP (NIL (7706 207384 (TTYIN 7716 . 20949) (TTYIN.SETUP 20951 . 24027) (TTYIN.CLEANUP 24029 . 
+24857) (TTYIN1 24859 . 51377) (TTYIN1RESTART 51379 . 52643) (TTYIN.FINISH 52645 . 62062) (
+TTYIN.BALANCE 62064 . 63190) (ADDCHAR 63192 . 65378) (TTMAKECOMPLEXCHAR 65380 . 65854) (ADDNAKEDCHAR 
+65856 . 67366) (TTADDTAB 67368 . 68303) (ADJUSTLINE 68305 . 82216) (ADJUSTLINE.AND.RESTORE 82218 . 
+82656) (AT.END.OF.SCREEN 82658 . 82946) (AT.END.OF.TEXT 82948 . 83403) (AUTOCR? 83405 . 83879) (
+BACKSKREAD 83881 . 88466) (BACKWARD.DELETE.TO 88468 . 88650) (BREAKLINE 88652 . 90919) (BUFTAILP 90921
+ . 91239) (CHECK.MARGIN 91241 . 91864) (CLEAR.LINE? 91866 . 92159) (CURRENT.WORD 92161 . 94561) (
+DELETE.TO.END 94563 . 95282) (DELETELINE 95284 . 98241) (DELETETO 98243 . 100065) (DELETETO1 100067 . 
+101410) (DO.EDIT.COMMAND 101412 . 118731) (DO.EDIT.PP 118733 . 121395) (TTDOTABS 121397 . 122767) (
+EDITCOLUMN 122769 . 123225) (EDITNUMBERP 123227 . 123458) (END.DELETE.MODE 123460 . 123977) (ENDREAD? 
+123979 . 126414) (FIND.LINE 126416 . 127952) (FIND.LINE.BREAK 127954 . 128624) (FIND.MATCHING.QUOTE 
+128626 . 129471) (FIND.NEXT.WORD 129473 . 130852) (FIND.NON.SPACE 130854 . 131127) (FIND.START.OF.WORD
+ 131129 . 131492) (FORWARD.DELETE.TO 131494 . 133716) (GO.TO.ADDRESSING 133718 . 134674) (
+GO.TO.FREELINE 134676 . 135257) (GO.TO.RELATIVE 135259 . 136039) (INIT.CURSOR 136041 . 136938) (
+INSERT.NODE 136940 . 137462) (INSERTLINE 137464 . 138968) (KILL.LINES 138970 . 139508) (KILLSEGMENT 
+139510 . 140633) (L-CASECODE 140635 . 140796) (MOVE.BACK.TO 140798 . 141027) (MOVE.FORWARD.TO 141029
+ . 141450) (MOVE.TO.LINE 141452 . 142367) (MOVE.TO.NEXT.LINE 142369 . 142639) (MOVE.TO.START.OF.WORD 
+142641 . 143405) (MOVE.TO.WHEREVER 143407 . 143630) (NTH.COLUMN.OF 143632 . 143963) (
+NTH.RELATIVE.COLUMN.OF 143965 . 145265) (OVERFLOW? 145267 . 146215) (OVERFLOWLINE? 146217 . 146543) (
+PREVLINE 146545 . 147725) (PREVWORD 147727 . 149868) (PROPERTAILP 149870 . 150077) (READFROMBUF 150079
+ . 152668) (RENUMBER.LINES 152670 . 153063) (RESTORE.CURSOR 153065 . 153219) (RESTOREBUF 153221 . 
+155405) (RETYPE.BUFFER 155407 . 157670) (SAVE.CURSOR 157672 . 157844) (SCANBACK 157846 . 159204) (
+SCANFORWARD 159206 . 160074) (SCRATCHCONS 160076 . 160678) (SEGMENT.LENGTH 160680 . 161216) (
+SEGMENT.BIT.LENGTH 161218 . 161825) (SETLASTC 161827 . 162124) (SETTAIL? 162126 . 162942) (
+SHOW.MATCHING.PAREN 162944 . 165444) (SKIP/ZAP 165446 . 167925) (START.NEW.LINE 167927 . 168259) (
+START.OF.PARAGRAPH? 168261 . 168642) (TTADJUSTWORD 168644 . 169818) (TTBIN 169820 . 171026) (
+TTBITWIDTH 171028 . 171177) (TTCRLF 171179 . 171386) (TTCRLF.ACCOUNT 171388 . 172028) (TTDELETECHAR 
+172030 . 173174) (TTDELETELINE 173176 . 175124) (TTDELETEWORD 175126 . 175794) (TTECHO.TO.FILE 175796
+ . 179344) (TTGIVEHELP 179346 . 180611) (TTGIVEHELP1 180613 . 181195) (TTGIVEHELP2 181197 . 181892) (
+TTLASTLINE 181894 . 182262) (TTLOADBUF 182264 . 185778) (TTNEXTLINE 185780 . 186100) (TTNEXTNODE 
+186102 . 186341) (TTNLEFT 186343 . 187570) (TTNTH 187572 . 188031) (TTNTHLINE 188033 . 188565) (
+TTPRIN1 188567 . 192380) (TTPRINSPACE 192382 . 192775) (TTPRIN1COMMENT 192777 . 193101) (TTPRIN2 
+193103 . 195422) (TTPROMPTCHAR 195424 . 196320) (TTRUBOUT 196322 . 197285) (TTUNREADBUF 197287 . 
+197696) (TTWAITFORINPUT 197698 . 201906) (TTYINSTRING 201908 . 202867) (TYPE.BUFFER 202869 . 204621) (
+U-CASECODE 204623 . 204782) (U/L-CASE 204784 . 207382)) (207539 217252 (TTRATOM 207549 . 207993) (
+TTREADLIST 207995 . 208362) (TTSKIPSEPR 208364 . 208738) (TTSKREAD 208740 . 213380) (TTYIN.READ 213382
+ . 217250)) (217299 237343 (FIND.MATCHING.WORD 217309 . 217837) (TTCOMPLETEWORD 217839 . 232267) (
+WORD.MATCHES.BUFFER 232269 . 233829) (TTYIN.SHOW.?ALTERNATIVES 233831 . 237341)) (237377 255687 (
+DO?CMD 237387 . 243289) (TTYIN.PRINTARGS 243291 . 254149) (TTYIN.READ?=ARGS 254151 . 254932) (
+DO?CMD.ERRORHANDLER 254934 . 255685)) (255721 263794 (BEEP 255731 . 255906) (BITBLT.DELETE 255908 . 
+256555) (BITBLT.ERASE 256557 . 256742) (BITBLT.INSERT 256744 . 257055) (DO.CRLF 257057 . 257376) (
+DO.DELETE.LINES 257378 . 258422) (DO.INSERT.LINE 258424 . 260358) (DO.LF 260360 . 260526) (
+ERASE.TO.END.OF.LINE 260528 . 260853) (ERASE.TO.END.OF.PAGE 260855 . 261460) (INSERT.TEXT 261462 . 
+261966) (TTDELSECTION 261968 . 262266) (TTADJUSTWIDTH 262268 . 263132) (TTINSERTSECTION 263134 . 
+263473) (TTSETCURSOR 263475 . 263792)) (263829 268806 (TTYINBUFFERDEVICE 263839 . 265155) (
+TTYINBUFFERSTREAM 265157 . 265919) (TTYINBUFFERBIN 265921 . 266457) (TTYINBUFFERPEEK 266459 . 266937) 
+(TTYINBUFFERREADP 266939 . 267194) (TTYINBUFFEREOFP 267196 . 267448) (TTYINBUFFERBACKPTR 267450 . 
+268002) (TTYINWORDRDTBL 268004 . 268804)) (268967 294524 (DO.MOUSE 268977 . 271734) (
+DO.SHIFTED.SELECTION 271736 . 282175) (COPY.SEGMENT 282177 . 282381) (DELETE.LONG.SEGMENT 282383 . 
+282742) (DELETE.LONG.SEGMENT1 282744 . 285220) (INVERT.LONG.SEGMENT 285222 . 286251) (INVERT.SEGMENT 
+286253 . 287768) (BRACKET.CURRENT.WORD 287770 . 289304) (TTBEFOREPOS 289306 . 290036) (TTNEXTPOS 
+290038 . 290746) (TTRACKMOUSE 290748 . 294522)) (294668 299924 (SETREADFN 294678 . 295156) (
+TTYINENTRYFN 295158 . 295583) (TTYINREADP 295585 . 296050) (TTYINREAD 296052 . 297446) (TTYINFIX 
+297448 . 298647) (CHARMACRO? 298649 . 299216) (TTYINMETA 299218 . 299346) (TTYIN.LASTINPUT 299348 . 
+299922)) (299925 308194 (TTYINEDIT 299935 . 302052) (SIMPLETEXTEDIT 302054 . 305098) (
+SET.TTYINEDIT.WINDOW 305100 . 306251) (TTYIN.PPTOFILE 306253 . 308192)) (308252 308429 (
+MAKE-TTSCRATCHFILE 308262 . 308427)) (308576 309709 (TTYIN.SCRATCHFILE 308586 . 309032) (\TTYIN.RPEOF 
+309034 . 309707)) (309921 313554 (TTYINPROMPTFORWORD 309931 . 313552)))))
 STOP
diff --git a/sources/TTYIN.LCOM b/sources/TTYIN.LCOM
index 4713a4c4..7c0e16d0 100644
Binary files a/sources/TTYIN.LCOM and b/sources/TTYIN.LCOM differ
