merging PRINTFN

2026-02-27 01:19:42 +00:00 · 2021-10-21 12:51:16 -07:00
parent 31d9473184 1beba945a2
commit 9b4976e33f
5 changed files with 53 additions and 34 deletions
--- a/sources/CMLEXEC
+++ b/sources/CMLEXEC
@@ -1,13 +1,14 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED "21-Jan-93 11:16:01" {DSK}<python>lde>lispcore>sources>CMLEXEC.;2 92477  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

-      changes to%:  (FUNCTIONS ADD-EXEC)
+(FILECREATED " 8-Oct-2021 10:51:35" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLEXEC.;2 92464  

-      previous date%: "25-Jun-91 12:22:29" {DSK}<python>lde>lispcore>sources>CMLEXEC.;1)
+      previous date%: "21-Jan-93 11:16:01" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>CMLEXEC.;1)


 (* ; "
-Copyright (c) 1985, 1986, 1987, 1988, 1990, 1991, 1993 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1985-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
 ")

 (PRETTYCOMPRINT CMLEXECCOMS)
@@ -1748,13 +1749,24 @@ Copyright (c) 1985, 1986, 1987, 1988, 1990, 1991, 1993 by Venue & Xerox Corporat

 (ADDTOVAR LAMA )
 )
-(PUTPROPS CMLEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991 1993))
+(PUTPROPS CMLEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991 1993 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (33304 34258 (COPY-CIRCLE 33314 . 34256)) (34336 37641 (EXEC-READ 34346 . 37507) (DIR 
-37509 . 37639)) (39903 67037 (DO-APPLY-EVENT 39913 . 40475) (DO-HISTORY-SEARCH 40477 . 41934) (
-EVAL-INPUT 41936 . 47365) (EVENTS-INPUT 47367 . 48745) (EXEC-PRIN1 48747 . 48923) (EXEC-VALUE-OF 48925
- . 49264) (GET-NEXT-HISTORY-EVENT 49266 . 50761) (HISTORY-ADD-TO-SPELLING-LISTS 50763 . 51751) (
-HISTORY-NTH 51753 . 52503) (PRINT-HISTORY 52505 . 53126) (FIND-HISTORY-EVENTS 53128 . 58189) (
-PRINT-EVENT 58191 . 62412) (PRINT-EVENT-PROMPT 62414 . 63618) (PROCESS-EXEC-ID 63620 . 64565) (
-SEARCH-FOR-EVENT-NUMBER 64567 . 65195) (\PICK.EVALQT 65197 . 65708) (LISPXREPRINT 65710 . 67035)))))
+  (FILEMAP (NIL (3978 4383 (XCL::EXEC-CLOSEFN 3978 . 4383)) (4385 4721 (XCL::EXEC-SHRINKFN 4385 . 4721))
+ (4723 4963 (XCL::SETUP-EXEC-WINDOW 4723 . 4963)) (4965 5211 (XCL::EXEC-TITLE-FUNCTION 4965 . 5211)) (
+5213 8519 (FIX-FORM 5213 . 8519)) (8521 8641 (XCL::GET-PROCESS-PROFILE 8521 . 8641)) (8643 8924 (
+XCL::SAVE-CURRENT-EXEC-PROFILE 8643 . 8924)) (8926 9216 (XCL::SETF-GET-PROCESS-PROFILE 8926 . 9216)) (
+9218 9785 (XCL:SET-EXEC-TYPE 9218 . 9785)) (9787 9869 (XCL:SET-DEFAULT-EXEC-TYPE 9787 . 9869)) (9871 
+10282 (XCL::ENTER-EXEC-FUNCTION 9871 . 10282)) (10357 16750 (DO-EVENT 10357 . 16750)) (16752 23543 (
+EXEC 16752 . 23543)) (23545 24886 (EXEC-EVAL 23545 . 24886)) (24888 25619 (PRINT-ALL-DOCUMENTATION 
+24888 . 25619)) (25621 26063 (PRINT-DOCUMENTATION 25621 . 26063)) (26146 27230 (ADD-EXEC 26146 . 27230
+)) (27232 30828 (EXEC-READ-LINE 27232 . 30828)) (30899 31385 (FIND-EXEC-COMMAND 30899 . 31385)) (31387
+ 33285 (CIRCLAR-COPYER 31387 . 33285)) (33286 34240 (COPY-CIRCLE 33296 . 34238)) (34318 37623 (
+EXEC-READ 34328 . 37489) (DIR 37491 . 37621)) (39885 67019 (DO-APPLY-EVENT 39895 . 40457) (
+DO-HISTORY-SEARCH 40459 . 41916) (EVAL-INPUT 41918 . 47347) (EVENTS-INPUT 47349 . 48727) (EXEC-PRIN1 
+48729 . 48905) (EXEC-VALUE-OF 48907 . 49246) (GET-NEXT-HISTORY-EVENT 49248 . 50743) (
+HISTORY-ADD-TO-SPELLING-LISTS 50745 . 51733) (HISTORY-NTH 51735 . 52485) (PRINT-HISTORY 52487 . 53108)
+ (FIND-HISTORY-EVENTS 53110 . 58171) (PRINT-EVENT 58173 . 62394) (PRINT-EVENT-PROMPT 62396 . 63600) (
+PROCESS-EXEC-ID 63602 . 64547) (SEARCH-FOR-EVENT-NUMBER 64549 . 65177) (\PICK.EVALQT 65179 . 65690) (
+LISPXREPRINT 65692 . 67017)) (68199 68298 (EXEC-PRINT 68199 . 68298)) (68300 68565 (EXEC-FORMAT 68300
+ . 68565)))))
 STOP
--- a/sources/CMLEXEC.LCOM
+++ b/sources/CMLEXEC.LCOM
--- a/sources/DEXEC
+++ b/sources/DEXEC
@@ -1,14 +1,15 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED "13-Aug-2020 12:36:18" {DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>DEXEC.;10 5477   
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

-      changes to%:  (VARS DEXECCOMS)
+(FILECREATED " 7-Oct-2021 14:29:56" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.;4 5554   

-      previous date%: "13-Aug-2020 12:31:18" 
-{DSK}<Users>kaplan>Local>medley3.5>lispcore>sources>DEXEC.;9)
+      changes to%:  (FNS SEE* COPYALLBYTES)
+
+      previous date%: "13-Aug-2020 12:36:18" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>DEXEC.;1)


 (* ; "
-Copyright (c) 1982, 1983, 1984, 1985, 1986, 1990, 2018, 2020 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1982-1986, 1990, 2018, 2020-2021 by Venue & Xerox Corporation.
 The following program was created in 1982 but has not been published
 within the meaning of the copyright law, is furnished under license,
 and may not be used, copied and/or disclosed except in accordance
@@ -20,7 +21,7 @@ with the terms of said license.
 (RPAQQ DEXECCOMS
       [

-(* ;;; "Has to come after ADISPLAY and CMLEXEC.")
+(* ;;; "Has to come after ADISPLAY and CMLEXEC.")

        (COMMANDS "see" "see*" "ty" "type")
        (INITVARS (/LAST.CONNECTED.DIRECTORY LOGINHOST/DIR))
@@ -74,22 +75,24 @@ with the terms of said license.
    (CNDIR HOST/DIR])

 (COPYALLBYTES
-  [LAMBDA (FROMFILE TOFILE BYTESIZE EXTERNALFORMAT)     (* ; "Edited 11-Aug-2020 20:35 by rmk:")
-                                                             (* bvm%: "29-Jan-86 19:50")
+  [LAMBDA (FROMFILE TOFILE BYTESIZE FORMAT)             (* ; "Edited  7-Oct-2021 13:15 by rmk:")
+                                                             (* bvm%: "29-Jan-86 19:50")
+
+    (* ;; "RMK: Removed PFDEFAULT arg to PFCOPYBYTES.  Probably should remove BYTESIZE test")
+
    (RESETLST
        [PROG (INF OUTF PTR)
              [COND
                 (FROMFILE [RESETSAVE NIL (LIST 'CLOSEF (SETQ INF (OPENSTREAM
                                                                   FROMFILE
                                                                   'INPUT NIL
-                                                                   `((EXTERNALFORMAT ,EXTERNALFORMAT)
-                                                                     )
+                                                                   `((EXTERNALFORMAT ,FORMAT))
                                                                   BYTESIZE]
                        (OR (EQ (GETFILEPTR INF)
                                0)
                            (SETFILEPTR INF 0)))
-                 (T (SETQ INF (INPUT]                        (* close the files only if I opened 
-                                                           them)
+                 (T (SETQ INF (INPUT]                        (* close the files only if I opened 
+                                                           them)
              [COND
                 ((NULL TOFILE)
                  (SETQ OUTF (OUTPUT)))
@@ -98,7 +101,7 @@ with the terms of said license.
              (COND
                 ((AND (NULL BYTESIZE)
                       (DISPLAYP OUTF))
-                  (PFCOPYBYTES INF OUTF NIL NIL PFDEFAULT))
+                  (PFCOPYBYTES INF OUTF))
                 (T (COPYBYTES INF OUTF])])

 (SEE
@@ -110,11 +113,14 @@ with the terms of said license.
           (CADDR LINE))))

 (SEE*
-  [NLAMBDA LINE                                         (* ; "Edited  1-May-2018 10:22 by rmk:")
+  [NLAMBDA LINE                                         (* ; "Edited  7-Oct-2021 14:29 by rmk:")
+
+    (* ;; "RMK: RESETVARS because **COMMENT**FLG is global")
+
    (SETQ LINE (NLAMBDA.ARGS LINE))
-    (LET ((**COMMENT**FLG NIL))
-         (APPLY (FUNCTION SEE)
-                LINE])
+    (RESETVARS (**COMMENT**FLG)
+               (APPLY (FUNCTION SEE)
+                      LINE])
 )
 (RPAQ SAVINGCURSOR (CURSORCREATE (QUOTE #*(16 16)@@@@FDJ@HJJ@LJJ@BNJLJJD@LJD@@@@@@JDN@KEB@KE@@JMF@JMB@JEL@@@@@@@@
 ) (QUOTE NIL) 0 15))
@@ -136,8 +142,9 @@ with the terms of said license.

 (ADDTOVAR LAMA )
 )
-(PUTPROPS DEXEC COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1990 2018 2020))
+(PUTPROPS DEXEC COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1990 2018 2020 2021)
+)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2246 4697 (/CNDIR 2256 . 2693) (COPYALLBYTES 2695 . 4211) (SEE 4213 . 4457) (SEE* 4459
- . 4695)))))
+  (FILEMAP (NIL (2230 4768 (/CNDIR 2240 . 2677) (COPYALLBYTES 2679 . 4203) (SEE 4205 . 4449) (SEE* 4451
+ . 4766)))))
 STOP
--- a/sources/DEXEC.LCOM
+++ b/sources/DEXEC.LCOM
--- a/sources/PRINTFN.LCOM
+++ b/sources/PRINTFN.LCOM