From 0eac6efb618b3ff80fc56f01e35ec46bf7d968ff Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Thu, 13 Oct 2022 10:48:42 -0700 Subject: [PATCH] Fix Issue#985 HELPSYS/CLHS.LOOKUP fails when MEDLEYDIR not writeable. (#994) --- lispusers/HELPSYS | 33 +++++++++++++++++---------------- lispusers/HELPSYS.LCOM | Bin 62021 -> 61909 bytes 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lispusers/HELPSYS b/lispusers/HELPSYS index 42978008..e54098a5 100644 --- a/lispusers/HELPSYS +++ b/lispusers/HELPSYS @@ -1,10 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 9-Oct-2022 16:41:08" {DSK}larry>medley>lispusers>HELPSYS.;2 87589 +(FILECREATED "12-Oct-2022 18:33:26" {DSK}frank>il>medley>wmedley>lispusers>HELPSYS.;4 87708 - :CHANGES-TO (FNS CLHS.INDEX) + :CHANGES-TO (FNS CLHS.LOOKUP) - :PREVIOUS-DATE "27-Aug-2022 12:15:35" {DSK}larry>medley>lispusers>HELPSYS.;1) + :PREVIOUS-DATE "12-Oct-2022 18:24:45" {DSK}frank>il>medley>wmedley>lispusers>HELPSYS.;3 +) (* ; " @@ -96,8 +97,7 @@ Copyright (c) 1985-1987, 2020, 2022 by Xerox Corporation. DINFO HASH) ) -(DEFCOMMAND "man" (ENTRY) - "Lookup ENTRY in the IRM." +(DEFCOMMAND "man" (ENTRY) "Lookup ENTRY in the IRM." (GENERIC.MAN.LOOKUP ENTRY)) (DEFINEQ @@ -264,7 +264,8 @@ Copyright (c) 1985-1987, 2020, 2022 by Xerox Corporation. else (LIST (SUBSTRING LINE POSLINK (CL:1- POSENDLINK]) (CLHS.LOOKUP - [LAMBDA (ENTRY PHASES) (* ; "Edited 24-Aug-2022 17:08 by larry") + [LAMBDA (ENTRY PHASES) (* ; "Edited 12-Oct-2022 18:32 by FGH") + (* ; "Edited 24-Aug-2022 17:08 by larry") (LET [(OPENER (CLHS.OPENER)) (URL NIL) POS @@ -292,7 +293,7 @@ Copyright (c) 1985-1987, 2020, 2022 by Xerox Corporation. (CHAT 'SHELL NIL (CONCAT OPENER " '" URL "' ")) else (ShellCommand (CONCAT OPENER " '" URL "'" - " > $MEDLEYDIR/tmp/clhs/warnings.txt 2>&1") + " > /tmp/clhs-warnings-$$.txt 2>&1") T)) (RETURN)) (AND URL (RETURN (LIST URL]) @@ -1699,13 +1700,13 @@ Copyright (c) 1985-1987, 2020, 2022 by Xerox Corporation. (PUTPROPS HELPSYS FILETYPE :FAKE-COMPILE-FILE) (PUTPROPS HELPSYS COPYRIGHT ("Xerox Corporation" 1985 1986 1987 2020 2022)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4613 10188 (HELPSYS 4623 . 6464) (IRM.LOOKUP 6466 . 8104) (GENERIC.MAN.LOOKUP 8106 . -9775) (IRM.RESET 9777 . 10186)) (10445 17450 (CLHS.INDEX 10455 . 13153) (CLHS.LOOKUP 13155 . 14953) ( -CLHS.OPENER 14955 . 16278) (REPO.LOOKUP 16280 . 17448)) (70522 72040 (IRM.GET.DINFOGRAPH 70532 . 71407 -) (IRM.DISPLAY.REF 71409 . 72038)) (72042 72404 (IRM.LOAD-GRAPH 72042 . 72404)) (72729 78233 ( -IRM.DISPLAY.CREF 72739 . 74453) (IRM.CREF.BOX 74455 . 75282) (IRM.PUT.CREF 75284 . 75509) ( -IRM.GET.CREF 75511 . 75882) (IRM.CREF.BUTTONEVENTFN 75884 . 78231)) (78788 87094 (\IRM.GET.REF 78798 - . 80129) (\IRM.SMART.REF 80131 . 82058) (\IRM.CHOOSE.REF 82060 . 83311) (\IRM.WILD.REF 83313 . 84568) - (\IRM.WILDCARD 84570 . 84936) (\IRM.WILD.MATCH 84938 . 86168) (\IRM.GET.HASHFILE 86170 . 86633) ( -\IRM.GET.KEYWORDS 86635 . 87092)) (87231 87387 (\IRM.AROUND-EXIT 87231 . 87387))))) + (FILEMAP (NIL (4630 10205 (HELPSYS 4640 . 6481) (IRM.LOOKUP 6483 . 8121) (GENERIC.MAN.LOOKUP 8123 . +9792) (IRM.RESET 9794 . 10203)) (10462 17569 (CLHS.INDEX 10472 . 13170) (CLHS.LOOKUP 13172 . 15072) ( +CLHS.OPENER 15074 . 16397) (REPO.LOOKUP 16399 . 17567)) (70641 72159 (IRM.GET.DINFOGRAPH 70651 . 71526 +) (IRM.DISPLAY.REF 71528 . 72157)) (72161 72523 (IRM.LOAD-GRAPH 72161 . 72523)) (72848 78352 ( +IRM.DISPLAY.CREF 72858 . 74572) (IRM.CREF.BOX 74574 . 75401) (IRM.PUT.CREF 75403 . 75628) ( +IRM.GET.CREF 75630 . 76001) (IRM.CREF.BUTTONEVENTFN 76003 . 78350)) (78907 87213 (\IRM.GET.REF 78917 + . 80248) (\IRM.SMART.REF 80250 . 82177) (\IRM.CHOOSE.REF 82179 . 83430) (\IRM.WILD.REF 83432 . 84687) + (\IRM.WILDCARD 84689 . 85055) (\IRM.WILD.MATCH 85057 . 86287) (\IRM.GET.HASHFILE 86289 . 86752) ( +\IRM.GET.KEYWORDS 86754 . 87211)) (87350 87506 (\IRM.AROUND-EXIT 87350 . 87506))))) STOP diff --git a/lispusers/HELPSYS.LCOM b/lispusers/HELPSYS.LCOM index a715d49518976761858d1b39e25eaded8b7de59d..56f41929d77056e854470686628d3a9f2424c1aa 100644 GIT binary patch delta 2387 zcmah~Uu;ul6kj_su>!K`FbrG{bwVq&yMMa2Yjp0m{n}o4d%w%Qx9f(Ov8;u5>z}2R zfH7pm#0L|C=uL<*`efpZFJdL}L1UuPNCHoW@h9@4qVNXs$rt1KzV1&MCfqc)=bZbU z^PO{k=g*ISbYJ_u`+PnjN&!083`l|`ff$X+p_ml*g3miwuP&A=#RAl8;04cHNo(Tt z%cXj?ICiu#TU!__SH`NvLZ$fT*va?L4J?KH;N4(K3dbbb3r%LJvabN;8hE^^oTfqN z!C)}xg~DtTZ~8w2VXxogOQ{-3m_)Hj@{vQb%p86m9^>GA2%?dQ5Cu;xkx}$Cu>v*) zUrM(ip=GR~M(IS(@I%Zn$)rkiRv?MjJ#w2AiiJiVpAMJo+}$D%W|f3V4g6V<0vS{@ zn^*ND&HJJ2Yq#5ZX=}`PX8g%6d_Ep89b^AbvDbF9x7U^FzVu9~@5`ZaF1MWXTVEGN zh!bLf7zr_3D?WoL%aA5Ey9Y#3Sf>TS*}aY0;V_uRxq72O7mJPAX1xL8NEA$xpk~rG z6&+a#)Swky{~nSdMa?`OK&+yeA=NTCHyVQM>|CSXy1H%B?RwW4>P>FzVLo5p{jJIg zr_%e%A@nGvDORQ(F4_>mQe!cbSj5ihOp2a{;c#{mE!#+o9RVqVAc%lB(YURsdN50M z)uyIK6B7`1y8C8^MIro%y+{O-s-B{0Q!z3Sj&^XZX5Vr5b7>d4d4&1;1ABc1N7!GF z^Ut%9Y8XSL7RjK?tkystZ42@sOF#{x=dlXW=3$oh2{O%cVL@1G3)a*|#0`Q_n8(%O z7-qtGum4qN|BmlB34$DHJ=l?ObILirM{?$O_P@czV1NLYjWwSI6-lDo<}?W10!8=ze z*9yf`!BVqY@xrJG-ez@ic&<`9?uCd9-c+MrYYtD%D3yxk%%J`q14!yebZyoNd&~wPVKvLqn}&g9{wEsIv^8G6bWDV1^T| z%X|KIIiYJ;_9JBCM##>%Rw3hs*b;b$A9Mzn1Fjw?y&OM?Fz}M$jnN)_d7gi4^EjO{ zNm`{k;1p<=fdSaS8~Y1WyxLwN$+@*Wuq1(PBX*XdDbwxJ!sIddSy6YCXtdpo9g^_F zy@k`_VGXROjn`v$Z@A4las9;|h!pB#bhV>(NH=B|O9~?K-?%zGPnT=aJ zqgu|1dsD67?%nAbz?FfqCa^ED+HJ@X&9J5|US{OGTbsJd!3lG1Wv6)mA5cTg$o9Khyf=g;N)oeAvZkJEwCUjVj4N zd;ICD20o40;N!a!d^j0#t{LDnl*9xhbtOx{cQ8kB$uZi$${;*zw1-UDM7OZm)xeG^Zy6WJ<-D$s{I<-LF^#ID>hJ6WnM- xqiLG6ag8!2t4t6CYK21zKcO0f$-}L#4R#Erb3GhZpJvXjYzr2w^U;IP{{zB7fL;Iq delta 2433 zcmZuz&2Jk;6t_1a6;4&sMvdB}YM)k7WvBJVyIy}%+N{@;colnRySt8)(y9ru8>hA7 z;5ee?%LtG-AR)w3sRy7ENPxttxD}UHNFYQJZ~zI3J4oExBK`s1>^h%q4(pjWGjHDS z{oeac{`jlshrfH?FC`!qri-nx6p$c7Mjg#ryavT+?GNR;32uqK_V^7=z|Adr3FLFlkg;d$~-Kimr|vMUMtXQz~p+Z zR%yc8wYA223%0uu1c8V0LJMzx+;=J+jq#yCkU3RNfhab~VsuZ0@WhZWNRUj#k|{{5 zIYpl$R@kNx3{2`4sQH{FXnK~+h9GU2WJaS!E1bnEfR_?sWqqleBq=S%SR7AIieKzl z;^9EMa<#G;t}m=WI-3jx^AHqabhMzTCJhsP1|plYNop2CA@Bu!J|8#1`JcvL-+(We zfGMIAQ&WY4q6>LSr;A1?plkU+5HnyAJDjCzu|RZNu{Ej#kC!2FXNwdgR+ni3k7cb8 z@cBmL%K9qcMstqw(5hBIGYbMsq*1hUij~`WI2d&IhF}W=nNji>NHycmNFAqI$vq#K_H8N?{dgl(7TEpN`zqoR|BaJ10e9GLNbAU}Iz=SXw%55@e>RGb@OZIGiucpm!U`;xq05{FpyCiQltK-X58ELV?6Z5kXLk zFfLhdKveb&C6E$84WgHj?06K;GvcSo97AhCEa4e8kI5J?+p%TvqIP}_oN?|wd%@Y; z|6Q+?5Tl*n`&G^zIcJ6>XL{d3o0-AD!nSOaC8JPW#c=hJDX=?)(F0D=h@e}x3AuoV~8c~;zPO+!$wM_Bra?;t(Q_(APg?%I|T)j z&6ByTWLH>D%DlRhFA=2Vj89fvJCj6i!5WCCoyYn5%+A}gCU@L zC>d%ZsaOPCD=Y#D5^>LDQfdoDGY_!{`b9CcyOn~+cgz`68zAsHj9dnOv9`QYu3QzW zt@?=?3S0{KR(*ARu~uC}!4-j@Y&KR}kRHl8eWk`GH|BE_PlW zxWOG6-2^kf;bQ!yh33lg%FxX_h zijCdI+Vfa+Yp)}_z3UORemLxWarm?;rXZ{7lN1{w0xA}QO-cwU!rC@NXH7E2v?>t= zFB=A6bMEe&n7GL?79`$&h?C;Z+2Ns*?Dmj*!IY^OIY>r!TjJR4Si#%&$d7lXB<|qA zxjUR3iUE%YG5VED4VY>!tX47avJ)6N*FTEDQJOiN_U)d3*ylSwca-_U#<@0A7XL> z$1*}nL^PI>SLPsz!bx>IODxsY3{*X=+g+B<%(1CGo%+Kbf9K=l_c{N(b1C$m^VAp} zWbJPjbzRe^1neS}SXRdz`=`%&@zII4D_x37i}*H?SR?q8^oaf-lOxV zGuRz`+5Nq}&qY@LaN`Zer)P(*Vw$6oT@s1^H)RMuCnRLeS+t0%Aa@M~WtyN3*t^Cy P?1$0px2%