From e22f10b19a643dab66a830672f9180f3e6e16d48 Mon Sep 17 00:00:00 2001
From: rmkaplan <69548581+rmkaplan@users.noreply.github.com>
Date: Sun, 24 Apr 2022 11:32:59 -0700
Subject: [PATCH] Rmk30 WHEREIS for missing GETFN, TMAX fixed (#749)

* MACHINEINDEPENDENT: better searching for foo-fie

FINDFILE-WITH-EXTENSIONS, DOFILESLOAD

* MEDLEY-UTILS, PRINTFN:  WHEREIS/PF know about foo>foo-fie

* WHERE-IS:  Just MAKEFILE-NEW to get FUNCTIONS into the filemap

* ACE does LOADCOMP itself

* MACHINEINDEPENDENT:  FINDFILE-WITH-EXTENSIONS recognized SUBDIRECTORY

* SPELLFILE:  Calls FINDFILE-WITH-EXTENSIONS at the top

So FINDFILE and FILE-NOT-FOUND will consider FOO>FOO-FIE for file FOO-FIE

* WINDOWOBJ:  Missing GETFN does WHEREIS #748

* TMAX*:  Localize IMAGEFNS

The various IMAGEFNS were defined on TMAX itself, not on the file where the functions were (esp GETFN).

Also fixed some dependencies.  With new WINDOWOBJ, TMAX.TEDIT finds its image objects.

* WINDOWOBJ again:  SYSLOAD the GETFN file

Co-authored-by: Larry Masinter <LMM@acm.org>
---
 lispusers/{TMAX => tmax}/TMAX              |   0
 lispusers/{TMAX => tmax}/TMAX-DATE         |   0
 lispusers/{TMAX => tmax}/TMAX-DATE.LCOM    | Bin
 lispusers/{TMAX => tmax}/TMAX-ENDNOTE      |   0
 lispusers/{TMAX => tmax}/TMAX-ENDNOTE.LCOM | Bin
 lispusers/{TMAX => tmax}/TMAX-INDEX        |   0
 lispusers/{TMAX => tmax}/TMAX-INDEX.LCOM   | Bin
 lispusers/{TMAX => tmax}/TMAX-INTRO.TXT    |   0
 lispusers/{TMAX => tmax}/TMAX-NGRAPH       |   0
 lispusers/{TMAX => tmax}/TMAX-NGRAPH.LCOM  | Bin
 lispusers/{TMAX => tmax}/TMAX-NGROUP       |   0
 lispusers/{TMAX => tmax}/TMAX-NGROUP.LCOM  | Bin
 lispusers/{TMAX => tmax}/TMAX-NUMBER       |   0
 lispusers/{TMAX => tmax}/TMAX-NUMBER.LCOM  | Bin
 lispusers/{TMAX => tmax}/TMAX-XREF         |   0
 lispusers/{TMAX => tmax}/TMAX-XREF.LCOM    | Bin
 lispusers/{TMAX => tmax}/TMAX.LCOM         | Bin
 lispusers/{TMAX => tmax}/TMAX.TEDIT        | Bin
 lispusers/{TMAX => tmax}/TMAX.TOC          | Bin
 sources/WINDOWOBJ                          |  21 +++++++++++----------
 sources/WINDOWOBJ.LCOM                     | Bin 11314 -> 11333 bytes
 21 files changed, 11 insertions(+), 10 deletions(-)
 rename lispusers/{TMAX => tmax}/TMAX (100%)
 rename lispusers/{TMAX => tmax}/TMAX-DATE (100%)
 rename lispusers/{TMAX => tmax}/TMAX-DATE.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX-ENDNOTE (100%)
 rename lispusers/{TMAX => tmax}/TMAX-ENDNOTE.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX-INDEX (100%)
 rename lispusers/{TMAX => tmax}/TMAX-INDEX.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX-INTRO.TXT (100%)
 rename lispusers/{TMAX => tmax}/TMAX-NGRAPH (100%)
 rename lispusers/{TMAX => tmax}/TMAX-NGRAPH.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX-NGROUP (100%)
 rename lispusers/{TMAX => tmax}/TMAX-NGROUP.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX-NUMBER (100%)
 rename lispusers/{TMAX => tmax}/TMAX-NUMBER.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX-XREF (100%)
 rename lispusers/{TMAX => tmax}/TMAX-XREF.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX.LCOM (100%)
 rename lispusers/{TMAX => tmax}/TMAX.TEDIT (100%)
 rename lispusers/{TMAX => tmax}/TMAX.TOC (100%)

diff --git a/lispusers/TMAX/TMAX b/lispusers/tmax/TMAX
similarity index 100%
rename from lispusers/TMAX/TMAX
rename to lispusers/tmax/TMAX
diff --git a/lispusers/TMAX/TMAX-DATE b/lispusers/tmax/TMAX-DATE
similarity index 100%
rename from lispusers/TMAX/TMAX-DATE
rename to lispusers/tmax/TMAX-DATE
diff --git a/lispusers/TMAX/TMAX-DATE.LCOM b/lispusers/tmax/TMAX-DATE.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-DATE.LCOM
rename to lispusers/tmax/TMAX-DATE.LCOM
diff --git a/lispusers/TMAX/TMAX-ENDNOTE b/lispusers/tmax/TMAX-ENDNOTE
similarity index 100%
rename from lispusers/TMAX/TMAX-ENDNOTE
rename to lispusers/tmax/TMAX-ENDNOTE
diff --git a/lispusers/TMAX/TMAX-ENDNOTE.LCOM b/lispusers/tmax/TMAX-ENDNOTE.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-ENDNOTE.LCOM
rename to lispusers/tmax/TMAX-ENDNOTE.LCOM
diff --git a/lispusers/TMAX/TMAX-INDEX b/lispusers/tmax/TMAX-INDEX
similarity index 100%
rename from lispusers/TMAX/TMAX-INDEX
rename to lispusers/tmax/TMAX-INDEX
diff --git a/lispusers/TMAX/TMAX-INDEX.LCOM b/lispusers/tmax/TMAX-INDEX.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-INDEX.LCOM
rename to lispusers/tmax/TMAX-INDEX.LCOM
diff --git a/lispusers/TMAX/TMAX-INTRO.TXT b/lispusers/tmax/TMAX-INTRO.TXT
similarity index 100%
rename from lispusers/TMAX/TMAX-INTRO.TXT
rename to lispusers/tmax/TMAX-INTRO.TXT
diff --git a/lispusers/TMAX/TMAX-NGRAPH b/lispusers/tmax/TMAX-NGRAPH
similarity index 100%
rename from lispusers/TMAX/TMAX-NGRAPH
rename to lispusers/tmax/TMAX-NGRAPH
diff --git a/lispusers/TMAX/TMAX-NGRAPH.LCOM b/lispusers/tmax/TMAX-NGRAPH.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-NGRAPH.LCOM
rename to lispusers/tmax/TMAX-NGRAPH.LCOM
diff --git a/lispusers/TMAX/TMAX-NGROUP b/lispusers/tmax/TMAX-NGROUP
similarity index 100%
rename from lispusers/TMAX/TMAX-NGROUP
rename to lispusers/tmax/TMAX-NGROUP
diff --git a/lispusers/TMAX/TMAX-NGROUP.LCOM b/lispusers/tmax/TMAX-NGROUP.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-NGROUP.LCOM
rename to lispusers/tmax/TMAX-NGROUP.LCOM
diff --git a/lispusers/TMAX/TMAX-NUMBER b/lispusers/tmax/TMAX-NUMBER
similarity index 100%
rename from lispusers/TMAX/TMAX-NUMBER
rename to lispusers/tmax/TMAX-NUMBER
diff --git a/lispusers/TMAX/TMAX-NUMBER.LCOM b/lispusers/tmax/TMAX-NUMBER.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-NUMBER.LCOM
rename to lispusers/tmax/TMAX-NUMBER.LCOM
diff --git a/lispusers/TMAX/TMAX-XREF b/lispusers/tmax/TMAX-XREF
similarity index 100%
rename from lispusers/TMAX/TMAX-XREF
rename to lispusers/tmax/TMAX-XREF
diff --git a/lispusers/TMAX/TMAX-XREF.LCOM b/lispusers/tmax/TMAX-XREF.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX-XREF.LCOM
rename to lispusers/tmax/TMAX-XREF.LCOM
diff --git a/lispusers/TMAX/TMAX.LCOM b/lispusers/tmax/TMAX.LCOM
similarity index 100%
rename from lispusers/TMAX/TMAX.LCOM
rename to lispusers/tmax/TMAX.LCOM
diff --git a/lispusers/TMAX/TMAX.TEDIT b/lispusers/tmax/TMAX.TEDIT
similarity index 100%
rename from lispusers/TMAX/TMAX.TEDIT
rename to lispusers/tmax/TMAX.TEDIT
diff --git a/lispusers/TMAX/TMAX.TOC b/lispusers/tmax/TMAX.TOC
similarity index 100%
rename from lispusers/TMAX/TMAX.TOC
rename to lispusers/tmax/TMAX.TOC
diff --git a/sources/WINDOWOBJ b/sources/WINDOWOBJ
index 17277f0e..7aeeb2aa 100644
--- a/sources/WINDOWOBJ
+++ b/sources/WINDOWOBJ
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "17-Mar-2022 22:48:26" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>WINDOWOBJ.;7
 27963  
+
(FILECREATED "18-Mar-2022 21:45:55" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>WINDOWOBJ.;8
 28006  
 
       :CHANGES-TO (FNS READIMAGEOBJ)
 
-      :PREVIOUS-DATE "20-Dec-2021 23:47:45" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>WINDOWOBJ.;5)
+      :PREVIOUS-DATE "17-Mar-2022 22:48:26" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>WINDOWOBJ.;7)
 
 
 (* ; "
@@ -315,7 +315,7 @@ Copyright (c) 1986-1987, 1990-1991, 1993 by Venue & Xerox Corporation.
 (READIMAGEOBJ

   [LAMBDA (STREAM GETFN NOERROR DATANBYTES)
 
-    (* ;; "Edited 17-Mar-2022 22:47 by rmk: Added WHEREIS as a last resort.")

+    (* ;; "Edited 18-Mar-2022 21:45 by rmk: Added WHEREIS as a last resort.")

                                                              (* rrb "18-Mar-86 11:35")

     (DECLARE
 (SPECVARS UNDERREADIMAGEOBJ))
 
@@ -340,7 +340,8 @@ Copyright (c) 1986-1987, 1990-1991, 1993 by Venue & Xerox Corporation.
                        (MOUSECONFIRM (CONCAT "Trying to read an IMAGEOBJ with GETFN " GETFN 
                                             ". Shall I load the support file, " SUPPORTFILE "?")
                               NIL NIL NIL))
-             (DOFILESLOAD (LIST SUPPORTFILE)))
+             (DOFILESLOAD (LIST '(SYSLOAD)
+                                SUPPORTFILE)))
          (COND
             [(AND GETFN (GETD GETFN)
                   (CAR (NLSETQ (APPLY* GETFN STREAM]
@@ -527,11 +528,11 @@ Either delete this image object or load its support files." IMAGEOBJ)
 )
 (PUTPROPS WINDOWOBJ COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1990 1991 1993))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4897 21178 (COPYINSERT 4907 . 6434) (IMAGEBOX 6436 . 6616) (IMAGEFNSCREATE 6618 . 7813)
+  (FILEMAP (NIL (4897 21221 (COPYINSERT 4907 . 6434) (IMAGEBOX 6436 . 6616) (IMAGEFNSCREATE 6618 . 7813)
  (IMAGEFNSP 7815 . 8056) (IMAGEOBJCREATE 8058 . 8603) (IMAGEOBJP 8605 . 8846) (IMAGEOBJPROP 8848 . 
 14740) (\IMAGEUSERPROP 14742 . 15336) (HPRINT.IMAGEOBJ 15338 . 15927) (COPYIMAGEOBJ 15929 . 16672) (
-READIMAGEOBJ 16674 . 19824) (WRITEIMAGEOBJ 19826 . 21176)) (21392 27599 (
-ENCAPSULATEDOBJ.BUTTONEVENTINFN 21402 . 22538) (ENCAPSULATEDOBJ.PUTFN 22540 . 23655) (
-ENCAPSULATEDOBJ.DISPLAYFN 23657 . 25270) (ENCAPSULATEDOBJ.IMAGEBOXFN 25272 . 26160) (
-ENCAPSULATEDIMAGEFNS 26162 . 27597)))))
+READIMAGEOBJ 16674 . 19867) (WRITEIMAGEOBJ 19869 . 21219)) (21435 27642 (
+ENCAPSULATEDOBJ.BUTTONEVENTINFN 21445 . 22581) (ENCAPSULATEDOBJ.PUTFN 22583 . 23698) (
+ENCAPSULATEDOBJ.DISPLAYFN 23700 . 25313) (ENCAPSULATEDOBJ.IMAGEBOXFN 25315 . 26203) (
+ENCAPSULATEDIMAGEFNS 26205 . 27640)))))
 STOP
diff --git a/sources/WINDOWOBJ.LCOM b/sources/WINDOWOBJ.LCOM
index c92a5b267fe8f9791fdebfe92ea3ea4bae4ed4c1..173384160e3284f944c91c6b2a93ec38bdd58180 100644
GIT binary patch
delta 472
zcmZutyGjF55X~lnCL$#9ZQ~FG6GXgo_q|ot>`hqRm%9l@(ISPQSO_9mslVWITM6P1
zh~^tCZT$rcf5MF+7=u&IoMFzKb6(qT?fdquw&`{*Hz}bMC>oM%$Z~uhEol`fp*pe?
z4O9#w#vglIbkOUiO0HbD9aamO*<@C7@DEuD;@j$!205w`qVTRjcvV=4Z)&~u^w-Ry
zkeSS+Ce8{4!F+m2J($^4QoUnd$!`eATlv*&_o5Hkrz`wA|9B_M5V2<eYtRgVN*Xjq
zMo|abH5<&|-U&iK07}&{0OfIjj546E{oSKZq26*F&vY4}I`_*raGhY3ch=_1fRYMH
z5Y|wDNeDqeRN%;Bb=zZB0GK53S#YbO2rX~d^Y^{JdN0w5kZ6wVLk5&cF!YC-^3wy#
kA{d?@x~2n26@FFJ)1u6ui!iOLP>v2F$2YCsd+}uX8`hzArT_o{

delta 437
zcmZ8e%}N4M6rRzb5&{)PTXm2KMTC3q{9I>NPR=M(^XI52(IzCQMVppI^$HCaqE$q1
zP|_o`3)=Mnt?Lnj#!Ax8>YVSu_jAtE@L_m4<S$}AI_eZz1xm<j?%r{Y5=sH7j*5;X
zdhHZ`d$m+am0PxBHABnjStfrLi_v*wi9w1oO_lhKNOF|a%>B`X1A$7q%ye0aPMe}K
z-blQ!6ok*kq_A+9$%w|?y>MkL3vrDHyppbpRo+jpC9mxRewMzykTvL9y@_1V3xUcM
z+B2ghf$bV?%ir7zLO%c+%gqBs`wz&o45-ohJ=Rrd^&Q7ETnmup{`h|40;(#<^?Vsn
zMu;z9PW22z2m&I3UDImWo@EArgz%4y+n@~k-nQotyoq}cC@K(p?%F%Ch*pPbKCF}P
dJ|<_Ndw%E|PW%JHPqJEqYWy(^<G1W+^$X7MaX$b6