diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS
index 8f32114e..143d15c3 100644
--- a/internal/MEDLEY-UTILS
+++ b/internal/MEDLEY-UTILS
@@ -1,27 +1,29 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "28-Jan-2026 11:03:17" {DSK}<Users>larry>il>medley>internal>MEDLEY-UTILS.;3 26880  
+(FILECREATED "16-Apr-2026 22:42:51" {DSK}<home>matt>Interlisp>medley>internal>MEDLEY-UTILS.;2 30564  
 
-      :EDIT-BY "lmm"
+      :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS MAKE-INDEX-HTMLS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES
-                       MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS HCFILES RECOMPILE-ONE 
-                       RECMPL COMPILE-SETUP REMAKEFILES)
+      :CHANGES-TO (FNS HCFILES MAKE-EXPORTS-ALL MAKE-INDEX-HTMLS)
+                  (FUNCTIONS REPORT-AND-GO)
+                  (VARS MEDLEY-UTILSCOMS HC-SKIP-EXTENSIONS)
                   (ADVICE TEDIT.PROMPTPRINT)
 
-      :PREVIOUS-DATE "28-Jan-2026 10:46:02" {DSK}<Users>larry>il>medley>internal>MEDLEY-UTILS.;1)
+      :PREVIOUS-DATE "16-Apr-2026 22:27:40" {DSK}<home>matt>Interlisp>medley>internal>MEDLEY-UTILS.;1
+)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
 
 (RPAQQ MEDLEY-UTILSCOMS
        [(FNS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES)
-        (VARS MEDLEY-FIX-DIRS OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
+        (VARS HC-SKIP-EXTENSIONS MEDLEY-FIX-DIRS OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
         (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH MAKE-WHEREIS-LOOPS)
         (FNS HCFILES MAKE-INDEX-HTMLS)
         (PROP FILETYPE MEDLEY-UTILS)
         (ADVISE TEDIT.PROMPTPRINT)
         (FNS RECOMPILE-ONE RECMPL COMPILE-SETUP REMAKEFILES)
+        (FUNCTIONS REPORT-AND-GO)
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
                                                                              (NLAML)
                                                                              (LAMA])
@@ -140,6 +142,12 @@
     (for X in (OR DIRS MEDLEY-FIX-DIRS) join (FIX-DIRECTORY-DATES (MEDLEYDIR (PRINT X T])
 )
 
+(RPAQQ HC-SKIP-EXTENSIONS
+       (PDF SKIP HTML LCOM DFASL SH SYSOUT DRIBBLE IMPTR DISPLAYFONT WD WIDTHS MEDLEYDISPLAYFONT 
+            PSCFONT ALL DATABASE 1 MD GZ PRESS IP BITMAP EL ELC XFORMS BUGREPORTS SUITE LISTING AWK 
+            DINFOGRAPH HASHFILE BLTCHAR DOC DOCPOINTERS STATUS NOTEFILE ICO ISS BMP PNG PS1 
+            VENUESYSOUT ACE FMC HKB LGC CMD COMMAND HTM SVG XML EXE))
+
 (RPAQQ MEDLEY-FIX-DIRS ("sources" "library" "lispusers" "internal" "greetfiles" "doctools"))
 
 (RPAQQ OKSOURCES (RENAMEFNS VMEM READSYS CASH-FILE HASH-FILE MEDLEYDIR MAKEINIT))
@@ -162,15 +170,18 @@
 (DEFINEQ
 
 (MAKE-EXPORTS-ALL
-  [LAMBDA (OUTFILE)                                        (* ; "Edited  3-Aug-2023 18:34 by frank")
+  [LAMBDA (OUTFILE)                                          (* ; "Edited 15-Apr-2026 16:42 by mth")
+                                                           (* ; "Edited  3-Aug-2023 18:34 by frank")
                                                            (* ; "Edited  9-Mar-2021 16:11 by larry")
-                                                             (* "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/.  Don't know why it does the CORE/RENAME")
-                                                             (* 
-          "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.")
-                                                             (* 
-                        "Edited July 5, 1990 by Sybalsky -- point it to Pele as the truth directory.")
-                                                             (* 
-                                                             "Edited September 29, 1986 by van Melle")
+
+    (* ;; "Edited May 3, 2018 by Ron Kaplan--relative to MEDLEYDIR/lispcore/.  Don't know why it does the CORE/RENAME")
+
+    (* ;; "Edited Aug 17 94 by Sybalsky -- point it to /king/export/lispcore as the truth directory.")
+
+    (* ;; "Edited July 5, 1990 by Sybalsky -- point it to Pele as the truth directory.")
+
+    (* ;; "Edited September 29, 1986 by van Melle")
+
     (CNDIR (MEDLEYDIR "sources"))
     (LOAD 'FILESETS)
     (GATHEREXPORTS EXPORTFILES (OR OUTFILE "exports.all"])
@@ -204,7 +215,8 @@
 (DEFINEQ
 
 (HCFILES
-  [LAMBDA (BASE REDO SUBSETS)                                (* ; "Edited 30-Jun-2024 08:27 by lmm")
+  [LAMBDA (BASE REDO SUBSETS)                                (* ; "Edited 16-Apr-2026 22:42 by mth")
+                                                             (* ; "Edited 30-Jun-2024 08:27 by lmm")
                                                              (* ; "Edited 23-Apr-2024 23:15 by lmm")
                                                              (* ; "Edited 22-Apr-2024 13:22 by lmm")
                                                              (* ; "Edited  5-Feb-2024 12:16 by lmm")
@@ -213,74 +225,116 @@
 
 (* ;;;; "BASE is the root directory. Doesn't replace PDF files except when REDO")
 
-(* ;;; " SUBSETS is some combinsyion og (:YRDY :HYML :PRETTY and INDEX")
+(* ;;; " SUBSETS is some combination of (:YRDY :HYML :PRETTY and INDEX")
 
-    (LET
-     [[DIRLIST (LIST (OR BASE (PSEUDOFILENAME (MEDLEYDIR]
-      (PHASES (OR SUBSETS '(TEDIT PRETTY INDEX HRULE]
-     (FILESLOAD PDFSTREAM SKETCH)
-     (FONTSET 'STANDARD)
-     (while DIRLIST
-        do
-        (SETQ BASE (pop DIRLIST))
-        (for SRCPATH in (DIRECTORY (CONCAT BASE "*.*;"))
-           do (PROG* [(SRC (UNPACKFILENAME SRCPATH))
-                      [EXT (U-CASE (LISTGET SRC 'EXTENSION]
-                      (DIR (LISTGET SRC 'DIRECTORY))
-                      FRDY LDGP DEST (NOV (PACKFILENAME `(VERSION NIL ,@SRC]
-                     (CL:FORMAT T "Starting on ~a :~%%" SRCPATH)
-                     (CL:WHEN (DIRECTORYNAMEP SRCPATH)
+    (LET* ([DIRLIST (LIST (OR BASE (PSEUDOFILENAME (MEDLEYDIR]
+           [PHASES (OR SUBSETS '(TEDIT PRETTY INDEX HRULE]
+           (DOTEDIT (MEMB 'TEDIT PHASES))
+           (DOPRETTY (MEMB 'PRETTY PHASES)))
+          (FILESLOAD PDFSTREAM SKETCH)
+          (FONTSET 'STANDARD)
+          (while DIRLIST
+             do (SETQ BASE (pop DIRLIST)) 
 
-                         (* ;; "any directory names, push them off and do them in another phase")
+                (* ;; "Breadth-first processing")
 
-                         (CL:UNLESS (OR (STRPOS ">." NOV)
-                                        (INFILEP (CONCAT NOV ".skip")))
-                             (SETQ DIRLIST (NCONC1 DIRLIST SRCPATH)))
-                         (RETURN))
-                     (CL:WHEN 
-                         (MEMB EXT
-                               '(PDF SKIP HTML LCOM DFASL SH SYSOUT DRIBBLE IMPTR DISPLAYFONT ALL 
-                                     DATABASE))
+                (for SRCPATH in (DIRECTORY (CONCAT BASE "*.*;"))
+                   do (PROG* ((SRC (UNPACKFILENAME SRCPATH))
+                              [EXT (U-CASE (LISTGET SRC 'EXTENSION]
+                              (DIR (LISTGET SRC 'DIRECTORY))
+                              [NAME (U-CASE (LISTGET SRC 'NAME]
+                              [NOV (PACKFILENAME.STRING `(VERSION NIL ,@SRC]
+                              LSFP DEST)
+                             (CL:WHEN (DIRECTORYNAMEP SRCPATH)
 
-                         (* ;; "ignore any of these extensions")
+                                 (* ;; 
+                                 "any directory names, push them off and do them in another phase")
 
-                         (RETURN))
+                                 (if [NOT (OR (STRPOS "<." NOV)
+                                              (CL:SEARCH "<LOADUPS>" NOV :TEST #'CL:CHAR-EQUAL)
+                                              (STRPOS ">." NOV)
+                                              (INFILEP (CONCAT NOV ".skip"]
+                                     then (SETQ DIRLIST (NCONC1 DIRLIST SRCPATH))
+                                          (CL:FORMAT T "~&Deferring to later ~a~%%" SRCPATH)
+                                   else (CL:FORMAT T "~&Skipping ~a~%%" SRCPATH))
+                                 (RETURN))
 
-               (* ;; 
-               " doesnt (yet) implement  / to - translattion. .readme should show up as -.readme.")
+                       (* ;; "Fixup files that start with . and have no other extension")
 
-                     (SETQ DEST (CONCAT NOV ".pdf"))
-                     (CL:WHEN (AND (NOT REDO)
-                                   (INFILEP DEST))
-                         (CL:FORMAT T "~a already there~%%" DEST)
-                         (RETURN))
-                     (CL:WHEN (INFILEP (CONCAT DEST ".skip"))
-                         (PRINTOUT T "Explicit .skip " DEST T)
-                         (RETURN))
-                     (if (MEMB 'TEDIT PHASES)
-                         then (CL:WHEN [OR (MEMB EXT '(TEDIT TED SKETCH BRAVO))
-                                           (CAR (NLSETQ (TEDIT.FORMATTEDFILEP SRCPATH]
-                                  (if (EQ REDO 'TEST)
-                                      then (CL:FORMAT T "Testing open ~a..." SRCPATH)
-                                           (CLOSEF? (OPENTEXTSTREAM SRCPATH))
-                                    else (OR [NLSETQ (CL:WITH-OPEN-STREAM (S (OPENTEXTSTREAM SRCPATH)
-                                                                             )
-                                                            (TEDIT.FORMAT.HARDCOPY S DEST T NIL NIL 
-                                                                   NIL 'PDF]
-                                             (PRINT 'FAIL T)))
-                                  (CL:FORMAT T "DONE")))
-                     (CL:WHEN (AND (MEMB 'PRETTY PHASES)
-                                   (MEMB EXT '(NIL IL))
-                                   [SETQ LSFP (CAR (NLSETQ (LISPSOURCEFILEP SRCPATH]
-                                   (NEQ LSFP *COMMON-LISP-READ-ENVIRONMENT*))
-                         (PRINTOUT T "PDF printing " " to " DEST "...")
-                         (OR (NLSETQ (CL:WITH-OPEN-STREAM (STR (OPEN-PDF-STREAM DEST))
-                                            (PRETTYFILEINDEX SRCPATH NIL STR)))
-                             (PRINT 'FAIL T))
-                         (PRINTOUT T "DONE" T))])
+                             (CL:WHEN (AND (NULL EXT)
+                                           (EQ (CHCON1 NAME)
+                                               (CHARCODE %.)))
+                                 (SETQ EXT (SUBATOM NAME 2)))
+                             (CL:WHEN (MEMB EXT HC-SKIP-EXTENSIONS)
+
+                                 (* ;; "ignore any of these extensions")
+
+                                 (CL:FORMAT T "~&Ignoring (on extension): ~a~%%" SRCPATH)
+                                 (RETURN))
+
+                       (* ;; 
+                  " doesn't (yet) implement  / to - translation. .readme should show up as -.readme.")
+
+                             (SETQ DEST (CONCAT NOV ".pdf"))
+                             (CL:WHEN (AND (NOT REDO)
+                                           (INFILEP DEST))
+                                 (CL:FORMAT T "~a is already there~%%" DEST)
+                                 (RETURN))
+                             (CL:WHEN (INFILEP (CONCAT DEST ".skip"))
+                                 (CL:FORMAT T "Explicit .skip ~a~%%" DEST)
+                                 (RETURN))
+                             (CL:FORMAT T "~&Starting on ~a:~%%" SRCPATH)
+                             (CL:WHEN [AND DOTEDIT (OR (MEMB EXT '(TEDIT TED SKETCH BRAVO))
+                                                       (CAR (REPORT-AND-GO (TEDIT.FORMATTEDFILEP
+                                                                            SRCPATH)
+                                                                   (CL:FORMAT NIL 
+                                                "~~%%~S TEDIT.FORMATTEDFILEP of ~A -- Condition: ~~A"
+                                                                          'FAIL SRCPATH]
+                                 (if (EQ REDO 'TEST)
+                                     then (CL:FORMAT T "Testing open ~a..." SRCPATH)
+                                          (CLOSEF? (OPENTEXTSTREAM SRCPATH))
+                                   else (REPORT-AND-GO (CL:WITH-OPEN-STREAM (S (OPENTEXTSTREAM 
+                                                                                      SRCPATH))
+                                                              (TEDIT.FORMAT.HARDCOPY S DEST T NIL NIL
+                                                                     NIL 'PDF))
+                                               (CL:FORMAT NIL 
+                                               "~~%%~S TEDIT.FORMAT.HARDCOPY of ~A -- Condition: ~~A"
+                                                      'FAIL SRCPATH)))
+                                 (PRIN3 " DONE" T)
+                                 (TERPRI T)
+                                 (RETURN))
+                             (CL:WHEN (AND DOPRETTY (OR (NULL EXT)
+                                                        (EQ EXT 'IL))
+                                           [SETQ LSFP (CAR (REPORT-AND-GO (LISPSOURCEFILEP SRCPATH)
+                                                                  (CL:FORMAT NIL 
+                                                     "~~%%~S LISPSOURCEFILEP of ~A -- Condition: ~~A"
+                                                                         'FAIL SRCPATH]
+                                           (NEQ LSFP *COMMON-LISP-READ-ENVIRONMENT*))
+
+                                 (* ;; "Why the check for NEQ *COMMON-LISP-READ-ENVIRONMENT* ??")
+
+                                 (PRIN3 "PDF printing " T)
+                                 (PRIN3 SRCPATH T)
+                                 (PRIN3 " to " T)
+                                 (PRIN3 DEST T)
+                                 (PRIN3 " ..." T)
+                                 (REPORT-AND-GO (CL:WITH-OPEN-STREAM (STR (OPEN-PDF-STREAM DEST))
+                                                       (PRETTYFILEINDEX SRCPATH NIL STR))
+                                        (CL:FORMAT NIL 
+                                               "~~%%~S PRETTYFILEINDEX of ~A -- Condition: ~~A"
+                                               'FAIL SRCPATH))
+                                 (PRIN3 " DONE" T)
+                                 (TERPRI T)
+                                 (RETURN))
+
+                       (* ;; "Everything else")
+
+                             (PRIN3 "No processing." T)
+                             (TERPRI T])
 
 (MAKE-INDEX-HTMLS
-  [LAMBDA (BASE TOP LEVEL ROOT.NAME)                         (* ; "Edited 28-Jan-2026 11:01 by lmm")
+  [LAMBDA (BASE TOP LEVEL ROOT.NAME)                         (* ; "Edited 15-Apr-2026 16:33 by mth")
+                                                             (* ; "Edited 28-Jan-2026 11:01 by lmm")
                                                              (* ; "Edited 27-Jan-2026 10:50 by lmm")
                                                              (* ; "Edited 23-Jan-2026 11:59 by lmm")
                                                              (* ; "Edited 29-Apr-2024 14:18 by lmm")
@@ -339,8 +393,8 @@
                                                                then 2
                                                              else 1))
                                                         -2)))
-                         (CL:UNLESS (OR (MEMB SHORTNAME '(.git))
-                                        (MEMB SHORTNAME '(.GIT))
+                         (CL:UNLESS (OR (EQ SHORTNAME '.git)
+                                        (EQ SHORTNAME '.GIT)
                                         [AND (STRPOS ".git" (L-CASE FULLNAME))
                                              (NOT (STRPOS ".github" (L-CASE FULLNAME]
                                         (INFILEP (CONCAT FULLNAME ".skip")))
@@ -372,7 +426,8 @@
 
 (PUTPROPS MEDLEY-UTILS FILETYPE :COMPILE-FILE)
 
-[XCL:REINSTALL-ADVICE 'TEDIT.PROMPTPRINT :BEFORE '((:LAST (PRIN1 MSG T)))
+[XCL:REINSTALL-ADVICE 'TEDIT.PROMPTPRINT :BEFORE '[(:LAST (PROGN (PRIN3 " " T)
+                                                                 (PRIN3 MSG T]
        :AFTER
        '((:LAST (AND (STRPOS "GETFN" MSG)
                      (HELP MSG]
@@ -463,6 +518,15 @@
                (SETQ DIFF (COMPARESOURCES X DESTFILE NIL))
                (TERPRI])
 )
+
+(DEFMACRO REPORT-AND-GO (FORM REPORT-FORMAT)                 (* ; "Edited 16-Apr-2026 16:02 by mth")
+   `[CL:MULTIPLE-VALUE-BIND (FORM-RESULT ERROR-CONDITION)
+           (IGNORE-ERRORS (CL:VALUES ,FORM))                 (* ; "Only the first value")
+           (COND
+              (ERROR-CONDITION (PRIN3 (CL:FORMAT NIL ,REPORT-FORMAT ERROR-CONDITION)
+                                      T)
+                     NIL)
+              (T (LIST FORM-RESULT])
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 
 
 (ADDTOVAR NLAMA )
@@ -472,9 +536,10 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1312 8246 (GATHER-INFO 1322 . 6704) (MAKE-FULLER-DB 6706 . 7615) (MEDLEY-FIX-LINKS 7617
- . 8010) (MEDLEY-FIX-DATES 8012 . 8244)) (9425 12213 (MAKE-EXPORTS-ALL 9435 . 10494) (
-MAKE-WHEREIS-HASH 10496 . 11685) (MAKE-WHEREIS-LOOPS 11687 . 12211)) (12214 21862 (HCFILES 12224 . 
-16487) (MAKE-INDEX-HTMLS 16489 . 21860)) (22112 26724 (RECOMPILE-ONE 22122 . 24019) (RECMPL 24021 . 
-24624) (COMPILE-SETUP 24626 . 25250) (REMAKEFILES 25252 . 26722)))))
+  (FILEMAP (NIL (1289 8223 (GATHER-INFO 1299 . 6681) (MAKE-FULLER-DB 6683 . 7592) (MEDLEY-FIX-LINKS 7594
+ . 7987) (MEDLEY-FIX-DATES 7989 . 8221)) (9795 12371 (MAKE-EXPORTS-ALL 9805 . 10652) (
+MAKE-WHEREIS-HASH 10654 . 11843) (MAKE-WHEREIS-LOOPS 11845 . 12369)) (12372 24990 (HCFILES 12382 . 
+19514) (MAKE-INDEX-HTMLS 19516 . 24988)) (25324 29936 (RECOMPILE-ONE 25334 . 27231) (RECMPL 27233 . 
+27836) (COMPILE-SETUP 27838 . 28462) (REMAKEFILES 28464 . 29934)) (29938 30408 (REPORT-AND-GO 29938 . 
+30408)))))
 STOP
diff --git a/internal/MEDLEY-UTILS.DFASL b/internal/MEDLEY-UTILS.DFASL
index 00401e75..d375d4f3 100644
Binary files a/internal/MEDLEY-UTILS.DFASL and b/internal/MEDLEY-UTILS.DFASL differ
diff --git a/internal/loadups/LOADUP-FULL b/internal/loadups/LOADUP-FULL
index f6289eff..00240f7e 100644
--- a/internal/loadups/LOADUP-FULL
+++ b/internal/loadups/LOADUP-FULL
@@ -1,12 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "14-Feb-2026 00:42:39" {WMEDLEY}<internal>loadups>LOADUP-FULL.;38 5967   
+(FILECREATED "28-Apr-2026 10:01:06" {WMEDLEY}<internal>loadups>LOADUP-FULL.;47 5896   
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS LOADUP-FULL)
 
-      :PREVIOUS-DATE "13-Feb-2026 00:47:52" {WMEDLEY}<internal>loadups>LOADUP-FULL.;37)
+      :PREVIOUS-DATE "16-Apr-2026 09:37:27" {WMEDLEY}<internal>loadups>LOADUP-FULL.;46)
 
 
 (PRETTYCOMPRINT LOADUP-FULLCOMS)
@@ -16,7 +16,8 @@
 (DEFINEQ
 
 (LOADFULLFONTS
-  [LAMBDA NIL                                                (* ; "Edited 20-Sep-2025 14:17 by rmk")
+  [LAMBDA NIL                                                (* ; "Edited 16-Apr-2026 09:37 by rmk")
+                                                             (* ; "Edited 20-Sep-2025 14:17 by rmk")
                                                              (* ; "Edited  2-Sep-2025 20:06 by rmk")
                                                              (* ; "Edited 13-Jul-2025 11:40 by rmk")
                                                              (* ; "Edited 30-Jun-2025 00:04 by rmk")
@@ -27,11 +28,8 @@
 
     (* ;; " Don't do Interpress. Do character set 0 and the symbol character sets 41Q, 42Q, 356Q, 357Q and extended and accented Latin 43Q and 361Q")
 
-    (PRINTOUT T "Loading FULL fonts..." T)
+    (PRINTOUT T T "Loading FULL fonts..." T)
     (SETQ *POSTSCRIPT-FILE-TYPE* 'TEXT)
-
-    (* ;; "Previous code reset the coercion variables to NIL, which would have resulted in glyph-incomplete charsets. With Medley-formatted fonts, the completions have already been installed in the files and there is no need to deal with those variables.")
-
     (for FAMILY in '(CLASSIC MODERN TERMINAL)
        do (PRINTOUT T "  Loading " FAMILY " ")
           [for SIZE in '(8 10 12)
@@ -47,7 +45,8 @@
     (PRINTOUT T "FULL fonts loaded" T])
 
 (LOADUP-FULL
-  [LAMBDA (DRIBBLEFILE)                                      (* ; "Edited 14-Feb-2026 00:42 by rmk")
+  [LAMBDA (DRIBBLEFILE)                                      (* ; "Edited 28-Apr-2026 10:00 by rmk")
+                                                             (* ; "Edited 14-Feb-2026 00:42 by rmk")
                                                              (* ; "Edited  5-Feb-2026 10:26 by rmk")
                                                              (* ; "Edited 28-Dec-2025 12:06 by rmk")
                                                              (* ; "Edited  1-Sep-2025 11:59 by rmk")
@@ -86,8 +85,7 @@
 
     (LOADUP '(CHAT INTERPRESS TEDIT HRULE TEDIT-CHAT READNUMBER EDITBITMAP FILEBROWSER THINFILES 
                    GRAPHER SPY WHERE-IS COPYFILES MSANALYZE MSPARSE MASTERSCOPE UNIXPRINT HELPSYS 
-                   DINFO CLIPBOARD MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE UNIXCOMM UNIXCHAT 
-                   UNIXYCD))
+                   DINFO CLIPBOARD MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE UNIXCOMM UNIXCHAT))
     (LOADFULLFONTS)
     (COND
        ((WINDOWP *WHO-LINE*)
@@ -103,5 +101,5 @@
 
 (FIXMETA)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (456 5929 (LOADFULLFONTS 466 . 2601) (LOADUP-FULL 2603 . 5679) (FIXMETA 5681 . 5927)))))
+  (FILEMAP (NIL (456 5858 (LOADFULLFONTS 466 . 2449) (LOADUP-FULL 2451 . 5608) (FIXMETA 5610 . 5856)))))
 STOP
diff --git a/internal/loadups/LOADUP-FULL.LCOM b/internal/loadups/LOADUP-FULL.LCOM
index b6d976e2..e2f4fb9e 100644
Binary files a/internal/loadups/LOADUP-FULL.LCOM and b/internal/loadups/LOADUP-FULL.LCOM differ
diff --git a/library/GRAPHER b/library/GRAPHER
index 6a3331bf..4ec08f14 100644
--- a/library/GRAPHER
+++ b/library/GRAPHER
@@ -1,21 +1,18 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "14-Mar-2021 20:40:30" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>GRAPHER.;5 214171 
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-      changes to%:  (VARS GRAPHERCOMS)
+(FILECREATED "14-Apr-2026 22:19:19" {DSK}<home>frank>il>medley>library>GRAPHER.;3 215302 
 
-      previous date%: "14-May-2018 10:24:38" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>GRAPHER.;4)
+      :EDIT-BY "FGH"
 
+      :CHANGES-TO (FNS DISPLAYLINK/RL DISPLAYLINK/LR DISPLAYLINK/BT DISPLAYLINK/TB)
+
+      :PREVIOUS-DATE "14-Mar-2021 20:40:30" {DSK}<home>frank>il>medley>library>GRAPHER.;1)
 
-(* ; "
-Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT GRAPHERCOMS)
 
 (RPAQQ GRAPHERCOMS
-       [(COMS                                                (* ; "Graph Editing")
+       [(COMS                                                (* ; "Graph Editing")
               (FNS ADD/AND/DISPLAY/LINK APPLYTOSELECTEDNODE CALL.MOVENODEFN CHANGE.NODEFONT.SIZE 
                    DEFAULT.ADDNODEFN DELETE/AND/DISPLAY/LINK DISPLAY/NAME DISPLAYGRAPH DISPLAYLINK 
                    DISPLAYLINK/BT DISPLAYLINK/LR DISPLAYLINK/RL DISPLAYLINK/TB DISPLAYNODE 
@@ -38,18 +35,18 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
                  (CL:WHEN (GETD 'MODERNWINDOW.SETUP)
                      (MODERNWINDOW.SETUP 'APPLYTOSELECTEDNODE))]
               
-              (* ;; "Support for EDITSUBGRAPH and EDITREGION")
+              (* ;; "Support for EDITSUBGRAPH and EDITREGION")
 
               (FNS EDITMOVEREGION EDITMOVESUBTREE NOT.TRACKCURSOR RECURSIVE.COLLECTDESCENDENTS 
                    MOVEDESCENDENTS COLLECT.CHILD.NODES CREATE.NEW.NODEPOSITION 
                    GETBOXPOSITION.FROMINITIALREGION COLLECTDESCENDENTS))
-        (COMS                                                (* ; 
-                                                   "functions for finding larger and smaller fonts")
+        (COMS                                                (* ; 
+                                                     "functions for finding larger and smaller fonts")
               (FNS NEXTSIZEFONT DECREASING.FONT.LIST SCALE.FONT)
               [DECLARE%: DONTEVAL@LOAD DOCOPY (VARS (DECREASING.FONT.LIST (DECREASING.FONT.LIST]
               (GLOBALVARS DECREASING.FONT.LIST))
-                                                             (* ; 
-                                                      "functions for LAYOUTGRAPH And LAYOUTLATTICE")
+                                                             (* ; 
+                                                        "functions for LAYOUTGRAPH And LAYOUTLATTICE")
         (FNS BRH/LAYOUT BRH/LAYOUT/DAUGHTERS BRH/OFFSET BRHC/INTERTREE/SPACE BRHC/LAYOUT 
              BRHC/LAYOUT/DAUGHTERS BRHC/LAYOUT/TERMINAL BRHC/OFFSET BRHL/LAYOUT BRHL/LAYOUT/DAUGHTERS
              BRHL/MOVE/RIGHT BROWSE/LAYOUT/HORIZ BROWSE/LAYOUT/HORIZ/COMPACTLY BROWSE/LAYOUT/LATTICE
@@ -95,7 +92,7 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
         (LOCALVARS . T)
         (RECORDS GRAPHNODE GRAPH)
         (DECLARE%: DONTCOPY (MACROS HALF))
-        (COMS                                                (* ; "Grapher image objects")
+        (COMS                                                (* ; "Grapher image objects")
               (FNS GRAPHERIMAGEFNS)
               (FNS GRAPHERCOPYBUTTONEVENTFN GRAPHOBJ.FINDGRAPH)
               (FNS ALIGNMENTNODE GRAPHOBJ.CHECKALIGN)
@@ -303,96 +300,112 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
                 NIL])
 
 (DISPLAYLINK/BT
-  [LAMBDA (TRANS GNB GNT WIDTH OPERATION STREAM PARAMS)
+  [LAMBDA (TRANS GNB GNT WIDTH OPERATION STREAM PARAMS)      (* ; "Edited 14-Apr-2026 22:08 by FGH")
                                                           (* ; "Edited 29-Apr-94 13:59 by sybalsky")
 
-         (* draws a line from the bottom edge of GNB to the top edge of GNT translated 
-       by TRANS)
+         (* draws a line from the bottom edge of GNB to the top edge of GNT translated by 
+         TRANS)
 
-    (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN)
-                'DRAWLINE)
-           (IPLUS (fetch XCOORD of TRANS)
-                  (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (SUB1 (GN/BOTTOM GNB)))
-           (IPLUS (fetch XCOORD of TRANS)
-                  (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (ADD1 (GN/TOP GNT)))
-           (OR (LISTGET PARAMS 'LINEWIDTH)
-               WIDTH 1)
-           OPERATION STREAM (LISTGET PARAMS 'COLOR)
-           (LISTGET PARAMS 'DASHING)
-           PARAMS])
+    (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN))
+           (DFN (AND FN (GETD FN]
+          (if (AND FN (NOT DFN))
+              then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND")))
+          (APPLY* (OR (AND DFN FN)
+                      'DRAWLINE)
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (SUB1 (GN/BOTTOM GNB)))
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (ADD1 (GN/TOP GNT)))
+                 (OR (LISTGET PARAMS 'LINEWIDTH)
+                     WIDTH 1)
+                 OPERATION STREAM (LISTGET PARAMS 'COLOR)
+                 (LISTGET PARAMS 'DASHING)
+                 PARAMS])
 
 (DISPLAYLINK/LR
-  [LAMBDA (TRANS GNL GNR WIDTH OPERATION STREAM PARAMS)
+  [LAMBDA (TRANS GNL GNR WIDTH OPERATION STREAM PARAMS)      (* ; "Edited 14-Apr-2026 22:09 by FGH")
                                                           (* ; "Edited 29-Apr-94 13:59 by sybalsky")
 
-         (* draws a line from the left edge of GNL to the right edge of GNR, translated 
-       by TRANS)
+         (* draws a line from the left edge of GNL to the right edge of GNR, translated by 
+         TRANS)
 
-    (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN)
-                'DRAWLINE)
-           (IPLUS (fetch XCOORD of TRANS)
-                  (SUB1 (GN/LEFT GNL)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL)))
-           (IPLUS (fetch XCOORD of TRANS)
-                  (ADD1 (GN/RIGHT GNR)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR)))
-           (OR (LISTGET PARAMS 'LINEWIDTH)
-               WIDTH 1)
-           OPERATION STREAM (LISTGET PARAMS 'COLOR)
-           (LISTGET PARAMS 'DASHING)
-           PARAMS])
+    (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN))
+           (DFN (AND FN (GETD FN]
+          (if (AND FN (NOT DFN))
+              then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND")))
+          (APPLY* (OR (AND DFN FN)
+                      'DRAWLINE)
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (SUB1 (GN/LEFT GNL)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL)))
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (ADD1 (GN/RIGHT GNR)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR)))
+                 (OR (LISTGET PARAMS 'LINEWIDTH)
+                     WIDTH 1)
+                 OPERATION STREAM (LISTGET PARAMS 'COLOR)
+                 (LISTGET PARAMS 'DASHING)
+                 PARAMS])
 
 (DISPLAYLINK/RL
-  [LAMBDA (TRANS GNR GNL WIDTH OPERATION STREAM PARAMS)
+  [LAMBDA (TRANS GNR GNL WIDTH OPERATION STREAM PARAMS)      (* ; "Edited 14-Apr-2026 22:09 by FGH")
                                                           (* ; "Edited 29-Apr-94 13:59 by sybalsky")
 
-         (* draws a line from the right edge of GNR, to the left edge of GNL translated 
-       by TRANS)
+         (* draws a line from the right edge of GNR, to the left edge of GNL translated by 
+         TRANS)
 
-    (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN)
-                'DRAWLINE)
-           (IPLUS (fetch XCOORD of TRANS)
-                  (ADD1 (GN/RIGHT GNR)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR)))
-           (IPLUS (fetch XCOORD of TRANS)
-                  (SUB1 (GN/LEFT GNL)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL)))
-           (OR (LISTGET PARAMS 'LINEWIDTH)
-               WIDTH 1)
-           OPERATION STREAM (LISTGET PARAMS 'COLOR)
-           (LISTGET PARAMS 'DASHING)
-           PARAMS])
+    (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN))
+           (DFN (AND FN (GETD FN]
+          (if (AND FN (NOT DFN))
+              then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND")))
+          (APPLY* (OR (AND DFN FN)
+                      'DRAWLINE)
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (ADD1 (GN/RIGHT GNR)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNR)))
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (SUB1 (GN/LEFT GNL)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (fetch YCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNL)))
+                 (OR (LISTGET PARAMS 'LINEWIDTH)
+                     WIDTH 1)
+                 OPERATION STREAM (LISTGET PARAMS 'COLOR)
+                 (LISTGET PARAMS 'DASHING)
+                 PARAMS])
 
 (DISPLAYLINK/TB
-  [LAMBDA (TRANS GNT GNB WIDTH OPERATION STREAM PARAMS)
+  [LAMBDA (TRANS GNT GNB WIDTH OPERATION STREAM PARAMS)      (* ; "Edited 14-Apr-2026 22:09 by FGH")
                                                           (* ; "Edited 29-Apr-94 13:59 by sybalsky")
 
-         (* draws a line from the top edge of GNT to the bottom edge of GNR, translated 
-       by TRANS)
+         (* draws a line from the top edge of GNT to the bottom edge of GNR, translated by 
+         TRANS)
 
-    (APPLY* (OR (LISTGET PARAMS 'DRAWLINKFN)
-                'DRAWLINE)
-           (IPLUS (fetch XCOORD of TRANS)
-                  (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (ADD1 (GN/TOP GNT)))
-           (IPLUS (fetch XCOORD of TRANS)
-                  (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB)))
-           (IPLUS (fetch YCOORD of TRANS)
-                  (SUB1 (GN/BOTTOM GNB)))
-           (OR (LISTGET PARAMS 'LINEWIDTH)
-               WIDTH 1)
-           OPERATION STREAM (LISTGET PARAMS 'COLOR)
-           (LISTGET PARAMS 'DASHING)
-           PARAMS])
+    (LET* [(FN (LISTGET PARAMS 'DRAWLINKFN))
+           (DFN (AND FN (GETD FN]
+          (if (AND FN (NOT DFN))
+              then (PROMPTPRINT (CONCAT "DISPLAYLINK: DRAWLINKFN " FN " NOT FOUND")))
+          (APPLY* (OR (AND DFN FN)
+                      'DRAWLINE)
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNT)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (ADD1 (GN/TOP GNT)))
+                 (IPLUS (fetch XCOORD of TRANS)
+                        (fetch XCOORD of (fetch (GRAPHNODE NODEPOSITION) of GNB)))
+                 (IPLUS (fetch YCOORD of TRANS)
+                        (SUB1 (GN/BOTTOM GNB)))
+                 (OR (LISTGET PARAMS 'LINEWIDTH)
+                     WIDTH 1)
+                 OPERATION STREAM (LISTGET PARAMS 'COLOR)
+                 (LISTGET PARAMS 'DASHING)
+                 PARAMS])
 
 (DISPLAYNODE
   [LAMBDA (NODE TRANS STREAM G TOSONLY)                  (* kvl "10-Aug-84 19:08")
@@ -2014,7 +2027,7 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
                                                                                 of N])
 )
 
-                                                             (* Was MODERNIZE loaded before?)
+                                                             (* Was MODERNIZE loaded before?)
 
 (CL:WHEN (GETD 'MODERNWINDOW.SETUP)
     (MODERNWINDOW.SETUP 'APPLYTOSELECTEDNODE))
@@ -3075,7 +3088,7 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
 (RPAQQ GRAPH/HARDCOPY/FORMAT (MODE PORTRAIT PAGENUMBERS T TRANS NIL))
 
 (RPAQ? DEFAULT.GRAPH.WINDOWSIZE (LIST (TIMES SCREENWIDTH 0.7)
-                                          (TIMES SCREENHEIGHT 0.4)))
+                                      (TIMES SCREENHEIGHT 0.4)))
 
 (RPAQ? EDITGRAPHMENUCOMMANDS
        '((Move% Node 'MOVENODE "Moves a single node in the graph." (SUBITEMS (|Move Single Node|
@@ -3113,19 +3126,19 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
 (DECLARE%: EVAL@COMPILE
 
 (RECORD GRAPHNODE (NODEID NODEPOSITION NODELABELBITMAP NIL NODELABELSHADE NODEWIDTH NODEHEIGHT 
-                             TONODES FROMNODES NODEFONT NODELABEL NODEBORDER)
-                      NODEBORDER _ DEFAULT.GRAPH.NODEBORDER NODELABELSHADE _ 
-                      DEFAULT.GRAPH.NODELABELSHADE NODEFONT _ DEFAULT.GRAPH.NODEFONT)
+                         TONODES FROMNODES NODEFONT NODELABEL NODEBORDER)
+                  NODEBORDER _ DEFAULT.GRAPH.NODEBORDER NODELABELSHADE _ DEFAULT.GRAPH.NODELABELSHADE
+                  NODEFONT _ DEFAULT.GRAPH.NODEFONT)
 
-(RECORD GRAPH (GRAPHNODES SIDESFLG DIRECTEDFLG GRAPH.MOVENODEFN GRAPH.ADDNODEFN 
-                         GRAPH.DELETENODEFN GRAPH.ADDLINKFN GRAPH.DELETELINKFN GRAPH.FONTCHANGEFN 
-                         GRAPH.INVERTBORDERFN GRAPH.INVERTLABELFN GRAPH.CHANGELABELFN . GRAPH.PROPS))
+(RECORD GRAPH (GRAPHNODES SIDESFLG DIRECTEDFLG GRAPH.MOVENODEFN GRAPH.ADDNODEFN GRAPH.DELETENODEFN 
+                     GRAPH.ADDLINKFN GRAPH.DELETELINKFN GRAPH.FONTCHANGEFN GRAPH.INVERTBORDERFN 
+                     GRAPH.INVERTLABELFN GRAPH.CHANGELABELFN . GRAPH.PROPS))
 )
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS HALF MACRO ((X)
-                              (LRSH X 1)))
+                      (LRSH X 1)))
 )
 )
 
@@ -3789,61 +3802,59 @@ Copyright (c) 1983-1994, 2018, 2021 by Venue & Xerox Corporation.
 )
 
 (ADDTOVAR IMAGEOBJGETFNS (GRAPHOBJ.GETFN))
-(PUTPROPS GRAPHER COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 
-1992 1993 1994 2018 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (7195 111244 (ADD/AND/DISPLAY/LINK 7205 . 7907) (APPLYTOSELECTEDNODE 7909 . 8397) (
-CALL.MOVENODEFN 8399 . 8748) (CHANGE.NODEFONT.SIZE 8750 . 10062) (DEFAULT.ADDNODEFN 10064 . 10862) (
-DELETE/AND/DISPLAY/LINK 10864 . 12431) (DISPLAY/NAME 12433 . 12604) (DISPLAYGRAPH 12606 . 14977) (
-DISPLAYLINK 14979 . 17532) (DISPLAYLINK/BT 17534 . 18556) (DISPLAYLINK/LR 18558 . 19581) (
-DISPLAYLINK/RL 19583 . 20606) (DISPLAYLINK/TB 20608 . 21631) (DISPLAYNODE 21633 . 21981) (
-ERASE/GRAPHNODE 21983 . 23090) (DISPLAYNODE 23092 . 23440) (DISPLAYNODELINKS 23442 . 24586) (
-DRAW/GRAPHNODE/BORDER 24588 . 25507) (DRAWAREABOX 25509 . 26710) (EDITADDLINK 26712 . 27110) (
-EDITADDNODE 27112 . 29201) (EDITAPPLYTOLINK 29203 . 31282) (EDITCHANGEFONT 31284 . 32456) (
-EDITCHANGELABEL 32458 . 33999) (EDITDELETELINK 34001 . 34407) (EDITDELETENODE 34409 . 37110) (
-EDITGRAPH 37112 . 37179) (EDITGRAPH1 37181 . 37939) (EDITGRAPH2 37941 . 39672) (EDITMOVENODE 39674 . 
-41251) (EDITTOGGLEBORDER 41253 . 42549) (EDITTOGGLELABEL 42551 . 43848) (FILL/GRAPHNODE/LABEL 43850 . 
-44678) (FIX/SCALE 44680 . 45236) (FLIPNODE 45238 . 45842) (FONTNAMELIST 45844 . 46063) (FROMLINKS 
-46065 . 46235) (GETNODEFROMID 46237 . 47256) (GN/BOTTOM 47258 . 47534) (GN/LEFT 47536 . 47809) (
-GN/RIGHT 47811 . 48202) (GN/TOP 48204 . 48628) (GRAPHADDLINK 48630 . 49189) (GRAPHADDNODE 49191 . 
-49980) (GRAPHBUTTONEVENTFN 49982 . 52162) (GRAPHCHANGELABEL 52164 . 52607) (GRAPHDELETELINK 52609 . 
-53917) (GRAPHDELETENODE 53919 . 54451) (GRAPHEDITCOMMANDFN 54453 . 55837) (GRAPHEDITEVENTFN 55839 . 
-56550) (GRAPHER/CENTERPRINTINAREA 56552 . 57316) (GRAPHERPROP 57318 . 57862) (GRAPHNODE/BORDER/WIDTH 
-57864 . 58385) (GRAPHREGION 58387 . 59556) (HARDCOPYGRAPH 59558 . 66940) (INTERSECT/REGIONP/LBWH 66942
- . 68218) (INVERTED/GRAPHNODE/BORDER 68220 . 68804) (INVERTED/SHADE/FOR/GRAPHER 68806 . 69438) (
-LAYOUT/POSITION 69440 . 69619) (LINKPARAMETERS 69621 . 70073) (MAX/RIGHT 70075 . 70277) (MAX/TOP 70279
- . 70477) (MEASUREGRAPHNODE 70479 . 70928) (MEMBTONODES 70930 . 71455) (MIN/BOTTOM 71457 . 71838) (
-MIN/LEFT 71840 . 72215) (MOVENODE 72217 . 73460) (NODECREATE 73462 . 74242) (NODELST/AS/MENU 74244 . 
-75844) (NODEREGION 75846 . 76306) (PRINTDISPLAYNODE 76308 . 81366) (PROMPTINWINDOW 81368 . 84177) (
-READ/NODE 84179 . 85293) (REDISPLAYGRAPH 85295 . 85737) (REMOVETONODES 85739 . 86260) (
-RESET/NODE/BORDER 86262 . 88049) (RESET/NODE/LABELSHADE 88051 . 89566) (SCALE/GRAPH 89568 . 95854) (
-SCALE/GRAPHNODE/BORDER 95856 . 96551) (SCALE/TONODES 96553 . 97434) (SET/LABEL/SIZE 97436 . 100382) (
-SET/LAYOUT/POSITION 100384 . 100869) (SHOWGRAPH 100871 . 102670) (SIZE/GRAPH/WINDOW 102672 . 106156) (
-TOGGLE/DIRECTEDFLG 106158 . 106788) (TOGGLE/SIDESFLG 106790 . 107278) (TOLINKS 107280 . 107446) (
-TRACKCURSOR 107448 . 108855) (TRACKNODE 108857 . 109493) (TRANSGRAPH 109495 . 111242)) (111485 128102 
-(EDITMOVEREGION 111495 . 115298) (EDITMOVESUBTREE 115300 . 117077) (NOT.TRACKCURSOR 117079 . 120057) (
-RECURSIVE.COLLECTDESCENDENTS 120059 . 121547) (MOVEDESCENDENTS 121549 . 123611) (COLLECT.CHILD.NODES 
-123613 . 124729) (CREATE.NEW.NODEPOSITION 124731 . 125271) (GETBOXPOSITION.FROMINITIALREGION 125273 . 
-126745) (COLLECTDESCENDENTS 126747 . 128100)) (128166 130455 (NEXTSIZEFONT 128176 . 129366) (
-DECREASING.FONT.LIST 129368 . 129694) (SCALE.FONT 129696 . 130453)) (130679 169831 (BRH/LAYOUT 130689
- . 132433) (BRH/LAYOUT/DAUGHTERS 132435 . 133381) (BRH/OFFSET 133383 . 134061) (BRHC/INTERTREE/SPACE 
-134063 . 135381) (BRHC/LAYOUT 135383 . 137239) (BRHC/LAYOUT/DAUGHTERS 137241 . 140195) (
-BRHC/LAYOUT/TERMINAL 140197 . 140878) (BRHC/OFFSET 140880 . 141776) (BRHL/LAYOUT 141778 . 144002) (
-BRHL/LAYOUT/DAUGHTERS 144004 . 145762) (BRHL/MOVE/RIGHT 145764 . 146907) (BROWSE/LAYOUT/HORIZ 146909
- . 147633) (BROWSE/LAYOUT/HORIZ/COMPACTLY 147635 . 150441) (BROWSE/LAYOUT/LATTICE 150443 . 151299) (
-BRV/OFFSET 151301 . 152164) (EXTEND/TRANSITION/CHAIN 152166 . 153437) (FOREST/BREAK/CYCLES 153439 . 
-154369) (INIT/NODES/FOR/LAYOUT 154371 . 155866) (INTERPRET/MARK/FORMAT 155868 . 157135) (
-LATTICE/BREAK/CYCLES 157137 . 157841) (LAYOUTFOREST 157843 . 158544) (LAYOUTGRAPH 158546 . 162013) (
-LAYOUTLATTICE 162015 . 163468) (LAYOUTSEXPR 163470 . 164541) (LAYOUTSEXPR1 164543 . 165245) (
-MARK/GRAPH/NODE 165247 . 165977) (NEW/INSTANCE/OF/GRAPHNODE 165979 . 167348) (RAISE/TRANSITION/CHAIN 
-167350 . 167751) (REFLECT/GRAPH/DIAGONALLY 167753 . 168482) (REFLECT/GRAPH/HORIZONTALLY 168484 . 
-169010) (REFLECT/GRAPH/VERTICALLY 169012 . 169536) (SWITCH/NODE/HEIGHT/WIDTH 169538 . 169829)) (173177
- 174528 (GRAPHERIMAGEFNS 173187 . 174526)) (174529 176257 (GRAPHERCOPYBUTTONEVENTFN 174539 . 175518) (
-GRAPHOBJ.FINDGRAPH 175520 . 176255)) (176258 178878 (ALIGNMENTNODE 176268 . 177690) (
-GRAPHOBJ.CHECKALIGN 177692 . 178876)) (178879 194729 (GRAPHEROBJ 178889 . 180635) (
-GRAPHOBJ.BUTTONEVENTINFN 180637 . 182064) (GRAPHOBJ.COPYBUTTONEVENTFN 182066 . 182503) (
-GRAPHOBJ.COPYFN 182505 . 183429) (GRAPHOBJ.DISPLAYFN 183431 . 186246) (GRAPHOBJ.GETALIGN 186248 . 
-186987) (GRAPHOBJ.GETFN 186989 . 188494) (GRAPHOBJ.IMAGEBOXFN 188496 . 192512) (GRAPHOBJ.PUTALIGN 
-192514 . 193344) (GRAPHOBJ.PUTFN 193346 . 194727)) (194730 213882 (COPYGRAPH 194740 . 196288) (
-DUMPGRAPH 196290 . 206546) (READGRAPH 206548 . 213880)))))
+  (FILEMAP (NIL (7149 112538 (ADD/AND/DISPLAY/LINK 7159 . 7861) (APPLYTOSELECTEDNODE 7863 . 8351) (
+CALL.MOVENODEFN 8353 . 8702) (CHANGE.NODEFONT.SIZE 8704 . 10016) (DEFAULT.ADDNODEFN 10018 . 10816) (
+DELETE/AND/DISPLAY/LINK 10818 . 12385) (DISPLAY/NAME 12387 . 12558) (DISPLAYGRAPH 12560 . 14931) (
+DISPLAYLINK 14933 . 17486) (DISPLAYLINK/BT 17488 . 18845) (DISPLAYLINK/LR 18847 . 20205) (
+DISPLAYLINK/RL 20207 . 21565) (DISPLAYLINK/TB 21567 . 22925) (DISPLAYNODE 22927 . 23275) (
+ERASE/GRAPHNODE 23277 . 24384) (DISPLAYNODE 24386 . 24734) (DISPLAYNODELINKS 24736 . 25880) (
+DRAW/GRAPHNODE/BORDER 25882 . 26801) (DRAWAREABOX 26803 . 28004) (EDITADDLINK 28006 . 28404) (
+EDITADDNODE 28406 . 30495) (EDITAPPLYTOLINK 30497 . 32576) (EDITCHANGEFONT 32578 . 33750) (
+EDITCHANGELABEL 33752 . 35293) (EDITDELETELINK 35295 . 35701) (EDITDELETENODE 35703 . 38404) (
+EDITGRAPH 38406 . 38473) (EDITGRAPH1 38475 . 39233) (EDITGRAPH2 39235 . 40966) (EDITMOVENODE 40968 . 
+42545) (EDITTOGGLEBORDER 42547 . 43843) (EDITTOGGLELABEL 43845 . 45142) (FILL/GRAPHNODE/LABEL 45144 . 
+45972) (FIX/SCALE 45974 . 46530) (FLIPNODE 46532 . 47136) (FONTNAMELIST 47138 . 47357) (FROMLINKS 
+47359 . 47529) (GETNODEFROMID 47531 . 48550) (GN/BOTTOM 48552 . 48828) (GN/LEFT 48830 . 49103) (
+GN/RIGHT 49105 . 49496) (GN/TOP 49498 . 49922) (GRAPHADDLINK 49924 . 50483) (GRAPHADDNODE 50485 . 
+51274) (GRAPHBUTTONEVENTFN 51276 . 53456) (GRAPHCHANGELABEL 53458 . 53901) (GRAPHDELETELINK 53903 . 
+55211) (GRAPHDELETENODE 55213 . 55745) (GRAPHEDITCOMMANDFN 55747 . 57131) (GRAPHEDITEVENTFN 57133 . 
+57844) (GRAPHER/CENTERPRINTINAREA 57846 . 58610) (GRAPHERPROP 58612 . 59156) (GRAPHNODE/BORDER/WIDTH 
+59158 . 59679) (GRAPHREGION 59681 . 60850) (HARDCOPYGRAPH 60852 . 68234) (INTERSECT/REGIONP/LBWH 68236
+ . 69512) (INVERTED/GRAPHNODE/BORDER 69514 . 70098) (INVERTED/SHADE/FOR/GRAPHER 70100 . 70732) (
+LAYOUT/POSITION 70734 . 70913) (LINKPARAMETERS 70915 . 71367) (MAX/RIGHT 71369 . 71571) (MAX/TOP 71573
+ . 71771) (MEASUREGRAPHNODE 71773 . 72222) (MEMBTONODES 72224 . 72749) (MIN/BOTTOM 72751 . 73132) (
+MIN/LEFT 73134 . 73509) (MOVENODE 73511 . 74754) (NODECREATE 74756 . 75536) (NODELST/AS/MENU 75538 . 
+77138) (NODEREGION 77140 . 77600) (PRINTDISPLAYNODE 77602 . 82660) (PROMPTINWINDOW 82662 . 85471) (
+READ/NODE 85473 . 86587) (REDISPLAYGRAPH 86589 . 87031) (REMOVETONODES 87033 . 87554) (
+RESET/NODE/BORDER 87556 . 89343) (RESET/NODE/LABELSHADE 89345 . 90860) (SCALE/GRAPH 90862 . 97148) (
+SCALE/GRAPHNODE/BORDER 97150 . 97845) (SCALE/TONODES 97847 . 98728) (SET/LABEL/SIZE 98730 . 101676) (
+SET/LAYOUT/POSITION 101678 . 102163) (SHOWGRAPH 102165 . 103964) (SIZE/GRAPH/WINDOW 103966 . 107450) (
+TOGGLE/DIRECTEDFLG 107452 . 108082) (TOGGLE/SIDESFLG 108084 . 108572) (TOLINKS 108574 . 108740) (
+TRACKCURSOR 108742 . 110149) (TRACKNODE 110151 . 110787) (TRANSGRAPH 110789 . 112536)) (112779 129396 
+(EDITMOVEREGION 112789 . 116592) (EDITMOVESUBTREE 116594 . 118371) (NOT.TRACKCURSOR 118373 . 121351) (
+RECURSIVE.COLLECTDESCENDENTS 121353 . 122841) (MOVEDESCENDENTS 122843 . 124905) (COLLECT.CHILD.NODES 
+124907 . 126023) (CREATE.NEW.NODEPOSITION 126025 . 126565) (GETBOXPOSITION.FROMINITIALREGION 126567 . 
+128039) (COLLECTDESCENDENTS 128041 . 129394)) (129460 131749 (NEXTSIZEFONT 129470 . 130660) (
+DECREASING.FONT.LIST 130662 . 130988) (SCALE.FONT 130990 . 131747)) (131973 171125 (BRH/LAYOUT 131983
+ . 133727) (BRH/LAYOUT/DAUGHTERS 133729 . 134675) (BRH/OFFSET 134677 . 135355) (BRHC/INTERTREE/SPACE 
+135357 . 136675) (BRHC/LAYOUT 136677 . 138533) (BRHC/LAYOUT/DAUGHTERS 138535 . 141489) (
+BRHC/LAYOUT/TERMINAL 141491 . 142172) (BRHC/OFFSET 142174 . 143070) (BRHL/LAYOUT 143072 . 145296) (
+BRHL/LAYOUT/DAUGHTERS 145298 . 147056) (BRHL/MOVE/RIGHT 147058 . 148201) (BROWSE/LAYOUT/HORIZ 148203
+ . 148927) (BROWSE/LAYOUT/HORIZ/COMPACTLY 148929 . 151735) (BROWSE/LAYOUT/LATTICE 151737 . 152593) (
+BRV/OFFSET 152595 . 153458) (EXTEND/TRANSITION/CHAIN 153460 . 154731) (FOREST/BREAK/CYCLES 154733 . 
+155663) (INIT/NODES/FOR/LAYOUT 155665 . 157160) (INTERPRET/MARK/FORMAT 157162 . 158429) (
+LATTICE/BREAK/CYCLES 158431 . 159135) (LAYOUTFOREST 159137 . 159838) (LAYOUTGRAPH 159840 . 163307) (
+LAYOUTLATTICE 163309 . 164762) (LAYOUTSEXPR 164764 . 165835) (LAYOUTSEXPR1 165837 . 166539) (
+MARK/GRAPH/NODE 166541 . 167271) (NEW/INSTANCE/OF/GRAPHNODE 167273 . 168642) (RAISE/TRANSITION/CHAIN 
+168644 . 169045) (REFLECT/GRAPH/DIAGONALLY 169047 . 169776) (REFLECT/GRAPH/HORIZONTALLY 169778 . 
+170304) (REFLECT/GRAPH/VERTICALLY 170306 . 170830) (SWITCH/NODE/HEIGHT/WIDTH 170832 . 171123)) (174438
+ 175789 (GRAPHERIMAGEFNS 174448 . 175787)) (175790 177518 (GRAPHERCOPYBUTTONEVENTFN 175800 . 176779) (
+GRAPHOBJ.FINDGRAPH 176781 . 177516)) (177519 180139 (ALIGNMENTNODE 177529 . 178951) (
+GRAPHOBJ.CHECKALIGN 178953 . 180137)) (180140 195990 (GRAPHEROBJ 180150 . 181896) (
+GRAPHOBJ.BUTTONEVENTINFN 181898 . 183325) (GRAPHOBJ.COPYBUTTONEVENTFN 183327 . 183764) (
+GRAPHOBJ.COPYFN 183766 . 184690) (GRAPHOBJ.DISPLAYFN 184692 . 187507) (GRAPHOBJ.GETALIGN 187509 . 
+188248) (GRAPHOBJ.GETFN 188250 . 189755) (GRAPHOBJ.IMAGEBOXFN 189757 . 193773) (GRAPHOBJ.PUTALIGN 
+193775 . 194605) (GRAPHOBJ.PUTFN 194607 . 195988)) (195991 215143 (COPYGRAPH 196001 . 197549) (
+DUMPGRAPH 197551 . 207807) (READGRAPH 207809 . 215141)))))
 STOP
diff --git a/library/GRAPHER.LCOM b/library/GRAPHER.LCOM
index b2dd5625..dc21e426 100644
Binary files a/library/GRAPHER.LCOM and b/library/GRAPHER.LCOM differ
diff --git a/library/UNIXUTILS b/library/UNIXUTILS
index d8dce663..2a6eac9f 100644
--- a/library/UNIXUTILS
+++ b/library/UNIXUTILS
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "31-Mar-2026 00:14:19" {WMEDLEY}<library>UNIXUTILS.;58 21269  
+(FILECREATED "28-Apr-2026 09:59:13" {WMEDLEY}<library>UNIXUTILS.;61 22079  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS UNIX-FILE-NAME)
+      :CHANGES-TO (VARS UNIXUTILSCOMS)
 
-      :PREVIOUS-DATE "29-Mar-2026 00:26:43" {WMEDLEY}<library>UNIXUTILS.;57)
+      :PREVIOUS-DATE "27-Apr-2026 11:10:07" {MEDLEY}<library>UNIXUTILS.;60)
 
 
 (PRETTYCOMPRINT UNIXUTILSCOMS)
@@ -23,6 +23,7 @@
                         (ShellOpener NIL RESET)))
         (FNS ShellBrowser ShellBrowse ShellOpener ShellOpen PROCESS-COMMAND SLASHIT UNIX-FILE-NAME 
              UNIX-TMP-FILE-NAME)
+        (COMMANDS "cd" cdm "ls" "pwd")
         (PROPS (UNIXUTILS FILETYPE))))
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
@@ -148,7 +149,8 @@
                                                   "true"])
 
 (ShellOpen
-  [LAMBDA (FilenameOrURL)                                    (* ; "Edited 28-Dec-2025 18:26 by rmk")
+  [LAMBDA (FilenameOrURL)                                    (* ; "Edited 27-Apr-2026 11:08 by FGH")
+                                                             (* ; "Edited 28-Dec-2025 18:26 by rmk")
                                                              (* ; "Edited 10-Sep-2025 15:29 by rmk")
                                                              (* ; "Edited  4-May-2025 11:14 by rmk")
 
@@ -210,7 +212,8 @@
                                                        'NAME NEWNAME 'EXTENSION EXTENSION))
                                (TARGETFILE.UNIX (SLASHIT (PACKFILENAME.STRING 'HOST NIL 'DIRECTORY 
                                                                 TMPDIR 'NAME NEWNAME 'EXTENSION 
-                                                                EXTENSION)))
+                                                                EXTENSION)
+                                                       NIL NIL NIL T))
                                (UNIXFILE NIL))
                               (DECLARE (SPECVARS UNIXFILE))
                               (if (OR VERSION.SPECIFIED (NOT UNVERSIONED.EXISTS))
@@ -245,7 +248,8 @@
                                                  0))) DO (BLOCK) FINALLY (RETURN CODE])
 
 (SLASHIT
-  [LAMBDA (X LCASEDIRS NOHOST KEEPDOT)                       (* ; "Edited 17-Jan-2026 23:15 by rmk")
+  [LAMBDA (X LCASEDIRS NOHOST KEEPDOT NO.QUOTE.SPACE)        (* ; "Edited 27-Apr-2026 11:00 by FGH")
+                                                             (* ; "Edited 17-Jan-2026 23:15 by rmk")
                                                              (* ; "Edited  4-Nov-2025 10:10 by rmk")
                                                              (* ; "Edited 22-Oct-2025 13:05 by rmk")
                                                              (* ; "Edited 25-Sep-2025 09:57 by rmk")
@@ -258,7 +262,10 @@
     (* ;; "This is a first approximation to a utility that converts a filename X on a host whose files physically reside in the local Unix file system into the strings that shell commands can use to reference that file.  For now, this just involves replacing directory brackets with /, removing the host, perhaps lower-casing the directory, and perhaps removing a final dot.  It probably should be extended to deal with version number translation, for now it just keeps the ; version. ")
 
     (LET [LASTDIRPOS SLASHED (DIRPOS (ADD1 (OR (STRPOS "}" X)
-                                               0]
+                                               0)))
+                (REPLACE.SPACE (if NO.QUOTE.SPACE
+                                   then (CONS (CHARCODE SPACE))
+                                 else (CHARCODE (\ SPACE]
          [SETQ SLASHED (CONCATCODES (for I C from DIRPOS while (SETQ C (NTHCHARCODE X I))
                                        join (SELCHARQ C
                                                  ((< >) 
@@ -266,7 +273,7 @@
                                                       (CONS (CHARCODE /)))
                                                  (/ (SETQ LASTDIRPOS I)
                                                     (CONS C))
-                                                 (SPACE (APPEND (CHARCODE (\ SPACE))))
+                                                 (SPACE (APPEND REPLACE.SPACE))
                                                  (CONS C]
          (CL:WHEN (AND LCASEDIRS LASTDIRPOS)
              (SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS)))
@@ -365,10 +372,20 @@
        unless (INFILEP UNAME) do (RETURN (SLASHIT (CLOSEF (OPENSTREAM UNAME 'OUTPUT 'NEW])
 )
 
+(DEFCOMMAND "cd" (DIR) (/CNDIR DIR))
+
+(DEFCOMMAND cdm (SUBDIR) (/CNDIR (CL:IF SUBDIR
+                                     (CONCAT '{MEDLEY}/ SUBDIR)
+                                     '{MEDLEY})))
+
+(DEFCOMMAND "ls" (FIRST . REST) (DODIR (CONS FIRST REST)))
+
+(DEFCOMMAND "pwd" NIL (DIRECTORYNAME T))
+
 (PUTPROPS UNIXUTILS FILETYPE CL:COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1170 1543 (ShellCommand 1170 . 1543)) (1545 1942 (ShellWhich 1545 . 1942)) (2052 21191 
-(ShellBrowser 2062 . 3834) (ShellBrowse 3836 . 4521) (ShellOpener 4523 . 6211) (ShellOpen 6213 . 11982
-) (PROCESS-COMMAND 11984 . 12597) (SLASHIT 12599 . 15623) (UNIX-FILE-NAME 15625 . 19510) (
-UNIX-TMP-FILE-NAME 19512 . 21189)))))
+  (FILEMAP (NIL (1208 1581 (ShellCommand 1208 . 1581)) (1583 1980 (ShellWhich 1583 . 1980)) (2090 21695 
+(ShellBrowser 2100 . 3872) (ShellBrowse 3874 . 4559) (ShellOpener 4561 . 6249) (ShellOpen 6251 . 12198
+) (PROCESS-COMMAND 12200 . 12813) (SLASHIT 12815 . 16127) (UNIX-FILE-NAME 16129 . 20014) (
+UNIX-TMP-FILE-NAME 20016 . 21693)))))
 STOP
diff --git a/library/UNIXUTILS.DFASL b/library/UNIXUTILS.DFASL
index f4489675..75d23242 100644
Binary files a/library/UNIXUTILS.DFASL and b/library/UNIXUTILS.DFASL differ
diff --git a/lispusers/BITMAP-GALLERY.TEDIT b/lispusers/BITMAP-GALLERY.TEDIT
index aa14181e..ab88e8cd 100644
Binary files a/lispusers/BITMAP-GALLERY.TEDIT and b/lispusers/BITMAP-GALLERY.TEDIT differ
diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES
index 1c2efa56..962d86d0 100644
--- a/lispusers/COMPAREDIRECTORIES
+++ b/lispusers/COMPAREDIRECTORIES
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "31-Mar-2026 10:50:22" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;287 138875 
+(FILECREATED "28-Apr-2026 23:41:24" {MEDLEY}<lispusers>COMPAREDIRECTORIES.;289 139726 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS CDBROWSER-COPY)
+      :CHANGES-TO (FNS CDFILES.PATS CDFILES.MATCH CDBROWSER-COPY)
 
-      :PREVIOUS-DATE "10-Feb-2026 21:28:55" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;286)
+      :PREVIOUS-DATE "28-Apr-2026 21:38:49" {MEDLEY}<lispusers>COMPAREDIRECTORIES.;288)
 
 
 (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS)
@@ -507,32 +507,37 @@
             UNLESS (CDFILES.MATCH SUBDIR NAME EXT THISDEPTH EXCLUDES) COLLECT FULLNAME])
 
 (CDFILES.MATCH
-  [LAMBDA (SUBDIR NAME EXT THISDEPTH PATTERNS)               (* ; "Edited 26-Jan-2022 15:33 by rmk")
+  [LAMBDA (SUBDIR NAME EXT THISDEPTH PATTERNS)               (* ; "Edited 28-Apr-2026 23:40 by rmk")
+                                                             (* ; "Edited 26-Jan-2022 15:33 by rmk")
                                                              (* ; "Edited 23-Dec-2021 21:47 by rmk")
+    (thereis P in PATTERNS suchthat 
 
-    (* ;; "True if the components of the fullname match at least one of the patterns")
+                                 (* ;; "The SUBDIR test is tricky.  If the exclusion pattern was internal/fonts/**, this shows up as (* * internal/fonts 65535), it has to match  internal/fonts/display/completed/.  Below we test for an initial substring")
 
-    (THEREIS P IN PATTERNS SUCHTHAT (AND [OR (STRING.EQUAL NAME (CAR P)
-                                                    FILEDIRCASEARRAY)
-                                             (EQ '* (CAR P))
-                                             (AND (EQ (CHARCODE %.)
-                                                      (CHCON1 (CAR P)))
-                                                  (EQ (CHARCODE %.)
-                                                      (CHCON1 NAME))
-                                                  (OR (STRING.EQUAL NAME (SUBATOM (CAR P)
-                                                                                2))
-                                                      (EQ (CHARCODE *)
-                                                          (NTHCHARCODE (CAR P)
-                                                                 2]
-                                         (OR (STRING.EQUAL EXT (CADR P))
-                                             (EQ '* (CADR P)))
-                                         (OR (STRING.EQUAL SUBDIR (CADDR P))
-                                             (NULL (CADDR P))
-                                             (EQ '* (CADDR P)))
-                                         (ILEQ THISDEPTH (CADDDR P])
+                                 (AND [OR (STRING.EQUAL NAME (CAR P)
+                                                 FILEDIRCASEARRAY)
+                                          (EQ '* (CAR P))
+                                          (AND (EQ (CHARCODE %.)
+                                                   (CHCON1 (CAR P)))
+                                               (EQ (CHARCODE %.)
+                                                   (CHCON1 NAME))
+                                               (OR (STRING.EQUAL NAME (SUBATOM (CAR P)
+                                                                             2))
+                                                   (EQ (CHARCODE *)
+                                                       (NTHCHARCODE (CAR P)
+                                                              2]
+                                      (OR (STRING.EQUAL EXT (CADR P))
+                                          (EQ '* (CADR P)))
+                                      (ILEQ THISDEPTH (CADDDR P))
+                                      (OR (STRING.EQUAL SUBDIR (CADDR P))
+                                          (NULL (CADDR P))
+                                          (EQ '* (CADDR P))
+                                          (STRPOS (CADDR P)
+                                                 SUBDIR 1 NIL T])
 
 (CDFILES.PATS
-  [LAMBDA (PATTERNS)                                         (* ; "Edited 17-Jun-2023 23:36 by rmk")
+  [LAMBDA (PATTERNS)                                         (* ; "Edited 28-Apr-2026 23:01 by rmk")
+                                                             (* ; "Edited 17-Jun-2023 23:36 by rmk")
                                                              (* ; "Edited 23-Dec-2021 17:02 by rmk")
 
     (* ;; "Returns (NAME EXT SUBDIR DEPTH) items where NAME or EXT may be the wildcard *, SD is the subdirectory (if any) and DEPTH is the number of / or > in the subdirectory")
@@ -544,15 +549,15 @@
          (* * NIL 1)
 )
       ELSE (FOR P N E SD DEPTH UNPACK INSIDE PATTERNS
-              JOIN (SETQ UNPACK (UNPACKFILENAME.STRING P))   (* ; 
+              JOIN (SETQ UNPACK (UNPACKFILENAME P))          (* ; 
                                               "String so we can tell the difference between x and x.")
-                   [SETQ SD (MKATOM (LISTGET UNPACK 'SUBDIRECTORY] 
+                   (SETQ SD (LISTGET UNPACK 'SUBDIRECTORY)) 
 
                    (* ;; "Count the subdirectory depth")
 
-                   [SETQ DEPTH (IF (EQ SD '*)
-                                   THEN MAX.SMALLP
-                                 ELSE (FOR I (CNT _ 1) FROM 1 DO (SELCHARQ (NTHCHARCODE SD I)
+                   [SETQ DEPTH (if (EQ SD '*)
+                                   then MAX.SMALLP
+                                 else (for I (CNT _ 1) from 1 do (SELCHARQ (NTHCHARCODE SD I)
                                                                       ((/ >) 
                                                                            (ADD CNT 1))
                                                                       (NIL (RETURN CNT))
@@ -560,28 +565,31 @@
                    (SETQ N (LISTGET UNPACK 'NAME))
                    (SETQ N (if (NULL N)
                                then '*
+                             elseif (EQ N '**)
+                               then (SETQ DEPTH MAX.SMALLP)
+                                    '*
                              elseif (NEQ 0 (NCHARS N))
-                               then (MKATOM N)))
+                               then N))
                    (SETQ E (LISTGET UNPACK 'EXTENSION))
                    (SETQ E (if (NULL E)
                                then '*
                              elseif (NEQ 0 (NCHARS E))
-                               then (MKATOM E)))
-                   (if [OR (AND (STRING.EQUAL N 'COM)
+                               then E))
+                   (if [OR (AND (EQ N 'COM)
                                 (NULL E))
-                           (AND (STRING.EQUAL E 'COM)
+                           (AND (EQ E 'COM)
                                 (MEMB N '                    (* NIL)]
-                       THEN (FOR CE IN *COMPILED-EXTENSIONS* COLLECT (LIST '* CE SD DEPTH))
-                     ELSE (CONS (IF N
-                                    THEN (LIST N E SD DEPTH)
-                                  ELSEIF E
-                                    THEN 
+                       then (for CE in *COMPILED-EXTENSIONS* collect (LIST '* CE SD DEPTH))
+                     else (CONS (if N
+                                    then (LIST N E SD DEPTH)
+                                  elseif E
+                                    then 
 
                                  (* ;; "This is the case .XXX, which presumably identifies a dotted file.  If this is supposed to be all files with extension XXX, it shoud be specified as *.XXX, the case above.  So we move .E into the N field.")
 
                                          (LIST (PACK* '%. E)
                                                NIL SD DEPTH)
-                                  ELSE `
+                                  else `
 
          (* * (\, SD) (\, DEPTH))
 ])
@@ -2146,7 +2154,8 @@
                                                              NIL])
 
 (CDBROWSER-COPY
-  [LAMBDA (CDBROWSER TBITEM SOURCE UNIXDEST)                 (* ; "Edited 31-Mar-2026 10:49 by rmk")
+  [LAMBDA (CDBROWSER TBITEM SOURCE UNIXDEST)                 (* ; "Edited 28-Apr-2026 18:54 by rmk")
+                                                             (* ; "Edited 31-Mar-2026 10:49 by rmk")
                                                              (* ; "Edited 28-Oct-2025 17:39 by rmk")
                                                              (* ; "Edited 25-Oct-2025 23:58 by rmk")
                                                              (* ; "Edited 24-May-2022 15:49 by rmk")
@@ -2185,7 +2194,8 @@
                    (PRIN3 "No source file to copy" T)
                    (RETURN NIL))
                (CL:WHEN [AND (EQ DATERELBAD (FETCH (CDENTRY DATEREL) OF CDENTRY))
-                             (PROGN (FLASHWINDOW T)
+                             (PROGN (GIVE.TTY.PROCESS T)
+                                    (FLASHWINDOW T)
                                     (EQ 'N (ASKUSER NIL NIL 
                                                   "Target is newer than source.  Really copy? "]
                       (RETURN NIL))
@@ -2195,6 +2205,7 @@
                                                                         ))
                                                       'VERSION))
                              (PROGN (FLASHWINDOW T)
+                                    (GIVE.TTY.PROCESS T)
                                     (EQ 'N (ASKUSER NIL NIL (CONCAT SOURCEFILE 
                                                          " is not the newest version.  Really copy? "
                                                                    ]
@@ -2326,25 +2337,25 @@
 
 (MOVD? 'NILL 'TEDIT.FILEDATE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2658 23637 (COMPAREDIRECTORIES 2668 . 8003) (COMPAREDIRECTORIES.INFOS 8005 . 11234) (
-COMPAREDIRECTORIES.CANDIDATES 11236 . 14621) (CDENTRIES.SELECT 14623 . 19525) (
-COMPAREDIRECTORIES.INFOS.TYPE 19527 . 20871) (MATCHNAME 20873 . 21553) (CD.INSURECDVALUE 21555 . 23169
-) (CD.UPDATEWIDTHS 23171 . 23635)) (23638 34343 (CDFILES 23648 . 29745) (CDFILES.MATCH 29747 . 31372) 
-(CDFILES.PATS 31374 . 34341)) (34344 52362 (CDPRINT 34354 . 36871) (CDPRINT.HEADER 36873 . 37770) (
-CDPRINT.LINE 37772 . 41201) (CDPRINT.MAXWIDTHS 41203 . 45318) (CDPRINT.COLHEADERS 45320 . 46605) (
-CDPRINT.COLUMNS 46607 . 51727) (CDTEDIT 51729 . 52360)) (52363 61484 (CDMAP 52373 . 53805) (CDENTRY 
-53807 . 54116) (CDSUBSET 54118 . 55557) (CDMERGE 55559 . 59543) (CDMERGE.COMMON 59545 . 60860) (
-CD.SORT 60862 . 61482)) (61485 69023 (BINCOMP 61495 . 65784) (EOLTYPE 65786 . 68348) (EOLTYPE.SHOW 
-68350 . 69021)) (69551 82078 (FIND-UNCOMPILED-FILES 69561 . 73204) (FIND-UNSOURCED-FILES 73206 . 75590
-) (FIND-SOURCE-FILES 75592 . 77330) (FIND-COMPILED-FILES 77332 . 79209) (FIND-UNLOADED-FILES 79211 . 
-80064) (FIND-LOADED-FILES 80066 . 80494) (FIND-MULTICOMPILED-FILES 80496 . 82076)) (82079 90510 (
-CREATED-AS 82089 . 86886) (SOURCE-FOR-COMPILED-P 86888 . 89815) (COMPILE-SOURCE-DATE-DIFF 89817 . 
-90508)) (90511 101274 (FIX-DIRECTORY-DATES 90521 . 93971) (FIX-EQUIV-DATES 93973 . 95498) (
-COPY-COMPARED-FILES 95500 . 97321) (COPY-MISSING-FILES 97323 . 99480) (COMPILED-ON-SAME-SOURCE 99482
- . 101272)) (101468 109346 (CDBROWSER 101478 . 105445) (CDBROWSER.STRINGS 105447 . 109344)) (109508 
-111244 (CD.TABLEITEM 109518 . 109738) (CD.TABLEITEM.PRINTFN 109740 . 109939) (CD.TABLEITEM.COPYFN 
-109941 . 110999) (CDTABLEBROWSER.HEADING.REPAINTFN 111001 . 111242)) (111245 138359 (
-CDTABLEBROWSER.WHENSELECTEDFN 111255 . 111723) (CD.COMMANDSELECTEDFN 111725 . 117898) (CD-MENUFN 
-117900 . 124377) (CD-COMPARE-FILES 124379 . 127906) (CDBROWSER-COPY 127908 . 133233) (
-CDBROWSER-DELETE-FILE 133235 . 137838) (CD-SWAPDIRS 137840 . 138357)))))
+  (FILEMAP (NIL (2683 23662 (COMPAREDIRECTORIES 2693 . 8028) (COMPAREDIRECTORIES.INFOS 8030 . 11259) (
+COMPAREDIRECTORIES.CANDIDATES 11261 . 14646) (CDENTRIES.SELECT 14648 . 19550) (
+COMPAREDIRECTORIES.INFOS.TYPE 19552 . 20896) (MATCHNAME 20898 . 21578) (CD.INSURECDVALUE 21580 . 23194
+) (CD.UPDATEWIDTHS 23196 . 23660)) (23663 34971 (CDFILES 23673 . 29770) (CDFILES.MATCH 29772 . 31782) 
+(CDFILES.PATS 31784 . 34969)) (34972 52990 (CDPRINT 34982 . 37499) (CDPRINT.HEADER 37501 . 38398) (
+CDPRINT.LINE 38400 . 41829) (CDPRINT.MAXWIDTHS 41831 . 45946) (CDPRINT.COLHEADERS 45948 . 47233) (
+CDPRINT.COLUMNS 47235 . 52355) (CDTEDIT 52357 . 52988)) (52991 62112 (CDMAP 53001 . 54433) (CDENTRY 
+54435 . 54744) (CDSUBSET 54746 . 56185) (CDMERGE 56187 . 60171) (CDMERGE.COMMON 60173 . 61488) (
+CD.SORT 61490 . 62110)) (62113 69651 (BINCOMP 62123 . 66412) (EOLTYPE 66414 . 68976) (EOLTYPE.SHOW 
+68978 . 69649)) (70179 82706 (FIND-UNCOMPILED-FILES 70189 . 73832) (FIND-UNSOURCED-FILES 73834 . 76218
+) (FIND-SOURCE-FILES 76220 . 77958) (FIND-COMPILED-FILES 77960 . 79837) (FIND-UNLOADED-FILES 79839 . 
+80692) (FIND-LOADED-FILES 80694 . 81122) (FIND-MULTICOMPILED-FILES 81124 . 82704)) (82707 91138 (
+CREATED-AS 82717 . 87514) (SOURCE-FOR-COMPILED-P 87516 . 90443) (COMPILE-SOURCE-DATE-DIFF 90445 . 
+91136)) (91139 101902 (FIX-DIRECTORY-DATES 91149 . 94599) (FIX-EQUIV-DATES 94601 . 96126) (
+COPY-COMPARED-FILES 96128 . 97949) (COPY-MISSING-FILES 97951 . 100108) (COMPILED-ON-SAME-SOURCE 100110
+ . 101900)) (102096 109974 (CDBROWSER 102106 . 106073) (CDBROWSER.STRINGS 106075 . 109972)) (110136 
+111872 (CD.TABLEITEM 110146 . 110366) (CD.TABLEITEM.PRINTFN 110368 . 110567) (CD.TABLEITEM.COPYFN 
+110569 . 111627) (CDTABLEBROWSER.HEADING.REPAINTFN 111629 . 111870)) (111873 139210 (
+CDTABLEBROWSER.WHENSELECTEDFN 111883 . 112351) (CD.COMMANDSELECTEDFN 112353 . 118526) (CD-MENUFN 
+118528 . 125005) (CD-COMPARE-FILES 125007 . 128534) (CDBROWSER-COPY 128536 . 134084) (
+CDBROWSER-DELETE-FILE 134086 . 138689) (CD-SWAPDIRS 138691 . 139208)))))
 STOP
diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM
index 996c3950..341d2592 100644
Binary files a/lispusers/COMPAREDIRECTORIES.LCOM and b/lispusers/COMPAREDIRECTORIES.LCOM differ
diff --git a/lispusers/GITFNS b/lispusers/GITFNS
index 035519af..1ce3bdc3 100644
--- a/lispusers/GITFNS
+++ b/lispusers/GITFNS
@@ -1,12 +1,14 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)
 
-(FILECREATED "16-Mar-2026 12:05:55" {WMEDLEY}<lispusers>GITFNS.;578 134065 
+(FILECREATED "29-Apr-2026 12:51:53" {MEDLEY}<lispusers>GITFNS.;592 137200 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS GIT-BRANCH-WHENSELECTEDFN PRC-COMMAND)
+      :CHANGES-TO (FNS GIT-GWC-COMMAND)
+                  (COMMANDS gwc)
+                  (VARS GITFNSCOMS)
 
-      :PREVIOUS-DATE " 2-Mar-2026 14:00:13" {WMEDLEY}<lispusers>GITFNS.;576)
+      :PREVIOUS-DATE "29-Apr-2026 09:00:33" {MEDLEY}<lispusers>GITFNS.;588)
 
 
 (PRETTYCOMPRINT GITFNSCOMS)
@@ -51,7 +53,7 @@
         (INITVARS (GIT-MERGE-COMPARES T)
                (GIT-CDBROWSER-SEPARATE-DIRECTIONS T))
         (COMMANDS gwc bbc prc cob b? cdg cdw)
-        (FNS PRC-COMMAND)
+        (FNS PRC-COMMAND GIT-GWC-COMMAND)
         
         (* ;; "")
 
@@ -60,7 +62,7 @@
 
         (FNS ALLSUBDIRS MEDLEYSUBDIRS GITSUBDIRS)
         (FNS TOGIT FROMGIT)
-        (FNS MYMEDLEYSUBDIR GITSUBDIR STRIPDIR STRIPHOST STRIPNAME STRIPWHERE)
+        (FNS WORKINGSUBDIR GITSUBDIR STRIPDIR STRIPHOST STRIPNAME STRIPWHERE)
         (FNS GFILE4MFILE MFILE4GFILE GIT-REPO-FILENAME)
         
         (* ;; "")
@@ -169,6 +171,9 @@
 
 (GIT-MAKE-PROJECT
   [LAMBDA (PROJECTNAME CLONEPATH WORKINGPATH EXCLUSIONS DEFAULTSUBDIRS)
+                                                             (* ; "Edited 29-Apr-2026 09:00 by rmk")
+                                                             (* ; "Edited 17-Apr-2026 12:33 by rmk")
+                                                             (* ; "Edited 15-Apr-2026 16:33 by rmk")
                                                              (* ; "Edited 25-Feb-2026 23:25 by rmk")
                                                              (* ; "Edited 25-Oct-2025 16:53 by rmk")
                                                              (* ; "Edited 22-Oct-2025 12:45 by rmk")
@@ -275,7 +280,8 @@
                                                       "for " PROJECTNAME]
              (SETQ PROJECT (create GIT-PROJECT
                                   PROJECTNAME ← PROJECTNAME
-                                  GITHOST ← (PACK* "{" (PSEUDOHOST PROJECTNAME CLONEPATH)
+                                  GITHOST ← (PACK* "{" (PSEUDOHOST (CONCAT "G" PROJECTNAME)
+                                                              CLONEPATH)
                                                    "}")
                                   WHOST ← (AND WORKINGPATH (PACK* "{" (PSEUDOHOST (CONCAT "W" 
                                                                                          PROJECTNAME)
@@ -439,18 +445,7 @@
 
 (RPAQ? GIT-CDBROWSER-SEPARATE-DIRECTIONS T)
 
-(DEFCOMMAND gwc (SUBDIR . OTHERS)
-
-   (* ;; "Compares the specified local git-medley subdirectories against my working Medley.  The SUBDIRS are the arguments up to one that looks like a project")
-
-    (LET ((SUBDIRS (AND SUBDIR (CONS SUBDIR OTHERS)))
-          PROJECT)
-         (SETQ SUBDIRS (FOR STAIL ON SUBDIRS COLLECT (IF (GIT-GET-PROJECT (CAR STAIL)
-                                                                NIL T)
-                                                         THEN (SETQ PROJECT (CAR STAIL))
-                                                              (GO $$OUT))
-                                                   (CAR STAIL)))
-         (GIT-WORKING-COMPARE-DIRECTORIES SUBDIRS NIL NIL NIL T PROJECT)))
+(DEFCOMMAND gwc (SUBDIR . OTHERS) (GIT-GWC-COMMAND SUBDIR OTHERS))
 
 (DEFCOMMAND bbc (BRANCH1 BRANCH2 LOCAL PROJECT)
 
@@ -616,6 +611,32 @@
                                 PROJECT))
            else (CONCAT "No open " (OR REMOTEBRANCH "")
                        " pull requests"])
+
+(GIT-GWC-COMMAND
+  [LAMBDA (SUBDIR OTHERS)                                    (* ; "Edited 29-Apr-2026 12:51 by rmk")
+
+    (* ;; "Compares the specified local git-medley subdirectories against my working Medley.  The SUBDIRS are the arguments up to one that looks like a project, which may be followed by - and some excluded files")
+
+    (LET ((SUBDIRS (AND SUBDIR (CONS SUBDIR OTHERS)))
+          EXCLUDEDFILES PROJECT)
+         (SETQ SUBDIRS (for STAIL on SUBDIRS unless (CL:WHEN (AND (NULL PROJECT)
+                                                                  (SETQ PROJECT (GIT-GET-PROJECT
+                                                                                 (CAR STAIL)
+                                                                                 NIL T)))
+                                                        (CL:UNLESS (EQ '- (CADR STAIL))
+                                                               (RETURN $$VAL))
+                                                        T) collect (CL:WHEN (EQ '- (CAR STAIL))
+                                                                       (SETQ EXCLUDEDFILES
+                                                                        (CDR STAIL))
+                                                                       (RETURN $$VAL))
+                                                                 (CAR STAIL)))
+         (CL:UNLESS PROJECT
+             (SETQ PROJECT (GIT-GET-PROJECT PROJECT)))
+         (if (AND (fetch GITHOST of PROJECT)
+                  (fetch WHOST of PROJECT))
+             then (GIT-WORKING-COMPARE-DIRECTORIES SUBDIRS NIL EXCLUDEDFILES NIL T PROJECT)
+           else (PRINTOUT T "gwc requires " (fetch PROJECTNAME of PROJECT)
+                       " to have both git and working directories" T T])
 )
 
 
@@ -727,7 +748,7 @@
 )
 (DEFINEQ
 
-(MYMEDLEYSUBDIR
+(WORKINGSUBDIR
   [LAMBDA (SUBDIR STAR PROJECT)                              (* ; "Edited 13-May-2022 10:40 by rmk")
                                                              (* ; "Edited  7-May-2022 23:15 by rmk")
     (UNSLASHIT (PACK* (PACKFILENAME 'HOST (FETCH WHOST OF PROJECT)
@@ -1398,13 +1419,12 @@
                                                      " branches"])
 
 (GIT-BRANCH-MENU
-  [LAMBDA (BRANCHES TITLE PIN?)                              (* ; "Edited  1-May-2024 14:36 by rmk")
+  [LAMBDA (BRANCHES TITLE)                                   (* ; "Edited 18-Apr-2026 21:36 by rmk")
+                                                             (* ; "Edited  1-May-2024 14:36 by rmk")
                                                              (* ; "Edited  6-Jul-2023 22:31 by rmk")
                                                              (* ; "Edited 30-Jun-2023 16:58 by rmk")
                                                              (* ; "Edited 18-May-2022 13:44 by rmk")
     (CL:WHEN (SETQ BRANCHES (MKLIST BRANCHES))
-        (CL:WHEN PIN?
-            [SETQ BRANCHES (APPEND BRANCHES '(("      Pin menu" 'PinMenu])
         (create MENU
                TITLE ← (OR TITLE (CONCAT (LENGTH BRANCHES)
                                         " branches"))
@@ -1950,6 +1970,8 @@
 (GIT-WORKING-COMPARE-DIRECTORIES
   [LAMBDA (SUBDIRS SELECT EXCLUDEDFILES FIXDIRECTORYDATES UPDATE PROJECT)
 
+    (* ;; "Edited 29-Apr-2026 08:46 by rmk")
+
     (* ;; "Edited 28-Oct-2025 14:00 by rmk")
 
     (* ;; "Edited 25-Oct-2025 23:32 by rmk")
@@ -1960,18 +1982,12 @@
 
     (* ;; "Edited 26-Sep-2023 22:41 by rmk")
 
-    (* ;; "Edited 17-Jun-2023 22:54 by rmk")
-
-    (* ;; "Edited 10-Jun-2023 21:32 by rmk")
-
     (* ;; "Edited 20-Jul-2022 21:18 by rmk")
 
     (* ;; "Edited 25-Jun-2022 21:37 by rmk")
 
     (* ;; "Edited 17-May-2022 17:39 by rmk")
 
-    (* ;; "Edited 10-May-2022 10:41 by rmk")
-
     (* ;; 
   "Edited 29-Mar-2022 13:58 by rmk: working medley subdirectories with the current local git branch.")
 
@@ -1991,7 +2007,8 @@
     (LET ((SUBDIRSTRING (if (EQ SUBDIRS 'all)
                             then (SETQ SUBDIRS (ALLSUBDIRS PROJECT))
                                  "ALL subdirectories"
-                          else SUBDIRS)))
+                          else SUBDIRS))
+          (EXCLUSIONS))
          (for SUBDIR TITLE CDVAL (WPROJ ← (CONCAT "Working " (L-CASE (fetch PROJECTNAME of PROJECT)
                                                                     T)))
               (NENTRIES ← 0)
@@ -1999,11 +2016,12 @@
             first (PRINTOUT T "Comparing " SUBDIRSTRING 6 " of " WPROJ " and Git " BRANCH2 T)
                   (BKSYSBUF " ") inside SUBDIRS
             collect (TERPRI T)
-                  (SETQ CDVAL (COMPAREDIRECTORIES (MYMEDLEYSUBDIR SUBDIR T PROJECT)
+                  (SETQ CDVAL (COMPAREDIRECTORIES (WORKINGSUBDIR SUBDIR T PROJECT)
                                      (GITSUBDIR SUBDIR T PROJECT)
                                      (OR SELECT '(> < ~= -* *-))
                                      '(*.* *>*.* .* *>.*)
-                                     (for E DPOS in (GIT-GET-PROJECT PROJECT 'EXCLUSIONS)
+                                     (for E DPOS in (APPEND (MKLIST EXCLUDEDFILES)
+                                                           (GIT-GET-PROJECT PROJECT 'EXCLUSIONS))
                                         collect (SETQ DPOS (STRPOS SUBDIR (FILENAMEFIELD E
                                                                                  'DIRECTORY)
                                                                   1 NIL T T FILEDIRCASEARRAY))
@@ -2216,7 +2234,7 @@
                (OR LABEL2 FILE2])
 
 (GIT-CD-MENUFN
-  [LAMBDA (TBITEM MENUITEM CDBROWSER KEY)                    (* ; "Edited 28-Oct-2025 11:50 by rmk")
+  [LAMBDA (TBITEM MENUITEM CDBROWSER KEY)                    (* ; "Edited 28-Oct-2025 11:30 by rmk")
                                                              (* ; "Edited 25-Oct-2025 23:44 by rmk")
                                                              (* ; "Edited 21-Sep-2022 21:34 by rmk")
                                                              (* ; "Edited 22-May-2022 19:13 by rmk")
@@ -2225,9 +2243,32 @@
 
     (* ;; "MENUITEM is of the form (display-atom <this function> . extrainfo).  The selector for the selectq is either the CAR of the extrainfo or the display atom")
 
-    (DECLARE (USEDFREE FILE1 FILE2 LABEL2 TYPE CDENTRY USERDATA PWINDOW))
+    (DECLARE (USEDFREE FILE1 FILE2 LABEL2 TYPE CDENTRY USERDATA))
     (SELECTQ (OR (CADDR MENUITEM)
                  (CAR MENUITEM))
+        (Delete% -> (FLASHWINDOW PWINDOW)
+                    (GIVE.TTY.PROCESS PWINDOW)
+                    (CL:WHEN [OR (EQ KEY 'MIDDLE)
+                                 (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete " LABEL2 " ? "]
+                        (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'RIGHT NIL T)))
+        (|Delete ALL <-| 
+             (FLASHWINDOW PWINDOW)
+             (GIVE.TTY.PROCESS PWINDOW)
+             (if (NAMEFIELD LABEL1 T)
+                 then (CL:WHEN [OR (EQ KEY 'MIDDLE)
+                                   (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete ALL versions of "
+                                                                 (NAMEFIELD LABEL1 T)
+                                                                 " ? "]
+                          (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'LEFT NIL T))
+               else (PRINTOUT T "Nothing to delete")))
+        (Delete% BOTH (FLASHWINDOW PWINDOW)
+                      (GIVE.TTY.PROCESS PWINDOW)
+                      (CL:WHEN (EQ 'Y (ASKUSER NIL 'N (CONCAT 
+                                                             "Delete all Medley and git versions of "
+                                                             (NAMEFIELD LABEL1 T)
+                                                             " ? ")))
+                          (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'LEFT NIL T)
+                          (CDBROWSER-DELETE-FILE CDBROWSER TBITEM 'RIGHT NIL T T)))
         (Copy% -> (CDBROWSER-COPY CDBROWSER TBITEM 'LEFT (CADDDR MENUITEM)))
         (SHOULDNT])
 
@@ -2429,33 +2470,33 @@
 
 (PUTPROPS GITFNS FILETYPE :TCOMPL)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4197 21075 (GIT-CLONEP 4207 . 5638) (GIT-INIT 5640 . 6270) (GIT-MAKE-PROJECT 6272 . 
-14129) (GIT-GET-PROJECT 14131 . 16056) (GIT-PUT-PROJECT-FIELD 16058 . 17699) (GIT-PROJECT-PATH 17701
- . 18745) (FIND-ANCESTOR-DIRECTORY 18747 . 19098) (GIT-FIND-CLONE 19100 . 20183) (GIT-MAINBRANCH 20185
- . 20580) (GIT-MAINBRANCH? 20582 . 21073)) (26538 31832 (PRC-COMMAND 26548 . 31830)) (31888 34676 (
-ALLSUBDIRS 31898 . 33184) (MEDLEYSUBDIRS 33186 . 33879) (GITSUBDIRS 33881 . 34674)) (34677 37082 (
-TOGIT 34687 . 36095) (FROMGIT 36097 . 37080)) (37083 40093 (MYMEDLEYSUBDIR 37093 . 37549) (GITSUBDIR 
-37551 . 37994) (STRIPDIR 37996 . 38374) (STRIPHOST 38376 . 38616) (STRIPNAME 38618 . 39371) (
-STRIPWHERE 39373 . 40091)) (40094 42329 (GFILE4MFILE 40104 . 40800) (MFILE4GFILE 40802 . 41371) (
-GIT-REPO-FILENAME 41373 . 42327)) (42378 52635 (GIT-COMMIT 42388 . 43214) (GIT-PUSH 43216 . 43976) (
-GIT-PULL 43978 . 44730) (GIT-APPROVAL 44732 . 45081) (GIT-GET-FILE 45083 . 46998) (GIT-FILE-EXISTS? 
-47000 . 47274) (GIT-REMOTE-UPDATE 47276 . 48111) (GIT-REMOTE-ADD 48113 . 48420) (GIT-FILE-DATE 48422
- . 49469) (GIT-FILE-HISTORY 49471 . 51405) (GIT-PRINT-FILE-HISTORY 51407 . 52459) (GIT-FETCH 52461 . 
-52633)) (52665 64617 (GIT-BRANCH-DIFF 52675 . 59564) (GIT-COMMIT-DIFFS 59566 . 60457) (
-GIT-BRANCH-RELATIONS 60459 . 64143) (GIT-MODIFIED 64145 . 64615)) (64662 83597 (GIT-BRANCH-NUM 64672
- . 65245) (GIT-CHECKOUT 65247 . 66533) (GIT-WHICH-BRANCH 66535 . 66942) (GIT-MAKE-BRANCH 66944 . 69523
-) (GIT-BRANCHES 69525 . 72122) (GIT-BRANCH-EXISTS? 72124 . 72995) (GIT-PICK-BRANCH 72997 . 73487) (
-GIT-BRANCH-MENU 73489 . 74378) (GIT-BRANCH-WHENSELECTEDFN 74380 . 76087) (GIT-PULL-REQUESTS 76089 . 
-79974) (GIT-SHORT-BRANCH-NAME 79976 . 80267) (GIT-LONG-NAME 80269 . 80586) (GIT-PRC-BRANCHES 80588 . 
-83595)) (83627 88381 (GIT-MY-CURRENT-BRANCH 83637 . 84007) (GIT-MY-BRANCHP 84009 . 84627) (
-GIT-MY-NEXT-BRANCH 84629 . 86429) (GIT-MY-BRANCHES 86431 . 88379)) (88427 92511 (GIT-ADD-WORKTREE 
-88437 . 90044) (GIT-REMOVE-WORKTREE 90046 . 90978) (GIT-LIST-WORKTREES 90980 . 91791) (WORKTREEDIR 
-91793 . 92509)) (92559 125597 (GIT-GET-DIFFERENT-FILES 92569 . 99477) (
-GIT-BRANCHES-COMPARE-DIRECTORIES 99479 . 107118) (GIT-WORKING-COMPARE-DIRECTORIES 107120 . 112922) (
-GIT-COMPARE-WORKTREE 112924 . 116902) (GITCDOBJBUTTONFN 116904 . 121402) (GIT-CD-LABELFN 121404 . 
-122490) (GIT-CD-MENUFN 122492 . 123578) (GIT-WORKING-COMPARE-FILES 123580 . 124200) (
-GIT-BRANCHES-COMPARE-FILES 124202 . 125366) (GIT-PR-COMPARE 125368 . 125595)) (125667 133998 (CDGITDIR
- 125677 . 126364) (GIT-COMMAND 126366 . 127924) (GITORIGIN 127926 . 128623) (GIT-INITIALS 128625 . 
-128929) (GIT-COMMAND-TO-FILE 128931 . 132416) (GIT-RESULT-TO-LINES 132418 . 133331) (STRIPLOCAL 133333
- . 133996)))))
+  (FILEMAP (NIL (4257 21537 (GIT-CLONEP 4267 . 5698) (GIT-INIT 5700 . 6330) (GIT-MAKE-PROJECT 6332 . 
+14591) (GIT-GET-PROJECT 14593 . 16518) (GIT-PUT-PROJECT-FIELD 16520 . 18161) (GIT-PROJECT-PATH 18163
+ . 19207) (FIND-ANCESTOR-DIRECTORY 19209 . 19560) (GIT-FIND-CLONE 19562 . 20645) (GIT-MAINBRANCH 20647
+ . 21042) (GIT-MAINBRANCH? 21044 . 21535)) (26309 33483 (PRC-COMMAND 26319 . 31601) (GIT-GWC-COMMAND 
+31603 . 33481)) (33539 36327 (ALLSUBDIRS 33549 . 34835) (MEDLEYSUBDIRS 34837 . 35530) (GITSUBDIRS 
+35532 . 36325)) (36328 38733 (TOGIT 36338 . 37746) (FROMGIT 37748 . 38731)) (38734 41743 (
+WORKINGSUBDIR 38744 . 39199) (GITSUBDIR 39201 . 39644) (STRIPDIR 39646 . 40024) (STRIPHOST 40026 . 
+40266) (STRIPNAME 40268 . 41021) (STRIPWHERE 41023 . 41741)) (41744 43979 (GFILE4MFILE 41754 . 42450) 
+(MFILE4GFILE 42452 . 43021) (GIT-REPO-FILENAME 43023 . 43977)) (44028 54285 (GIT-COMMIT 44038 . 44864)
+ (GIT-PUSH 44866 . 45626) (GIT-PULL 45628 . 46380) (GIT-APPROVAL 46382 . 46731) (GIT-GET-FILE 46733 . 
+48648) (GIT-FILE-EXISTS? 48650 . 48924) (GIT-REMOTE-UPDATE 48926 . 49761) (GIT-REMOTE-ADD 49763 . 
+50070) (GIT-FILE-DATE 50072 . 51119) (GIT-FILE-HISTORY 51121 . 53055) (GIT-PRINT-FILE-HISTORY 53057 . 
+54109) (GIT-FETCH 54111 . 54283)) (54315 66267 (GIT-BRANCH-DIFF 54325 . 61214) (GIT-COMMIT-DIFFS 61216
+ . 62107) (GIT-BRANCH-RELATIONS 62109 . 65793) (GIT-MODIFIED 65795 . 66265)) (66312 85259 (
+GIT-BRANCH-NUM 66322 . 66895) (GIT-CHECKOUT 66897 . 68183) (GIT-WHICH-BRANCH 68185 . 68592) (
+GIT-MAKE-BRANCH 68594 . 71173) (GIT-BRANCHES 71175 . 73772) (GIT-BRANCH-EXISTS? 73774 . 74645) (
+GIT-PICK-BRANCH 74647 . 75137) (GIT-BRANCH-MENU 75139 . 76040) (GIT-BRANCH-WHENSELECTEDFN 76042 . 
+77749) (GIT-PULL-REQUESTS 77751 . 81636) (GIT-SHORT-BRANCH-NAME 81638 . 81929) (GIT-LONG-NAME 81931 . 
+82248) (GIT-PRC-BRANCHES 82250 . 85257)) (85289 90043 (GIT-MY-CURRENT-BRANCH 85299 . 85669) (
+GIT-MY-BRANCHP 85671 . 86289) (GIT-MY-NEXT-BRANCH 86291 . 88091) (GIT-MY-BRANCHES 88093 . 90041)) (
+90089 94173 (GIT-ADD-WORKTREE 90099 . 91706) (GIT-REMOVE-WORKTREE 91708 . 92640) (GIT-LIST-WORKTREES 
+92642 . 93453) (WORKTREEDIR 93455 . 94171)) (94221 128732 (GIT-GET-DIFFERENT-FILES 94231 . 101139) (
+GIT-BRANCHES-COMPARE-DIRECTORIES 101141 . 108780) (GIT-WORKING-COMPARE-DIRECTORIES 108782 . 114597) (
+GIT-COMPARE-WORKTREE 114599 . 118577) (GITCDOBJBUTTONFN 118579 . 123077) (GIT-CD-LABELFN 123079 . 
+124165) (GIT-CD-MENUFN 124167 . 126713) (GIT-WORKING-COMPARE-FILES 126715 . 127335) (
+GIT-BRANCHES-COMPARE-FILES 127337 . 128501) (GIT-PR-COMPARE 128503 . 128730)) (128802 137133 (CDGITDIR
+ 128812 . 129499) (GIT-COMMAND 129501 . 131059) (GITORIGIN 131061 . 131758) (GIT-INITIALS 131760 . 
+132064) (GIT-COMMAND-TO-FILE 132066 . 135551) (GIT-RESULT-TO-LINES 135553 . 136466) (STRIPLOCAL 136468
+ . 137131)))))
 STOP
diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM
index 03bd1bb9..fa32aa44 100644
Binary files a/lispusers/GITFNS.LCOM and b/lispusers/GITFNS.LCOM differ
diff --git a/lispusers/GITFNS.TEDIT b/lispusers/GITFNS.TEDIT
index 0aa747b4..86b5f8c1 100644
Binary files a/lispusers/GITFNS.TEDIT and b/lispusers/GITFNS.TEDIT differ
diff --git a/lispusers/HELPSYS b/lispusers/HELPSYS
index 748a9348..12cde91a 100644
--- a/lispusers/HELPSYS
+++ b/lispusers/HELPSYS
@@ -1,13 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "27-Jan-2026 13:21:10" {WMEDLEY}<lispusers>HELPSYS.;21 88654  
+(FILECREATED "20-Apr-2026 08:07:50" {MEDLEY}<lispusers>HELPSYS.;24 89018  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS DOCS.LOOKUP GENERIC.MAN.LOOKUP)
-                  (VARS HELPSYSCOMS)
+      :CHANGES-TO (FNS REPO.LOOKUP)
 
-      :PREVIOUS-DATE " 5-May-2025 22:04:32" {WMEDLEY}<lispusers>HELPSYS.;15)
+      :PREVIOUS-DATE "27-Jan-2026 13:21:10" {MEDLEY}<lispusers>HELPSYS.;21)
 
 
 (PRETTYCOMPRINT HELPSYSCOMS)
@@ -340,21 +339,27 @@
                       else "git web--browse"])
 
 (REPO.LOOKUP
-  [LAMBDA (ENTRY TYPES)                                      (* ; "Edited 13-Jan-2023 10:46 by lmm")
+  [LAMBDA (ENTRY TYPES)                                      (* ; "Edited 20-Apr-2026 08:06 by rmk")
+                                                             (* ; "Edited 13-Jan-2023 10:46 by lmm")
                                                              (* ; "Edited 16-Aug-2022 16:26 by lmm")
-    (for FL in (UNION (WHEREIS ENTRY (OR TYPES HELPSYS.REPO.TYPES)
-                             T)
-                      (LIST ENTRY)) bind POS FND
+    (for FL POS FND TSTREAM in (UNION (WHEREIS ENTRY (OR TYPES HELPSYS.REPO.TYPES)
+                                             T)
+                                      (LIST ENTRY))
        when [SETQ FND (OR (FINDFILE-WITH-EXTENSIONS FL NIL '(TEDIT TXT TED))
                           (AND (SETQ POS (STRPOS "-" FL))
                                (FINDFILE-WITH-EXTENSIONS (SUBSTRING FL 1 (CL:1- POS))
                                       NIL
                                       '(TEDIT TXT TTY TED]
-       join (CL:WITH-OPEN-FILE (STR (PATHNAME FND)
-                                    :DIRECTION :INPUT)
-                   (CL:WHEN (SETQ POS (FFILEPOS ENTRY STR))
-                       (TEDIT-SEE STR NIL NIL (CL:FORMAT NIL "~a [~a]" FL ENTRY))
-                       (LIST FL))])
+       collect (SETQ TSTREAM (OPENTEXTSTREAM FND))
+             [TEDIT TSTREAM NIL NIL `(READONLY T LEAVETTY T FONT ,DEFAULTFONT TITLE
+                                            ,(CL:IF (EQ FL ENTRY)
+                                                 FL
+                                                 (CONCAT ENTRY " on " FL))]
+             (CL:UNLESS (EQ FL ENTRY)
+                 (CL:WHEN (SETQ POS (TEDIT.FIND TSTREAM ENTRY))
+                     (TEDIT.SETSEL TSTREAM POS (NCHARS ENTRY))
+                     (TEDIT.NORMALIZECARET TSTREAM)))
+             FL])
 )
 
 (RPAQQ CLHS.INDEX
@@ -1716,14 +1721,14 @@
 
 (PUTPROPS HELPSYS FILETYPE :FAKE-COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4640 10992 (HELPSYS 4650 . 6491) (IRM.LOOKUP 6493 . 8131) (GENERIC.MAN.LOOKUP 8133 . 
-10001) (IRM.SMART.LOOKUP 10003 . 10159) (IRM.RESET 10161 . 10570) (DOCS.LOOKUP 10572 . 10990)) (11249 
-18568 (CLHS.INDEX 11259 . 14223) (CLHS.LOOKUP 14225 . 16231) (CLHS.OPENER 16233 . 17556) (REPO.LOOKUP 
-17558 . 18566)) (71663 73181 (IRM.GET.DINFOGRAPH 71673 . 72548) (IRM.DISPLAY.REF 72550 . 73179)) (
-73183 73545 (IRM.LOAD-GRAPH 73183 . 73545)) (73870 79374 (IRM.DISPLAY.CREF 73880 . 75594) (
-IRM.CREF.BOX 75596 . 76423) (IRM.PUT.CREF 76425 . 76650) (IRM.GET.CREF 76652 . 77023) (
-IRM.CREF.BUTTONEVENTFN 77025 . 79372)) (79929 88235 (\IRM.GET.REF 79939 . 81270) (\IRM.SMART.REF 81272
- . 83199) (\IRM.CHOOSE.REF 83201 . 84452) (\IRM.WILD.REF 84454 . 85709) (\IRM.WILDCARD 85711 . 86077) 
-(\IRM.WILD.MATCH 86079 . 87309) (\IRM.GET.HASHFILE 87311 . 87774) (\IRM.GET.KEYWORDS 87776 . 88233)) (
-88372 88528 (\IRM.AROUND-EXIT 88372 . 88528)))))
+  (FILEMAP (NIL (4582 10934 (HELPSYS 4592 . 6433) (IRM.LOOKUP 6435 . 8073) (GENERIC.MAN.LOOKUP 8075 . 
+9943) (IRM.SMART.LOOKUP 9945 . 10101) (IRM.RESET 10103 . 10512) (DOCS.LOOKUP 10514 . 10932)) (11191 
+18932 (CLHS.INDEX 11201 . 14165) (CLHS.LOOKUP 14167 . 16173) (CLHS.OPENER 16175 . 17498) (REPO.LOOKUP 
+17500 . 18930)) (72027 73545 (IRM.GET.DINFOGRAPH 72037 . 72912) (IRM.DISPLAY.REF 72914 . 73543)) (
+73547 73909 (IRM.LOAD-GRAPH 73547 . 73909)) (74234 79738 (IRM.DISPLAY.CREF 74244 . 75958) (
+IRM.CREF.BOX 75960 . 76787) (IRM.PUT.CREF 76789 . 77014) (IRM.GET.CREF 77016 . 77387) (
+IRM.CREF.BUTTONEVENTFN 77389 . 79736)) (80293 88599 (\IRM.GET.REF 80303 . 81634) (\IRM.SMART.REF 81636
+ . 83563) (\IRM.CHOOSE.REF 83565 . 84816) (\IRM.WILD.REF 84818 . 86073) (\IRM.WILDCARD 86075 . 86441) 
+(\IRM.WILD.MATCH 86443 . 87673) (\IRM.GET.HASHFILE 87675 . 88138) (\IRM.GET.KEYWORDS 88140 . 88597)) (
+88736 88892 (\IRM.AROUND-EXIT 88736 . 88892)))))
 STOP
diff --git a/lispusers/HELPSYS.LCOM b/lispusers/HELPSYS.LCOM
index 8307d3e2..951eccb2 100644
Binary files a/lispusers/HELPSYS.LCOM and b/lispusers/HELPSYS.LCOM differ
diff --git a/lispusers/UNIXYCD b/lispusers/UNIXYCD
deleted file mode 100644
index e6dd17ee..00000000
--- a/lispusers/UNIXYCD
+++ /dev/null
@@ -1,24 +0,0 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
-(FILECREATED "12-Aug-2022 12:29:18" {DSK}<home>larry>medley>lispusers>UNIXYCD.;1 568    
-
-      :CHANGES-TO (VARS UNIXYCDCOMS)
-
-      :PREVIOUS-DATE "12-Aug-2022 11:14:47" {DSK}<home>larry>medley>lispusers>UNIXYCD.;1)
-
-
-(PRETTYCOMPRINT UNIXYCDCOMS)
-
-(RPAQQ UNIXYCDCOMS ((COMMANDS "cd" "ls" "pwd")))
-
-(DEFCOMMAND "cd" (DIR)
-   (/CNDIR DIR))
-
-(DEFCOMMAND "ls" (FIRST . REST)
-   (DODIR (CONS FIRST REST)))
-
-(DEFCOMMAND "pwd" ()
-   (DIRECTORYNAME T))
-(DECLARE%: DONTCOPY
-  (FILEMAP (NIL)))
-STOP
diff --git a/lispusers/UNIXYCD.LCOM b/lispusers/UNIXYCD.LCOM
deleted file mode 100644
index 013420cc..00000000
--- a/lispusers/UNIXYCD.LCOM
+++ /dev/null
@@ -1,13 +0,0 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
-(FILECREATED "12-Aug-2022 12:29:30" ("compiled on " {DSK}<home>larry>medley>lispusers>UNIXYCD.;1) 
-"12-Aug-2022 10:18:11" bcompl'd in "Welcome to Fuller sysout 12-Aug-2022 ..." dated 
-"12-Aug-2022 10:22:21")
-(FILECREATED "12-Aug-2022 12:29:18" {DSK}<home>larry>medley>lispusers>UNIXYCD.;1 568 :CHANGES-TO (VARS
- UNIXYCDCOMS) :PREVIOUS-DATE "12-Aug-2022 11:14:47" {DSK}<home>larry>medley>lispusers>UNIXYCD.;1)
-(PRETTYCOMPRINT UNIXYCDCOMS)
-(RPAQQ UNIXYCDCOMS ((COMMANDS "cd" "ls" "pwd")))
-(DEFCOMMAND "cd" (DIR) (/CNDIR DIR))
-(DEFCOMMAND "ls" (FIRST . REST) (DODIR (CONS FIRST REST)))
-(DEFCOMMAND "pwd" NIL (DIRECTORYNAME T))
-NIL
diff --git a/lispusers/UNIXYCD.TXT b/lispusers/UNIXYCD.TXT
deleted file mode 100644
index 670e3988..00000000
--- a/lispusers/UNIXYCD.TXT
+++ /dev/null
@@ -1,13 +0,0 @@
-	UNIXYCD & .LCOM .TXT
-
-
-This file implements little commands:
-
-cd               change Lisp's current directory to home
-cd dir           dir can be a path separated by / or >.
-                 if no "hostname" is given, it's assumed {DSK}
-ls [dir]         list current directory or a directory that's given
-                 non-feature: ls foo only prints foo; you need to
-		 specify        ls foo/
-pwd		 print working directory
-
diff --git a/scripts/do_hcfiles.sh b/scripts/do_hcfiles.sh
index 0246a0db..f32f61de 100755
--- a/scripts/do_hcfiles.sh
+++ b/scripts/do_hcfiles.sh
@@ -57,7 +57,12 @@ main() {
 
         # save dribble file to loadups; extract and save fails
         "${MEDLEYDIR}"/scripts/cpv ${logindir}/HCFILES.DRIBBLE "${MEDLEYDIR}"/loadups/hcfiles.dribble
-        grep "IL:FAIL" < "${MEDLEYDIR}"/loadups/hcfiles.dribble > ${logindir}/fails
+        if [ -f "$(command -v perl)" ] && [ -x "$(command -v perl)" ]
+        then
+            perl "${MEDLEYDIR}"/scripts/getFails.pl '^[^\n]*IL:FAIL' 'DONE' "${MEDLEYDIR}"/loadups/hcfiles.dribble > ${logindir}/fails
+        else
+            echo Unable to extract FAIL information from "${MEDLEYDIR}"/loadups/hcfiles.dribble > ${logindir}/fails
+        fi
         "${MEDLEYDIR}"/scripts/cpv ${logindir}/fails "${MEDLEYDIR}"/loadups/hcfiles-fails.txt
 
         # cleanup
diff --git a/scripts/getFails.pl b/scripts/getFails.pl
new file mode 100644
index 00000000..4c1fea8d
--- /dev/null
+++ b/scripts/getFails.pl
@@ -0,0 +1,31 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+
+die "Usage: $0 <pattern1> <pattern2> [file...]\n" unless @ARGV >= 2;
+
+my $pat1 = shift;
+my $pat2 = shift;
+my $regex1line = qr/${pat1}.*?${pat2}/; # all on 1 line
+my $regexStart = qr/${pat1}/;            # the line has the start pattern
+my $regexEnd = qr/${pat2}/;              # the line has the end pattern
+
+my $flag = 0;
+
+while (<>) {
+    if ($flag) {                          # we're in a multi-line block
+        print;
+        if (/$regexEnd/) {               # does this line end the multi-line block?
+            $flag = 0;
+            print "\n";                   # separator
+        };
+    }
+    elsif (/$regex1line/) {             # all on 1 line
+        print;
+        print "\n";                      # separator
+    }
+    elsif (/$regexStart/) {             # begin a multi-line block
+        print;
+        $flag = 1;
+    }
+}
\ No newline at end of file
diff --git a/sources/FILEIO b/sources/FILEIO
index 433ead86..45dab841 100644
--- a/sources/FILEIO
+++ b/sources/FILEIO
@@ -1,12 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED " 6-Feb-2026 23:22:00" {WMEDLEY}<sources>FILEIO.;142 166519 
+(FILECREATED "26-Apr-2026 23:27:40" {WMEDLEY}<sources>FILEIO.;146 165936 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS DIRECTORYNAME)
+      :CHANGES-TO (FNS \DO.PARAMS.AT.OPEN)
 
-      :PREVIOUS-DATE "12-Sep-2025 08:19:06" {WMEDLEY}<sources>FILEIO.;141)
+      :PREVIOUS-DATE "26-Apr-2026 21:00:55" {WMEDLEY}<sources>FILEIO.;145)
 
 
 (PRETTYCOMPRINT FILEIOCOMS)
@@ -1446,7 +1446,10 @@
                 (GO RETRY])
 
 (\DO.PARAMS.AT.OPEN
-  [LAMBDA (STREAM ACCESS PARAMETERS)                         (* ; "Edited 25-Dec-2024 10:54 by rmk")
+  [LAMBDA (STREAM ACCESS PARAMETERS)                         (* ; "Edited 26-Apr-2026 23:27 by rmk")
+                                                             (* ; "Edited 21-Apr-2026 20:57 by mth")
+                                                             (* ; "Edited 20-Apr-2026 17:36 by mth")
+                                                             (* ; "Edited 25-Dec-2024 10:54 by rmk")
                                                              (* ; "Edited 15-Jul-2024 22:29 by rmk")
                                                              (* ; "Edited 25-Aug-2023 08:43 by rmk")
                                                              (* ; "Edited  6-Jul-2022 00:00 by rmk")
@@ -1469,44 +1472,40 @@
 
     (DECLARE (USEDFREE STREAM-AFTER-OPEN-FNS))
     (\EXTERNALFORMAT STREAM :DEFAULT)
-    [for X ATTR VAL EOL in PARAMETERS do [(COND
-                                             [(LISTP X)
-                                              (SETQ ATTR (CAR X))
-                                              (SETQ VAL (CAR (LISTP (CDR X]
-                                             (T (SETQ ATTR X)
-                                                (SETQ VAL T)))
-                                          (SELECTQ ATTR
-                                              (BUFFERS (SETFILEINFO STREAM 'BUFFERS VAL))
-                                              (ENDOFSTREAMOP (SETFILEINFO STREAM 'ENDOFSTREAMOP VAL))
-                                              (CHARSET (CHARSET STREAM VAL))
-                                              ((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT) 
+    (for X ATTR VAL EOL in PARAMETERS
+       do (COND
+             [(LISTP X)
+              (SETQ ATTR (CAR X))
+              (SETQ VAL (CAR (LISTP (CDR X]
+             (T (SETQ ATTR X)
+                (SETQ VAL T)))
+          (SELECTQ ATTR
+              (BUFFERS (SETFILEINFO STREAM 'BUFFERS VAL))
+              (ENDOFSTREAMOP (SETFILEINFO STREAM 'ENDOFSTREAMOP VAL))
+              (CHARSET (CHARSET STREAM VAL))
+              ((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT) 
+                                                        (* ;; 
+                "This allows an EOL and format to be intermixed, the last ones of each are installed")
 
-                                                                   (* ;; 
-                                 "VAL can be :UTF-8, CR, (UTF:8 CR), i.e. specify either one or both")
+                   (for V inside VAL do (if (MEMB V '(LF CR CRLF ANY))
+                                            then (SETQ EOL V)
+                                          else (\EXTERNALFORMAT STREAM V))))
+              (CONVHANKAKU (CONVHANKAKU STREAM VAL))
+              ((EOL EOLCONVENTION EOLC) 
+                   (SETQ EOL VAL))
+              NIL) finally 
 
-                                                   (if (LISTP VAL)
-                                                       then  (* ; 
-                                                         "VAL could be (:UTF-8 CR) e.g. from CL:OPEN")
-                                                            (\EXTERNALFORMAT STREAM (CAR VAL)) 
-                                                             (* ; 
-                                                             "Can override the EOL of the format")
-                                                            (SETQ EOL (CADR VAL))
-                                                     elseif (SETQ EOL (CAR)
-                                                             VAL)
-                                                     else (\EXTERNALFORMAT STREAM VAL)))
-                                              (CONVHANKAKU (CONVHANKAKU STREAM VAL))
-                                              ((EOL EOLCONVENTION EOLC)
-                                               (SETQ EOL VAL] finally 
+                         (* ;; "If EOL is not specified, default input streams to ANY.  ")
 
-                                                              (* ;; 
-                        "If not specified, default EOL to ANY--SETFILEINFO checks for output streams")
-
-                                                                    (SETFILEINFO STREAM 'EOL
-                                                                           (OR EOL 'ANY]
-    (FOR FN IN STREAM-AFTER-OPEN-FNS DO (APPLY* FN STREAM ACCESS PARAMETERS])
+                         (CL:UNLESS (OR EOL (\GETSTREAM STREAM 'OUTPUT T))
+                             (SETQ EOL 'ANY))
+                         (CL:WHEN EOL
+                             (SETFILEINFO STREAM 'EOL EOL)))
+    (for FN in STREAM-AFTER-OPEN-FNS do (APPLY* FN STREAM ACCESS PARAMETERS])
 
 (\RENAMEFILE
-  [LAMBDA (OLDFILE NEWFILE)                                  (* ; "Edited 25-Dec-2024 10:14 by rmk")
+  [LAMBDA (OLDFILE NEWFILE)                                  (* ; "Edited 25-Apr-2026 16:03 by rmk")
+                                                             (* ; "Edited 25-Dec-2024 10:14 by rmk")
                                                              (* ; "Edited 16-Dec-2024 21:07 by rmk")
                                                              (* hdj " 7-May-86 12:22")
     (SETQ OLDFILE (\ADD.CONNECTED.DIR OLDFILE))
@@ -1521,7 +1520,7 @@
                                            NEW-DEVICE
                                            (TRUEFILENAME NEWFILE)))
              (CL:IF (PSEUDOHOSTP NEWFILE)
-                 (PSEUDOFILENAME NEWFULLNAME)
+                 (PSEUDOFILENAME NEWFULLNAME (FILENAMEFIELD NEWFILE 'HOST))
                  NEWFULLNAME))])
 
 (\REVALIDATEFILE
@@ -3161,39 +3160,39 @@ update the map")
 (ADDTOVAR LAMA \IS.NOT.RANDACCESSP \ILLEGAL.DEVICEOP STREAMPROP)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (27706 31822 (STREAMPROP 27716 . 28150) (GETSTREAMPROP 28152 . 28901) (PUTSTREAMPROP 
-28903 . 31670) (STREAMP 31672 . 31820)) (31865 35244 (\DEFPRINT.BY.NAME 31875 . 33027) (
-\STREAM.DEFPRINT 33029 . 34937) (\FDEV.DEFPRINT 34939 . 35242)) (35502 40543 (\GETACCESS 35512 . 35966
-) (\SETACCESS 35968 . 40541)) (60769 66738 (\DEFINEDEVICE 60779 . 63095) (\GETDEVICEFROMNAME 63097 . 
-63570) (\GETDEVICEFROMHOSTNAME 63572 . 64616) (\REMOVEDEVICE 64618 . 65741) (\REMOVEDEVICE.NAMES 65743
- . 66736)) (66778 94509 (\CLOSEFILE 66788 . 67613) (\DELETEFILE 67615 . 67909) (\DEVICEEVENT 67911 . 
-69681) (\GENERATEFILES 69683 . 70630) (\GENERATENEXTFILE 70632 . 71283) (\GENERATEFILEINFO 71285 . 
-71746) (\GETFILENAME 71748 . 72137) (\GENERIC.OUTFILEP 72139 . 72609) (\OPENFILE 72611 . 75189) (
-\DO.PARAMS.AT.OPEN 75191 . 79387) (\RENAMEFILE 79389 . 80345) (\REVALIDATEFILE 80347 . 82949) (
-\PAGED.REVALIDATEFILELST 82951 . 84509) (\PAGED.REVALIDATEFILES 84511 . 86230) (\PAGED.REVALIDATEFILE 
-86232 . 88515) (\BUFFERED.REVALIDATEFILE 88517 . 90803) (\BUFFERED.REVALIDATEFILELST 90805 . 91989) (
-\PRINT-REVALIDATION-RESULT 91991 . 92833) (\TRUNCATEFILE 92835 . 93226) (\FILE-CONFLICT 93228 . 94507)
-) (94545 99208 (\GENERATENOFILES 94555 . 96651) (\NULLFILEGENERATOR 96653 . 96897) (\NOFILESNEXTFILEFN
- 96899 . 98890) (\NOFILESINFOFN 98892 . 99206)) (99327 101235 (\FILE.NOT.OPEN 99337 . 99850) (
-\FILE.WONT.OPEN 99852 . 100180) (\ILLEGAL.DEVICEOP 100182 . 100464) (\IS.NOT.RANDACCESSP 100466 . 
-100912) (\STREAM.NOT.OPEN 100914 . 101233)) (101370 103668 (\FDEVINSTANCE 101380 . 103666)) (104870 
-111841 (CNDIR 104880 . 106185) (DIRECTORYNAME 106187 . 109967) (DIRECTORYNAMEP 109969 . 110585) (
-HOSTNAMEP 110587 . 111394) (\ADD.CONNECTED.DIR 111396 . 111839)) (111886 140833 (\BACKFILEPTR 111896
- . 112084) (\BACKPEEKBIN 112086 . 112447) (\BACKBIN 112449 . 112800) (BIN 112802 . 113019) (\BIN 
-113021 . 113298) (\BINS 113300 . 113586) (BOUT 113588 . 113950) (\BOUT 113952 . 114267) (\BOUTS 114269
- . 114580) (COPYBYTES 114582 . 117914) (COPYCHARS 117916 . 121714) (COPYFILE 121716 . 123076) (
-\COPYOPENFILE 123078 . 126277) (\INFER.FILE.TYPE 126279 . 127233) (EOFP 127235 . 127532) (FORCEOUTPUT 
-127534 . 127781) (\FLUSH.OPEN.STREAMS 127783 . 128139) (CHARSET 128141 . 129500) (ACCESS-CHARSET 
-129502 . 130139) (GETEOFPTR 130141 . 130391) (GETFILEINFO 130393 . 133586) (\TYPE.FROM.FILETYPE 133588
- . 134058) (\FILETYPE.FROM.TYPE 134060 . 134239) (GETFILEPTR 134241 . 134493) (SETFILEINFO 134495 . 
-138732) (SETFILEPTR 138734 . 140453) (BOUT16 140455 . 140640) (BIN16 140642 . 140831)) (140936 148116 
-(\GENERIC.BINS 140946 . 141226) (\GENERIC.BOUTS 141228 . 141493) (\GENERIC.RENAMEFILE 141495 . 143743)
- (\GENERIC.OPENP 143745 . 145060) (\GENERIC.READP 145062 . 146214) (\GENERIC.CHARSET 146216 . 148114))
- (148117 148456 (\MAP-OPEN-STREAMS 148127 . 148454)) (150311 152391 (\EOF.ACTION 150321 . 150572) (
-\EOSERROR 150574 . 150767) (\GETEOFPTR 150769 . 150951) (\INCFILEPTR 150953 . 151303) (\PEEKBIN 151305
- . 151496) (\SETCLOSEDFILELENGTH 151498 . 151832) (\SETEOFPTR 151834 . 152022) (\SETFILEPTR 152024 . 
-152389)) (152392 152934 (\FIXPOUT 152402 . 152702) (\FIXPIN 152704 . 152932)) (152935 153501 (\BOUTEOL
- 152945 . 153499)) (156397 166261 (\BUFFERED.BIN 156407 . 157259) (\BUFFERED.PEEKBIN 157261 . 158043) 
-(\BUFFERED.BOUT 158045 . 158905) (\BUFFERED.BINS 158907 . 162592) (\BUFFERED.BOUTS 162594 . 164395) (
-\BUFFERED.COPYBYTES 164397 . 166259)))))
+  (FILEMAP (NIL (27711 31827 (STREAMPROP 27721 . 28155) (GETSTREAMPROP 28157 . 28906) (PUTSTREAMPROP 
+28908 . 31675) (STREAMP 31677 . 31825)) (31870 35249 (\DEFPRINT.BY.NAME 31880 . 33032) (
+\STREAM.DEFPRINT 33034 . 34942) (\FDEV.DEFPRINT 34944 . 35247)) (35507 40548 (\GETACCESS 35517 . 35971
+) (\SETACCESS 35973 . 40546)) (60774 66743 (\DEFINEDEVICE 60784 . 63100) (\GETDEVICEFROMNAME 63102 . 
+63575) (\GETDEVICEFROMHOSTNAME 63577 . 64621) (\REMOVEDEVICE 64623 . 65746) (\REMOVEDEVICE.NAMES 65748
+ . 66741)) (66783 93926 (\CLOSEFILE 66793 . 67618) (\DELETEFILE 67620 . 67914) (\DEVICEEVENT 67916 . 
+69686) (\GENERATEFILES 69688 . 70635) (\GENERATENEXTFILE 70637 . 71288) (\GENERATEFILEINFO 71290 . 
+71751) (\GETFILENAME 71753 . 72142) (\GENERIC.OUTFILEP 72144 . 72614) (\OPENFILE 72616 . 75194) (
+\DO.PARAMS.AT.OPEN 75196 . 78665) (\RENAMEFILE 78667 . 79762) (\REVALIDATEFILE 79764 . 82366) (
+\PAGED.REVALIDATEFILELST 82368 . 83926) (\PAGED.REVALIDATEFILES 83928 . 85647) (\PAGED.REVALIDATEFILE 
+85649 . 87932) (\BUFFERED.REVALIDATEFILE 87934 . 90220) (\BUFFERED.REVALIDATEFILELST 90222 . 91406) (
+\PRINT-REVALIDATION-RESULT 91408 . 92250) (\TRUNCATEFILE 92252 . 92643) (\FILE-CONFLICT 92645 . 93924)
+) (93962 98625 (\GENERATENOFILES 93972 . 96068) (\NULLFILEGENERATOR 96070 . 96314) (\NOFILESNEXTFILEFN
+ 96316 . 98307) (\NOFILESINFOFN 98309 . 98623)) (98744 100652 (\FILE.NOT.OPEN 98754 . 99267) (
+\FILE.WONT.OPEN 99269 . 99597) (\ILLEGAL.DEVICEOP 99599 . 99881) (\IS.NOT.RANDACCESSP 99883 . 100329) 
+(\STREAM.NOT.OPEN 100331 . 100650)) (100787 103085 (\FDEVINSTANCE 100797 . 103083)) (104287 111258 (
+CNDIR 104297 . 105602) (DIRECTORYNAME 105604 . 109384) (DIRECTORYNAMEP 109386 . 110002) (HOSTNAMEP 
+110004 . 110811) (\ADD.CONNECTED.DIR 110813 . 111256)) (111303 140250 (\BACKFILEPTR 111313 . 111501) (
+\BACKPEEKBIN 111503 . 111864) (\BACKBIN 111866 . 112217) (BIN 112219 . 112436) (\BIN 112438 . 112715) 
+(\BINS 112717 . 113003) (BOUT 113005 . 113367) (\BOUT 113369 . 113684) (\BOUTS 113686 . 113997) (
+COPYBYTES 113999 . 117331) (COPYCHARS 117333 . 121131) (COPYFILE 121133 . 122493) (\COPYOPENFILE 
+122495 . 125694) (\INFER.FILE.TYPE 125696 . 126650) (EOFP 126652 . 126949) (FORCEOUTPUT 126951 . 
+127198) (\FLUSH.OPEN.STREAMS 127200 . 127556) (CHARSET 127558 . 128917) (ACCESS-CHARSET 128919 . 
+129556) (GETEOFPTR 129558 . 129808) (GETFILEINFO 129810 . 133003) (\TYPE.FROM.FILETYPE 133005 . 133475
+) (\FILETYPE.FROM.TYPE 133477 . 133656) (GETFILEPTR 133658 . 133910) (SETFILEINFO 133912 . 138149) (
+SETFILEPTR 138151 . 139870) (BOUT16 139872 . 140057) (BIN16 140059 . 140248)) (140353 147533 (
+\GENERIC.BINS 140363 . 140643) (\GENERIC.BOUTS 140645 . 140910) (\GENERIC.RENAMEFILE 140912 . 143160) 
+(\GENERIC.OPENP 143162 . 144477) (\GENERIC.READP 144479 . 145631) (\GENERIC.CHARSET 145633 . 147531)) 
+(147534 147873 (\MAP-OPEN-STREAMS 147544 . 147871)) (149728 151808 (\EOF.ACTION 149738 . 149989) (
+\EOSERROR 149991 . 150184) (\GETEOFPTR 150186 . 150368) (\INCFILEPTR 150370 . 150720) (\PEEKBIN 150722
+ . 150913) (\SETCLOSEDFILELENGTH 150915 . 151249) (\SETEOFPTR 151251 . 151439) (\SETFILEPTR 151441 . 
+151806)) (151809 152351 (\FIXPOUT 151819 . 152119) (\FIXPIN 152121 . 152349)) (152352 152918 (\BOUTEOL
+ 152362 . 152916)) (155814 165678 (\BUFFERED.BIN 155824 . 156676) (\BUFFERED.PEEKBIN 156678 . 157460) 
+(\BUFFERED.BOUT 157462 . 158322) (\BUFFERED.BINS 158324 . 162009) (\BUFFERED.BOUTS 162011 . 163812) (
+\BUFFERED.COPYBYTES 163814 . 165676)))))
 STOP
diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM
index d120ea24..e53409e6 100644
Binary files a/sources/FILEIO.LCOM and b/sources/FILEIO.LCOM differ
diff --git a/sources/XCCS b/sources/XCCS
deleted file mode 100644
index 12746d5d..00000000
--- a/sources/XCCS
+++ /dev/null
@@ -1,323 +0,0 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
-(FILECREATED "13-Jul-2025 23:08:39" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;10 15413  
-
-      :EDIT-BY rmk
-
-      :CHANGES-TO (VARS XCCSCOMS)
-
-      :PREVIOUS-DATE "25-Mar-2025 23:40:52" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>XCCS.;9)
-
-
-(PRETTYCOMPRINT XCCSCOMS)
-
-(RPAQQ XCCSCOMS
-       [(FNS \XCCSINCCODE \XCCSPEEKCCODE \XCCSOUTCHAR \XCCSBACKCCODE \XCCSFORMATBYTESTREAM 
-             \XCCSCHARSETFN)
-        (FNS \CREATE.XCCS.EXTERNALFORMAT)
-        (FNS \NSIN.24BITENCODING.ERROR)
-        (FNS KANJICHARSETP CHINESECHARSETP)
-        (INITVARS (*SIGNAL-24BIT-NSENCODING-ERROR*))
-        (DECLARE%: EVAL@COMPILE DONTCOPY (EXPORT (CONSTANTS (\NORUNCODE 255)
-                                                        (NSCHARSETSHIFT 255))
-                                                (MACROS \RUNCODED)))
-        (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\CREATE.XCCS.EXTERNALFORMAT])
-(DEFINEQ
-
-(\XCCSINCCODE
-  [LAMBDA (STREAM COUNTP)                                    (* ; "Edited  8-Dec-2023 15:28 by rmk")
-                                                            (* ; "Edited  6-Aug-2021 15:57 by rmk:")
-
-(* ;;; "Returns a 16 bit character code.  SHIFTEDCSET is STREAM's char set left shifted 8.")
-
-(* ;;; "If COUNTP is non-NIL, the variable *BYTECOUNTER* is set freely to the number of bytes read.")
-
-(* ;;; "This doesn't do  EOL conversion, \INCHAR does that")
-
-    (DECLARE (USEDFREE *BYTECOUNTER*))
-    (\DTEST STREAM 'STREAM)
-    (LET (NUMBYTES (CSET (ffetch (STREAM CHARSET) of STREAM))
-                (CHAR (\BIN STREAM)))                        (* ; 
-                                             "Error on EOF unless ENDOFSTREAMOP does something else.")
-
-         (* ;; " NUMBYTES tracks the number of \BINs.  ")
-
-         (IF (EQ CHAR NSCHARSETSHIFT)
-             THEN                                            (* ; 
-                                                             "Shifting character sets, toss CHAR")
-                  (SETQ CSET (\BIN STREAM))
-                  (IF (NEQ NSCHARSETSHIFT CSET)
-                      THEN                                   (* ; 
-                                                             "Shift to new runcode CSET: SH CS CH")
-                           (SETQ CHAR (\BIN STREAM))
-                           (SETQ NUMBYTES 3)
-                           (freplace (STREAM CHARSET) of STREAM with CSET)
-                    ELSEIF (EQ 0 (\BIN STREAM))
-                      THEN                                   (* ; "SH SH CSH  CS CH where CSH is 0")
-
-                           (* ;; 
-    "The high-order character set byte must be 0, because we don't support obese characters (24 bit)")
-
-                           (SETQ CSET (\BIN STREAM))
-                           (SETQ CHAR (\BIN STREAM))         (* ; "To align with below")
-                           (SETQ NUMBYTES 5)
-                           (freplace (STREAM CHARSET) of STREAM with \NORUNCODE)
-                    ELSE (\NSIN.24BITENCODING.ERROR STREAM)) 
-
-                  (* ;; "The stream now knows the new character set, runcoded or not.")
-
-           ELSEIF (EQ CSET \NORUNCODE)
-             THEN                                            (* ; "2-bytes")
-                  (SETQ CSET CHAR)
-                  (SETQ CHAR (\BIN STREAM))
-                  (SETQ NUMBYTES 2)
-           ELSE 
-                (* ;; "Runcoded CSET and CHAR")
-
-                (SETQ NUMBYTES 1))
-         (CL:WHEN COUNTP (SETQ *BYTECOUNTER* NUMBYTES))
-         (CL:WHEN CHAR                                       (* ; 
-                                                "Typically NIL if ENDOFSTREAMOP returned NIL at EOF ")
-             (LOGOR (UNFOLD CSET 256)
-                    CHAR))])
-
-(\XCCSPEEKCCODE
-  [LAMBDA (STREAM NOERROR)                                   (* ; "Edited  8-Dec-2023 15:32 by rmk")
-                                                            (* ; "Edited 21-Jun-2021 23:44 by rmk:")
-
-    (* ;; 
-   "Modeled on \XCCSINCCODE, but peeks at the last byte in the sequence, leaves the stream unchanged")
-
-    (\DTEST STREAM 'STREAM)
-    (LET ((CSET (ffetch (STREAM CHARSET) of STREAM))
-          (CHAR (\PEEKBIN STREAM NOERROR)))
-
-         (* ;; "Returns a 16 bit character code.  Doesn't do EOL conversion--\PEEKCCODE does that.  ")
-
-         (* ;; "We don't change the charset in the stream, put the file ptr back the way it was.")
-
-         (CL:WHEN CHAR
-             (IF (EQ CHAR NSCHARSETSHIFT)
-                 THEN (\BIN STREAM)                          (* ; "Read the peeked shifting byte")
-                      (SETQ CSET (\BIN STREAM))              (* ; "Consume the char shift byte")
-                      (IF (NEQ CSET NSCHARSETSHIFT)
-                          THEN 
-                               (* ;; 
-           "Shift to new runcode CSET: SH CS CH.  We have to BIN what we peeked, BIN, and peek again")
-
-                               (SETQ CHAR (\PEEKBIN STREAM NOERROR))
-                               (\BACKFILEPTR STREAM)
-                               (\BACKFILEPTR STREAM)
-                        ELSEIF (EQ 0 (\BIN STREAM))
-                          THEN                               (* ; "SH SH CSH  CS CH where CSH is 0")
-
-                               (* ;; 
-       "Note: no eof error check on this \BIN -- an eof in the middle of a charset shift is an error")
-
-                               (SETQ CSET (\BIN STREAM))
-                               (SETQ CHAR (\PEEKBIN STREAM NOERROR))
-                               (\BACKFILEPTR STREAM)
-                               (\BACKFILEPTR STREAM)
-                               (\BACKFILEPTR STREAM)
-                               (\BACKFILEPTR STREAM)
-                        ELSE (\NSIN.24BITENCODING.ERROR STREAM))
-               ELSEIF (EQ CSET \NORUNCODE)
-                 THEN                                        (* ; "2 byte runs, BIN/PEEK/BACK")
-                      (SETQ CSET CHAR)
-                      (\BIN STREAM)
-                      (SETQ CHAR (\PEEKBIN STREAM NOERROR))  (* ; "One BACKFILEPTR seems OK")
-                      (\BACKFILEPTR STREAM))
-
-             (* ;; "No need to back up for the runcoded case")
-
-             (CL:WHEN CHAR
-                 (LOGOR (UNFOLD CSET 256)
-                        CHAR)))])
-
-(\XCCSOUTCHAR
-  [LAMBDA (STREAM CHARCODE)                             (* ; "Edited 13-Aug-2021 10:24 by rmk:")
-
-    (* ;; "Closed function for the :XCCS external format, also called when :XCCS is the default")
-
-    (COND
-       ((EQ CHARCODE (CHARCODE EOL))
-        (FREPLACE (STREAM CHARPOSITION) OF STREAM WITH 0)
-        [COND
-           [(NOT (\RUNCODED STREAM))                         (* ; 
-                                         "Charset is a constant 0, we put out the high-order byte.")
-            (\BOUT STREAM (\CHARSET (CHARCODE EOL]
-           ((EQ (\CHARSET (CHARCODE EOL))
-                (ffetch (STREAM CHARSET) of STREAM)))
-           (T                                                (* ; 
-                                      "We are runcoded, and not in character set 0, have to shift.")
-              (\BOUT STREAM NSCHARSETSHIFT)
-              (\BOUT STREAM (freplace (STREAM CHARSET) of STREAM with (\CHARSET
-                                                                                   (CHARCODE EOL]
-
-        (* ;; "We are now in the right charset (0) for the first EOL byte.  For CRLF, the CR is immediately followed by the LF byte, without the prefix 0 byte even if not runcoded, i.e. the 2 bytes are though of as a composite.  The stream is left in CSET0 (the freplace above), read for another shift according to the next shift in a runcoded file.")
-
-        (\BOUTEOL STREAM))
-       (T (CHANGE (FFETCH (STREAM CHARPOSITION) OF STREAM)
-                 (IPLUS16 1 DATUM))
-          (COND
-             ((NOT (\RUNCODED STREAM))
-              (\BOUT STREAM (\CHARSET CHARCODE))
-              (\BOUT STREAM (\CHAR8CODE CHARCODE)))
-             ((EQ (\CHARSET CHARCODE)
-                  (ffetch (STREAM CHARSET) of STREAM))
-              (\BOUT STREAM (\CHAR8CODE CHARCODE)))
-             (T (\BOUT STREAM NSCHARSETSHIFT)
-                (\BOUT STREAM (freplace (STREAM CHARSET) of STREAM with (\CHARSET 
-                                                                                           CHARCODE))
-                       )
-                (\BOUT STREAM (\CHAR8CODE CHARCODE])
-
-(\XCCSBACKCCODE
-  [LAMBDA (STREAM COUNTP)                                    (* ; "Edited  8-Dec-2023 15:34 by rmk")
-                                                             (* ; "Edited 19-Jul-2022 17:12 by rmk")
-                                                            (* ; "Edited 13-Aug-2021 14:08 by rmk:")
-    (DECLARE (USEDFREE *BYTECOUNTER*))
-    (LET ((BYTE (AND (\BACKFILEPTR STREAM)
-                     (\PEEKBIN STREAM)))
-          (CSET (fetch (STREAM CHARSET) of STREAM)))
-         (CL:WHEN BYTE
-
-             (* ;; "The immediately preceding byte must be a character byte. If it is a byte in a runcode, then we are done, even if the byte before is part of a shift sequence.")
-
-             (* ;; "But if we are currently in a nonruncoded file, we have to go back one more to get the character set byte.")
-
-             (* ;; "If we can't back up, we are already at the beginning.")
-
-             (IF (EQ \NORUNCODE CSET)
-                 THEN (IF (\BACKFILEPTR STREAM)
-                          THEN (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -2))
-                               (LOGOR (UNFOLD (\PEEKBIN STREAM)
-                                             256)
-                                      BYTE)
-                        ELSE (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -1))
-                             NIL)
-               ELSE (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -1))
-                    (LOGOR (UNFOLD CSET 256)
-                           BYTE)))])
-
-(\XCCSFORMATBYTESTREAM
-  [LAMBDA (STREAM BYTESTREAM)                                (* ; "Edited 26-Mar-2024 11:00 by rmk")
-                                                             (* ; "Edited 19-Mar-2024 16:02 by rmk")
-    (\EXTERNALFORMAT BYTESTREAM (\EXTERNALFORMAT STREAM))
-
-    (* ;; "This stream may be read as a continuation of STREAM (TTYIN, LAFITE?), and we want to make sure that the bytes are encoded properly.  So let's assert (and possibly mark) that that's its current situation.")
-
-    (\XCCSCHARSETFN BYTESTREAM (fetch (STREAM CHARSET) of STREAM))
-    BYTESTREAM])
-
-(\XCCSCHARSETFN
-  [LAMBDA (STREAM CHARSET DONTMARKSTREAM)                    (* ; "Edited  9-Dec-2023 11:18 by rmk")
-
-    (* ;; "This differs from  \GENERIC.CHARSET in that it actually writes the shifting bytes into an output stream, unless DONTMARKSTREAM.  It will do write the shifts, even if it just replicates the situation that is already there (presumably CHARSET = the old CHARSET).  The client should test and avoid calling if useless shifts are not desired.")
-
-    (LET [(CSET (ffetch (STREAM CHARSET) of (\DTEST STREAM 'STREAM]
-         (CL:WHEN CHARSET
-             (CL:WHEN (EQ CHARSET T)
-                    (SETQ CHARSET \NORUNCODE))
-             (CL:UNLESS (EQ CHARSET CSET)
-                 (freplace (STREAM CHARSET) of STREAM with CHARSET)
-                 (CL:UNLESS DONTMARKSTREAM
-                     (CL:WHEN (\IOMODEP STREAM 'OUTPUT T)
-                         (\BOUT STREAM NSCHARSETSHIFT)
-                         (if (EQ CHARSET \NORUNCODE)
-                             then (\BOUT STREAM \NORUNCODE)
-                                  (\BOUT STREAM 0)
-                           else (\BOUT STREAM CHARSET))))))
-         CSET])
-)
-(DEFINEQ
-
-(\CREATE.XCCS.EXTERNALFORMAT
-  [LAMBDA (NAME EOL)                                         (* ; "Edited  7-Dec-2023 23:03 by rmk")
-                                                             (* ; "Edited 30-Jun-2022 18:08 by rmk")
-                                                            (* ; "Edited 10-Sep-2021 19:49 by rmk:")
-
-(* ;;; "Create the :XCCS external format.  Stream's EOL overrides the (vacuous) default here")
-
-    (MAKE-EXTERNALFORMAT (OR NAME :XCCS)
-           (FUNCTION \XCCSINCCODE)
-           (FUNCTION \XCCSPEEKCCODE)
-           (FUNCTION \XCCSBACKCCODE)
-           (FUNCTION \XCCSOUTCHAR)
-           (FUNCTION \XCCSFORMATBYTESTREAM)
-           (OR EOL 'LF)
-           T NIL NIL (FUNCTION \XCCSCHARSETFN])
-)
-(DEFINEQ
-
-(\NSIN.24BITENCODING.ERROR
-  [LAMBDA (STREAM)                                       (* bvm%: "12-Mar-86 15:35")
-    (DECLARE (USEDFREE *SIGNAL-24BIT-NSENCODING-ERROR*))
-
-(* ;;; "Called if we see the sequence shift,shift on STREAM -- means shift to 24-bit character set, which we don't support.  Usually this just means we're erroneously reading a binary file as text.  If this function returns, its value is taken as a character set to shift to")
-
-    (COND
-       (*SIGNAL-24BIT-NSENCODING-ERROR*                      (* ; 
-                                                           "Only cause error if user/reader cares")
-              (ERROR "24-bit NS encoding not supported" STREAM)))
-                                                             (* ; "Return charset zero")
-    0])
-)
-(DEFINEQ
-
-(KANJICHARSETP
-  [LAMBDA (CHARSET)                                          (* ; "Edited 13-Jun-2025 16:33 by rmk")
-
-    (* ;; "Returns CHARSET if it is a charset with MCCS Kanji characters")
-
-    (AND (<= 48 CHARSET 118)
-         CHARSET])
-
-(CHINESECHARSETP
-  [LAMBDA (CHARSET)                                          (* ; "Edited 18-Jun-2025 23:09 by rmk")
-                                                             (* ; "Edited 13-Jun-2025 16:33 by rmk")
-
-    (* ;; "Returns CHARSET if it is a charset with MCCS Chinese characters")
-
-    (AND (<= 161 CHARSET 212)
-         CHARSET])
-)
-
-(RPAQ? *SIGNAL-24BIT-NSENCODING-ERROR* )
-(DECLARE%: EVAL@COMPILE DONTCOPY 
-(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
-
-(RPAQQ \NORUNCODE 255)
-
-(RPAQQ NSCHARSETSHIFT 255)
-
-
-(CONSTANTS (\NORUNCODE 255)
-       (NSCHARSETSHIFT 255))
-)
-(DECLARE%: EVAL@COMPILE 
-
-(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)))
-)
-
-(* "END EXPORTED DEFINITIONS")
-
-)
-(DECLARE%: DONTEVAL@LOAD DOCOPY 
-
-(\CREATE.XCCS.EXTERNALFORMAT)
-)
-(DECLARE%: DONTCOPY
-  (FILEMAP (NIL (997 12253 (\XCCSINCCODE 1007 . 3986) (\XCCSPEEKCCODE 3988 . 6657) (\XCCSOUTCHAR 6659 . 
-8879) (\XCCSBACKCCODE 8881 . 10425) (\XCCSFORMATBYTESTREAM 10427 . 11048) (\XCCSCHARSETFN 11050 . 
-12251)) (12254 13027 (\CREATE.XCCS.EXTERNALFORMAT 12264 . 13025)) (13028 13859 (
-\NSIN.24BITENCODING.ERROR 13038 . 13857)) (13860 14500 (KANJICHARSETP 13870 . 14126) (CHINESECHARSETP 
-14128 . 14498)))))
-STOP
diff --git a/sources/XCCS.LCOM b/sources/XCCS.LCOM
deleted file mode 100644
index 031ae49d..00000000
Binary files a/sources/XCCS.LCOM and /dev/null differ
