From bb830e75f0b9c1745812394aef59b3906a8fcc2c Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Fri, 13 Feb 2026 17:44:04 -0800 Subject: [PATCH] Fixed COMPAREDIRECTORIES See command so it doesn't fail if only one file to show (#2488) See command in compare-directories browser doesn't fail if only one file --- lispusers/COMPAREDIRECTORIES | 56 ++++++++++++++++-------------- lispusers/COMPAREDIRECTORIES.LCOM | Bin 42843 -> 42841 bytes 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index 2531735b..36bf7841 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 8-Nov-2025 13:07:39" {WMEDLEY}COMPAREDIRECTORIES.;285 138536 +(FILECREATED "10-Feb-2026 21:28:55" {WMEDLEY}COMPAREDIRECTORIES.;286 138607 :EDIT-BY rmk - :CHANGES-TO (FNS CD-MENUFN CDBROWSER-COPY) + :CHANGES-TO (FNS CD-MENUFN) - :PREVIOUS-DATE "28-Oct-2025 14:52:05" {WMEDLEY}COMPAREDIRECTORIES.;280) + :PREVIOUS-DATE " 8-Nov-2025 13:07:39" {WMEDLEY}COMPAREDIRECTORIES.;285) (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS) @@ -1983,6 +1983,8 @@ (CD-MENUFN [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) + (* ;; "Edited 10-Feb-2026 21:28 by rmk") + (* ;; "Edited 8-Nov-2025 13:06 by rmk") (* ;; "Edited 28-Oct-2025 17:35 by rmk") @@ -2059,11 +2061,11 @@ ELSE (FLASHWINDOW T) (PRIN3 "No file to print" T))) ((See See% both) - (IF (PDFFILEP FILE1) + (IF (AND FILE1 (PDFFILEP FILE1)) then (SEE-PDF FILE1) - (CL:WHEN (PDFFILEP FILE2) + (CL:WHEN (AND FILE2 (PDFFILEP FILE2)) (SEE-PDF FILE2)) - elseif (PDFFILEP FILE2) + elseif (AND FILE2 (PDFFILEP FILE2)) then (SEE-PDF FILE2) else (EXAMINEFILES FILE1 FILE2 LABEL1 LABEL2 (RELCREATEREGION (ITIMES 2 (CL:IF (LISPSOURCEFILEP FILE1) @@ -2321,25 +2323,25 @@ (MOVD? 'NILL 'TEDIT.FILEDATE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2668 23647 (COMPAREDIRECTORIES 2678 . 8013) (COMPAREDIRECTORIES.INFOS 8015 . 11244) ( -COMPAREDIRECTORIES.CANDIDATES 11246 . 14631) (CDENTRIES.SELECT 14633 . 19535) ( -COMPAREDIRECTORIES.INFOS.TYPE 19537 . 20881) (MATCHNAME 20883 . 21563) (CD.INSURECDVALUE 21565 . 23179 -) (CD.UPDATEWIDTHS 23181 . 23645)) (23648 34353 (CDFILES 23658 . 29755) (CDFILES.MATCH 29757 . 31382) -(CDFILES.PATS 31384 . 34351)) (34354 52372 (CDPRINT 34364 . 36881) (CDPRINT.HEADER 36883 . 37780) ( -CDPRINT.LINE 37782 . 41211) (CDPRINT.MAXWIDTHS 41213 . 45328) (CDPRINT.COLHEADERS 45330 . 46615) ( -CDPRINT.COLUMNS 46617 . 51737) (CDTEDIT 51739 . 52370)) (52373 61494 (CDMAP 52383 . 53815) (CDENTRY -53817 . 54126) (CDSUBSET 54128 . 55567) (CDMERGE 55569 . 59553) (CDMERGE.COMMON 59555 . 60870) ( -CD.SORT 60872 . 61492)) (61495 69033 (BINCOMP 61505 . 65794) (EOLTYPE 65796 . 68358) (EOLTYPE.SHOW -68360 . 69031)) (69561 82088 (FIND-UNCOMPILED-FILES 69571 . 73214) (FIND-UNSOURCED-FILES 73216 . 75600 -) (FIND-SOURCE-FILES 75602 . 77340) (FIND-COMPILED-FILES 77342 . 79219) (FIND-UNLOADED-FILES 79221 . -80074) (FIND-LOADED-FILES 80076 . 80504) (FIND-MULTICOMPILED-FILES 80506 . 82086)) (82089 90520 ( -CREATED-AS 82099 . 86896) (SOURCE-FOR-COMPILED-P 86898 . 89825) (COMPILE-SOURCE-DATE-DIFF 89827 . -90518)) (90521 101284 (FIX-DIRECTORY-DATES 90531 . 93981) (FIX-EQUIV-DATES 93983 . 95508) ( -COPY-COMPARED-FILES 95510 . 97331) (COPY-MISSING-FILES 97333 . 99490) (COMPILED-ON-SAME-SOURCE 99492 - . 101282)) (101478 109356 (CDBROWSER 101488 . 105455) (CDBROWSER.STRINGS 105457 . 109354)) (109518 -111254 (CD.TABLEITEM 109528 . 109748) (CD.TABLEITEM.PRINTFN 109750 . 109949) (CD.TABLEITEM.COPYFN -109951 . 111009) (CDTABLEBROWSER.HEADING.REPAINTFN 111011 . 111252)) (111255 138020 ( -CDTABLEBROWSER.WHENSELECTEDFN 111265 . 111733) (CD.COMMANDSELECTEDFN 111735 . 117908) (CD-MENUFN -117910 . 124301) (CD-COMPARE-FILES 124303 . 127830) (CDBROWSER-COPY 127832 . 132894) ( -CDBROWSER-DELETE-FILE 132896 . 137499) (CD-SWAPDIRS 137501 . 138018))))) + (FILEMAP (NIL (2653 23632 (COMPAREDIRECTORIES 2663 . 7998) (COMPAREDIRECTORIES.INFOS 8000 . 11229) ( +COMPAREDIRECTORIES.CANDIDATES 11231 . 14616) (CDENTRIES.SELECT 14618 . 19520) ( +COMPAREDIRECTORIES.INFOS.TYPE 19522 . 20866) (MATCHNAME 20868 . 21548) (CD.INSURECDVALUE 21550 . 23164 +) (CD.UPDATEWIDTHS 23166 . 23630)) (23633 34338 (CDFILES 23643 . 29740) (CDFILES.MATCH 29742 . 31367) +(CDFILES.PATS 31369 . 34336)) (34339 52357 (CDPRINT 34349 . 36866) (CDPRINT.HEADER 36868 . 37765) ( +CDPRINT.LINE 37767 . 41196) (CDPRINT.MAXWIDTHS 41198 . 45313) (CDPRINT.COLHEADERS 45315 . 46600) ( +CDPRINT.COLUMNS 46602 . 51722) (CDTEDIT 51724 . 52355)) (52358 61479 (CDMAP 52368 . 53800) (CDENTRY +53802 . 54111) (CDSUBSET 54113 . 55552) (CDMERGE 55554 . 59538) (CDMERGE.COMMON 59540 . 60855) ( +CD.SORT 60857 . 61477)) (61480 69018 (BINCOMP 61490 . 65779) (EOLTYPE 65781 . 68343) (EOLTYPE.SHOW +68345 . 69016)) (69546 82073 (FIND-UNCOMPILED-FILES 69556 . 73199) (FIND-UNSOURCED-FILES 73201 . 75585 +) (FIND-SOURCE-FILES 75587 . 77325) (FIND-COMPILED-FILES 77327 . 79204) (FIND-UNLOADED-FILES 79206 . +80059) (FIND-LOADED-FILES 80061 . 80489) (FIND-MULTICOMPILED-FILES 80491 . 82071)) (82074 90505 ( +CREATED-AS 82084 . 86881) (SOURCE-FOR-COMPILED-P 86883 . 89810) (COMPILE-SOURCE-DATE-DIFF 89812 . +90503)) (90506 101269 (FIX-DIRECTORY-DATES 90516 . 93966) (FIX-EQUIV-DATES 93968 . 95493) ( +COPY-COMPARED-FILES 95495 . 97316) (COPY-MISSING-FILES 97318 . 99475) (COMPILED-ON-SAME-SOURCE 99477 + . 101267)) (101463 109341 (CDBROWSER 101473 . 105440) (CDBROWSER.STRINGS 105442 . 109339)) (109503 +111239 (CD.TABLEITEM 109513 . 109733) (CD.TABLEITEM.PRINTFN 109735 . 109934) (CD.TABLEITEM.COPYFN +109936 . 110994) (CDTABLEBROWSER.HEADING.REPAINTFN 110996 . 111237)) (111240 138091 ( +CDTABLEBROWSER.WHENSELECTEDFN 111250 . 111718) (CD.COMMANDSELECTEDFN 111720 . 117893) (CD-MENUFN +117895 . 124372) (CD-COMPARE-FILES 124374 . 127901) (CDBROWSER-COPY 127903 . 132965) ( +CDBROWSER-DELETE-FILE 132967 . 137570) (CD-SWAPDIRS 137572 . 138089))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index 7569b3987074290cd824519929ad9eea44eb7ce9..80f806eaee8fe4bfe1d656a4a2417834308d6a64 100644 GIT binary patch delta 1458 zcmZuxPl()P6yKRbYnK+R7NrRG5!iO8koEhM?@MOb3e!oZ6UZhZ$?RAVq-C=0;Mgq7 z&?2l1i0l?x!6g@uQV(7P-PWGhs|SmoL_LTH5xnTp;>DMIv%9m7xg_uX-tWEN_uk9* z^V8~&PpcpG&QhYc(;GS?Oah|~W;KM^d3*VstiilC4N}q|^#-wazOE(H{-vcQ4f@wd zY5#u-RBE;P#kT7?t;lI6jtxh$?w8ac|E_ZBISG_ol9+i`sa>c+BaEC?H|WN?ja1OU z(*5jCAy!~ugP09o&%dqc74i6=O7_7kw$pBQy`&xZ3ABL{NUnuW4XU43Pv)boi`Cu> z`6pZF7tcl~=kWRF_?6QqijUpu@}TtWWraDISI&$1?^~~)sh%jIkCXDXTlqVGX}eST zB7bXJd;Wof;tBL#zO&uw8#fF3U!OPo>f_<=+`YZz$%XjIi%HyF9adGQN0&QaUM`7` z{+J|~d#3CkRK#A~NA7Q>@2g|)@6P?SANPI!+Pz;dnG9BfRj21B9gtE$%M0R(B}|Ar zLD#df5mM0nmxnJOlT4~NQMNF7VULAjLCd}p1-;mb^i~jF1Ht%=i%@XhXs)=vQw%c( zqb?wFJT=wGx#|W!7#4*$T|e$dsKd8|9vGNBb{svl+hA}B_%7%n7|c+>xIpMMLZ&E$ z98!3lfak_x9CV{rsUie!)B%^uO?0e+mI1B6Z#5I(oXyDN)cTJ+X36nPPG-sj%}mx0 z1u#h=j9i}s!?JC!8FwbfWcc?S%3zG{%V4BFBZFe+4!bli+C(LvkwFDNkU@>92H`I< zkwLNSvmUq1$tF0iT(Fr)=ZfV)$4t0=`WZJeeHa3dSt0$yx=ngS=H4CA;wWf;T7E5kMh zH*bxAqQD{zHO)zJN^u#BJi~NtG)7fe^PTnU8!290V3-Chk|hDUNoWlh%L1)fw!4Gd z{p>ERWgB=gaZ1ae8ZbPe=4Y@r7^X1FV0~k7d!*sritZU2wJb%O$NP*a-kGCBO335k Ihku^?7nf^xkN^Mx delta 1459 zcmZuxOK22n5YCLKyFo!z(0I_IA)4N$hyU4+AqeA4kJHfU9=dyy6-3OMj%GL7VHgxK zI3SYjB7&hWxrtYA@p1KW^dfj%_Og3j1igCO>gm=Qlk}zjs;?g3Use78^}hV~`|_i? zqhM-Ya#Lf3Nuaz+j4HP_exII@DvT>k*ZeEJ93)ni(kit!-l);2y;7+turS|?7j_L` zmZFYNH67Qk2X-y88=&k~Qi1es>F51O!IWH2laeZ--Z&TdbDi`;$&##-Fw4oTvr56i|2lu+W4KVaxBh4KD&+kaYgf<7FyQ9NQzUOhu`) zO!g%=wlx*6cE^MKF7d5@Aw`FgTO_{3p)YQ@EZOc2u$ue zVLS9YL46R}2EiDFwym`rO%Sv%0S{SDLZ@k%n==1zyGX z>a_?smpkZjMz_&prq$oUk70qYESSND#h8wi0>|UPux!(7J5XDVnxgJRiH8kC^hfS_f32bd<#6MvkUb}g{Ae1Le% zY*q(GhNY)39!&K)hrl`C!o^`6RvYnh+>4>+x}cq11)Z1$DzQcmP9g%*&!CpXrKl$>wW*$J*qmP}x;ax<0?(tyavHNox=P_E;o z;&>8%O?uaW>m<{FBgM>(lY$ZBga`wFQx0%ylA<`JxL#SF<#@5z#~WbH>nro! z821wzcC*%Tqo(gg_;!KNIZTm?1kE5+#g(I=WV?53>Bd5G3l@_uzG<9_fs=}xVuIo& qu(-4wLob1q?$V8(0*s=0M;NszOaUfW$MNlxy9H9hpa1so)5QOp