Fixes a typo in internal/loadups/man-page/loadup.1.md & derived files. (#2542 )

Resolves #2536
Fixes a typo in internal/loadups/man-page/loadup.1.md & derived files.
2026-03-18 08:02:37 +00:00 · 2026-03-15 19:05:23 -07:00 · 2026-03-14 21:17:15 -07:00 · 2026-03-09 23:07:30 -07:00 · 2026-03-09 12:31:01 -07:00 · 2026-03-08 09:26:18 -07:00
9 changed files with 83 additions and 65 deletions
--- a/internal/loadups/man-page/loadup.1
+++ b/internal/loadups/man-page/loadup.1
@@ -111,7 +111,7 @@ output directory called \f[I]gitinfo\f[R] which contains the git commit,
 git branch and git status information for the directory at the time the
 loadup is run.
 .PP
-Only one instance (per <MEDLEIDIR>) of loadup can be run at a time.
+Only one instance (per <MEDLEYDIR>) of loadup can be run at a time.
 There is lock file to prevent simultaneous loadups in the work directory
 (named \f[B]\f[BI]lock\f[B]\f[R]) that can be manually removed.
 The lock can also be automatically overridden (see the --override flag
--- a/internal/loadups/man-page/loadup.1.gz
+++ b/internal/loadups/man-page/loadup.1.gz
--- a/internal/loadups/man-page/loadup.1.md
+++ b/internal/loadups/man-page/loadup.1.md
@@ -52,7 +52,7 @@ Loadup does all of its work in a work directory (\<MEDLEYDIR>/loadups/build).  T

 If \<MEDLEYDIR> is a git directory, then a file is created in the loadups output directory called *gitinfo* which contains the git commit, git branch and git status information for the directory at the time the loadup is run.

-Only one instance (per \<MEDLEIDIR>) of loadup can be run at a time.  There is lock file to prevent simultaneous loadups in the work directory (named ***lock***) that can be manually removed.  The lock can also be automatically overridden (see the \-\-override flag below). Alternatively, if a lock is encountered at run time, the user will be asked to choose whether to override or simply exit the loadup.
+Only one instance (per \<MEDLEYDIR>) of loadup can be run at a time.  There is lock file to prevent simultaneous loadups in the work directory (named ***lock***) that can be manually removed.  The lock can also be automatically overridden (see the \-\-override flag below). Alternatively, if a lock is encountered at run time, the user will be asked to choose whether to override or simply exit the loadup.

 Note: **MEDLEYDIR** is an environment variable set by the loadup script.  It is set to the top level directory of the Medley installation that contains the specific loadup script that
 is invoked after all symbolic links are resolved.  In the standard global installation this will 
--- a/internal/loadups/man-page/man_loadup.html
+++ b/internal/loadups/man-page/man_loadup.html
@@ -83,7 +83,7 @@ the work directory after the loadup completes.</p>
 the loadups output directory called <em>gitinfo</em> which contains the
 git commit, git branch and git status information for the directory at
 the time the loadup is run.</p>
-<p>Only one instance (per &lt;MEDLEIDIR&gt;) of loadup can be run at a
+<p>Only one instance (per &lt;MEDLEYDIR&gt;) of loadup can be run at a
 time. There is lock file to prevent simultaneous loadups in the work
 directory (named <strong><em>lock</em></strong>) that can be manually
 removed. The lock can also be automatically overridden (see the
--- a/lispusers/VERSIONDEFS
+++ b/lispusers/VERSIONDEFS
@@ -1,22 +1,21 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)

-(FILECREATED "27-Jan-2025 08:49:34" {WMEDLEY}<lispusers>VERSIONDEFS.;12 5880   
+(FILECREATED " 7-Mar-2026 22:55:43" {WMEDLEY}<lispusers>VERSIONDEFS.;18 6534   

      :EDIT-BY rmk

-      :CHANGES-TO (FNS GETVINFO)
-
-      :PREVIOUS-DATE "12-Dec-2024 15:07:45" {WMEDLEY}<lispusers>VERSIONDEFS.;11)
+      :PREVIOUS-DATE " 6-Mar-2026 22:47:25" {WMEDLEY}<lispusers>VERSIONDEFS.;17)


 (PRETTYCOMPRINT VERSIONDEFSCOMS)

-(RPAQQ VERSIONDEFSCOMS [(FNS FINDFILEVERSION GETVINFO VERSIONP)
-                        (FNS EDV DFV)
-                        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
-                               (ADDVARS (NLAMA DFV EDV)
-                                      (NLAML)
-                                      (LAMA])
+(RPAQQ VERSIONDEFSCOMS
+       [(FNS FINDFILEVERSION GETVINFO VERSIONP)
+        (FNS EDV DFV)
+        (PROP ARGNAMES EDV DFV)
+        (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA DFV EDV)
+                                                                             (NLAML)
+                                                                             (LAMA])
 (DEFINEQ

 (FINDFILEVERSION
@@ -119,16 +118,26 @@
          (CAR VINFO])

 (DFV
-  [NLAMBDA ARGS                                              (* ; "Edited  6-Dec-2024 21:29 by rmk")
+  [NLAMBDA ARGS                                              (* ; "Edited  6-Mar-2026 22:42 by rmk")
+                                                             (* ; "Edited  6-Dec-2024 21:29 by rmk")
                                                             (* ; "Edited  2-Dec-2024 00:08 by rmk")
    (SETQ ARGS (MKLIST ARGS))
-    (APPLY (FUNCTION EDV)
-           (LIST (POP ARGS)
-                 NIL
-                 (POP ARGS)
-                 (POP ARGS)
-                 (POP ARGS])
+    (LET ((NAME (POP ARGS)))                                 (* ; "If FNS and FUNCTIONS, show both")
+         (CL:WHEN (HASDEF NAME 'FUNCTIONS '?)
+             (APPLY (FUNCTION EDV)
+                    (LIST NAME 'FUNCTIONS (POP ARGS)
+                          (POP ARGS)
+                          (POP ARGS))))
+         (CL:WHEN (HASDEF NAME 'FNS '?)
+             (APPLY (FUNCTION EDV)
+                    (LIST NAME 'FNS (POP ARGS)
+                          (POP ARGS)
+                          (POP ARGS))))])
 )
+
+(PUTPROPS EDV ARGNAMES (NAME TYPE FILE VERSION DIRLST . VINFO))
+
+(PUTPROPS DFV ARGNAMES (NAME FILE VERSION DIRLST . VINFO))
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS 

 (ADDTOVAR NLAMA DFV EDV)
@@ -138,6 +147,6 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (671 4570 (FINDFILEVERSION 681 . 2128) (GETVINFO 2130 . 4253) (VERSIONP 4255 . 4568)) (
-4571 5717 (EDV 4581 . 5281) (DFV 5283 . 5715)))))
+  (FILEMAP (NIL (706 4605 (FINDFILEVERSION 716 . 2163) (GETVINFO 2165 . 4288) (VERSIONP 4290 . 4603)) (
+4606 6230 (EDV 4616 . 5316) (DFV 5318 . 6228)))))
 STOP
--- a/lispusers/VERSIONDEFS.LCOM
+++ b/lispusers/VERSIONDEFS.LCOM
--- a/lispusers/VERSIONDEFS.TEDIT
+++ b/lispusers/VERSIONDEFS.TEDIT
--- a/sources/BOOTSTRAP
+++ b/sources/BOOTSTRAP
@@ -1,12 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)

-(FILECREATED "25-Feb-2026 15:03:24" {WMEDLEY}<sources>BOOTSTRAP.;69 47041  
+(FILECREATED " 2-Mar-2026 12:03:05" {WMEDLEY}<sources>BOOTSTRAP.;71 47856  

      :EDIT-BY rmk

-      :CHANGES-TO (FNS MAKE-DEFINE-FILE-INFO-ENV READ-READER-ENVIRONMENT)
+      :CHANGES-TO (FNS READ-READER-ENVIRONMENT)

-      :PREVIOUS-DATE "25-Feb-2026 13:52:00" {WMEDLEY}<sources>BOOTSTRAP.;66)
+      :PREVIOUS-DATE "25-Feb-2026 15:03:24" {WMEDLEY}<sources>BOOTSTRAP.;69)


 (PRETTYCOMPRINT BOOTSTRAPCOMS)
@@ -800,7 +800,9 @@
             (TERPRI STREAM)))])

 (READ-READER-ENVIRONMENT
-  [LAMBDA (STREAM DEFAULTENV RETURNFORM)                     (* ; "Edited 25-Feb-2026 14:15 by rmk")
+  [LAMBDA (STREAM DEFAULTENV RETURNFORM)                     (* ; "Edited  2-Mar-2026 12:03 by rmk")
+                                                             (* ; "Edited  1-Mar-2026 10:49 by rmk")
+                                                             (* ; "Edited 25-Feb-2026 14:15 by rmk")
                                                            (* ; "Edited 26-Sep-2021 23:31 by rmk:")

    (* ;; "Starting environment is the old interlisp file, just for the seprchar scans.")
@@ -809,42 +811,49 @@

    (* ;; "RETURNFORM=T means return the DEFINE-FILE-INFO as a second value, for READFILE")

-    (CL:UNLESS DEFAULTENV (SETQ DEFAULTENV *OLD-INTERLISP-READ-ENVIRONMENT*))
-    (LET ((START (GETFILEPTR STREAM))
-          ARGS
-          (ENV DEFAULTENV)
-          (*READTABLE* (FETCH (READER-ENVIRONMENT REREADTABLE) OF *OLD-INTERLISP-READ-ENVIRONMENT*)))
-         (DECLARE (SPECVARS *READTABLE*))
-         (SETFILEPTR STREAM 0)                               (* ; "Hope we are RANDACCESSP")
-         (SELCHARQ (SKIPSEPRCODES STREAM)
-              (";"                                           (* ; "Assume it's a common lisp file")
-                   (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
+    (if (\GETSTREAM STREAM 'INPUT T)
+        then (CL:UNLESS DEFAULTENV (SETQ DEFAULTENV *OLD-INTERLISP-READ-ENVIRONMENT*))
+             (LET ((START (GETFILEPTR STREAM))
+                   ARGS
+                   (ENV DEFAULTENV)
+                   (*READTABLE* (FETCH (READER-ENVIRONMENT REREADTABLE) OF 
+                                                                     *OLD-INTERLISP-READ-ENVIRONMENT*
+                                       )))
+                  (DECLARE (SPECVARS *READTABLE*))
+                  (SETFILEPTR STREAM 0)                      (* ; "Hope we are RANDACCESSP")
+                  (SELCHARQ (SKIPSEPRCODES STREAM)
+                       (";"                                  (* ; "Assume it's a common lisp file")
+                            (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
                                                                       *COMMON-LISP-READ-ENVIRONMENT*
-                                                  ))
-                   *COMMON-LISP-READ-ENVIRONMENT*)
-              ("(" (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
+                                                           ))
+                            *COMMON-LISP-READ-ENVIRONMENT*)
+                       ("(" (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
                                                                               *DEFINE-FILE-INFO-ENV*
-                                                  ))         (* ; 
+                                                           ))(* ; 
                                                             "Should we reset the format if we fail?")
-                   (READCCODE STREAM)
-                   (WITH-READER-ENVIRONMENT *DEFINE-FILE-INFO-ENV*
-                       (if (STREQUAL "DEFINE-FILE-INFO" (RSTRING STREAM))
-                           then 
-                                (* ;; 
+                            (READCCODE STREAM)
+                            (WITH-READER-ENVIRONMENT *DEFINE-FILE-INFO-ENV*
+                                (if (STREQUAL "DEFINE-FILE-INFO" (RSTRING STREAM))
+                                    then 
+                                         (* ;; 
        "After the \DO-DEFINE-FILE-INFO, we have the new environment and we have set the new format.")

-                                (SETQ ARGS (CL:READ-DELIMITED-LIST (CHARCODE ")")
-                                                  STREAM))
-                                (SETQ ENV (\DO-DEFINE-FILE-INFO STREAM ARGS))
-                         else (SETFILEPTR STREAM START))
+                                         (SETQ ARGS (CL:READ-DELIMITED-LIST (CHARCODE ")")
+                                                           STREAM))
+                                         (SETQ ENV (\DO-DEFINE-FILE-INFO STREAM ARGS))
+                                  else (SETFILEPTR STREAM START))

-                       (* ;; 
+                                (* ;; 
                   "If we didn't see ARGS, then we didn't see a DEFINE-FILE-INFO, no form to return.")

-                       (CL:IF (AND RETURNFORM ARGS)
-                           (CL:VALUES ENV (CONS 'DEFINE-FILE-INFO ARGS))
-                           ENV)))
-              DEFAULTENV])
+                                (CL:IF (AND RETURNFORM ARGS)
+                                    (CL:VALUES ENV (CONS 'DEFINE-FILE-INFO ARGS))
+                                    ENV)))
+                       DEFAULTENV))
+      else (CL:WITH-OPEN-FILE (STRM (OR (FINDFILE STREAM T)
+                                        STREAM)
+                                    :DIRECTION :INPUT)
+                  (READ-READER-ENVIRONMENT STRM DEFAULTENV RETURNFORM])

 (MAKE-DEFINE-FILE-INFO-ENV
  [LAMBDA NIL                                                (* ; "Edited 25-Feb-2026 15:03 by rmk")
@@ -969,13 +978,13 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4621 14293 (GETPROP 4631 . 5203) (SETATOMVAL 5205 . 5334) (RPAQQ 5336 . 5389) (RPAQ 
-5391 . 5703) (RPAQ? 5705 . 6075) (MOVD 6077 . 7941) (MOVD? 7943 . 8373) (SELECTQ 8375 . 8562) (
-SELECTQ1 8564 . 8906) (NCONC1 8908 . 9104) (PUTPROP 9106 . 10590) (PROPNAMES 10592 . 10783) (ADDPROP 
-10785 . 12848) (REMPROP 12850 . 13704) (MEMB 13706 . 13965) (CLOSEF? 13967 . 14291)) (14366 34343 (
-LOAD 14376 . 15545) (\LOAD-STREAM 15547 . 28034) (FILECREATED 28036 . 29454) (FILECREATED1 29456 . 
-30564) (PRETTYCOMPRINT 30566 . 31051) (BOOTSTRAP-NAMEFIELD 31053 . 32013) (PUTPROPS 32015 . 32383) (
-DECLARE%: 32385 . 32517) (DECLARE%:1 32519 . 33391) (ROOTFILENAME 33393 . 34341)) (34381 44987 (
-DEFINE-FILE-INFO 34391 . 34826) (\DO-DEFINE-FILE-INFO 34828 . 38971) (PRINT-READER-ENVIRONMENT 38973
- . 40725) (READ-READER-ENVIRONMENT 40727 . 43553) (MAKE-DEFINE-FILE-INFO-ENV 43555 . 44985)))))
+  (FILEMAP (NIL (4595 14267 (GETPROP 4605 . 5177) (SETATOMVAL 5179 . 5308) (RPAQQ 5310 . 5363) (RPAQ 
+5365 . 5677) (RPAQ? 5679 . 6049) (MOVD 6051 . 7915) (MOVD? 7917 . 8347) (SELECTQ 8349 . 8536) (
+SELECTQ1 8538 . 8880) (NCONC1 8882 . 9078) (PUTPROP 9080 . 10564) (PROPNAMES 10566 . 10757) (ADDPROP 
+10759 . 12822) (REMPROP 12824 . 13678) (MEMB 13680 . 13939) (CLOSEF? 13941 . 14265)) (14340 34317 (
+LOAD 14350 . 15519) (\LOAD-STREAM 15521 . 28008) (FILECREATED 28010 . 29428) (FILECREATED1 29430 . 
+30538) (PRETTYCOMPRINT 30540 . 31025) (BOOTSTRAP-NAMEFIELD 31027 . 31987) (PUTPROPS 31989 . 32357) (
+DECLARE%: 32359 . 32491) (DECLARE%:1 32493 . 33365) (ROOTFILENAME 33367 . 34315)) (34355 45802 (
+DEFINE-FILE-INFO 34365 . 34800) (\DO-DEFINE-FILE-INFO 34802 . 38945) (PRINT-READER-ENVIRONMENT 38947
+ . 40699) (READ-READER-ENVIRONMENT 40701 . 44368) (MAKE-DEFINE-FILE-INFO-ENV 44370 . 45800)))))
 STOP
--- a/sources/BOOTSTRAP.LCOM
+++ b/sources/BOOTSTRAP.LCOM
Author	SHA1	Message	Date
Matt Heffron	13eb940538	Fixes a typo in internal/loadups/man-page/loadup.1.md & derived files. (#2542 ) Resolves #2536	2026-03-15 19:05:23 -07:00
Matt Heffron	3dc2bba019	Fixes a typo in internal/loadups/man-page/loadup.1.md & derived files.	2026-03-14 21:17:15 -07:00
Larry Masinter	322b2e0fbe	DFV gets FNS and/or FUNCTIONS, depending on what definitions exist (#2530 ) If both exist, it brings up 2 Sedit windows. The relative version numbers are currently mapped to Medley absolute version numbers. It would be nice to extend VERSIONDEFS with a function (say GEDV) that maps the relative version numbers into the definitions on git-file versions, by looking at the history. So (GEDV 'FOO 'RECORD -3) would find the file for FOO's record declaration from WHEREIS, and get the definition from the version 3 commits back. But GITFNS doesn't currently have a primitive for fetching and interpreting history.	2026-03-09 23:07:30 -07:00
rmkaplan	a24a4dffc2	READ-READER-ENVIRONMENT can take a file name in addition to an open stream (#2531 )	2026-03-09 12:31:01 -07:00
rmkaplan	b8c0c594a9	DFV gets FNS and/or FNS, depending on what definitions exist	2026-03-08 09:26:18 -07:00