diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index 962d86d0..8cccf805 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "28-Apr-2026 23:41:24" {MEDLEY}COMPAREDIRECTORIES.;289 139726 +(FILECREATED "10-May-2026 13:03:16" {MEDLEY}COMPAREDIRECTORIES.;290 140082 :EDIT-BY rmk - :CHANGES-TO (FNS CDFILES.PATS CDFILES.MATCH CDBROWSER-COPY) + :CHANGES-TO (FNS CD-MENUFN) - :PREVIOUS-DATE "28-Apr-2026 21:38:49" {MEDLEY}COMPAREDIRECTORIES.;288) + :PREVIOUS-DATE "28-Apr-2026 23:41:24" {MEDLEY}COMPAREDIRECTORIES.;289) (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS) @@ -1991,6 +1991,8 @@ (CD-MENUFN [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) + (* ;; "Edited 10-May-2026 13:02 by rmk") + (* ;; "Edited 10-Feb-2026 21:28 by rmk") (* ;; "Edited 8-Nov-2025 13:06 by rmk") @@ -2019,17 +2021,22 @@ (CHARWIDTH (CHARCODE SPACE) DEFAULTFONT))) CHILDREN) + (CL:WHEN FILE1 (* ; + "If no extension, make sure there's a dot (so TEDIT doesn't got to TXT or TEDIT") + (SETQ FILE1 (PACKFILENAME 'BODY FILE1 'EXTENSION ""))) + (CL:WHEN FILE2 + (SETQ FILE2 (PACKFILENAME 'BODY FILE2 'EXTENSION ""))) (SETQ CHILDREN (SELECTQ MENUITEM - (Compare (IF (AND FILE1 FILE2) - THEN (CD-COMPARE-FILES FILE1 FILE2 LABEL1 LABEL2 TYPE (WINDOWPROP + (Compare (if (AND FILE1 FILE2) + then (CD-COMPARE-FILES FILE1 FILE2 LABEL1 LABEL2 TYPE (WINDOWPROP WINDOW 'REGION) CDBROWSER) - ELSE (FLASHWINDOW T) + else (FLASHWINDOW T) (PRIN3 "Only one file" T))) - (See% left (IF FILE1 - THEN (if (PDFFILEP FILE1) + (See% left (if FILE1 + then (if (PDFFILEP FILE1) then (SEE-PDF FILE1) else (TEDIT-SEE FILE1 (RELCREATEREGION (CL:IF (LISPSOURCEFILEP FILE1) @@ -2039,17 +2046,17 @@ 'RIGHT 'TOP `(,WINDOW 0.5) - (IPLUS (FETCH (REGION BOTTOM) - OF (WINDOWPROP WINDOW + (IPLUS (fetch (REGION BOTTOM) + of (WINDOWPROP WINDOW 'REGION)) -1) T) NIL (CONCAT "SEE window for " LABEL1))) - ELSE (FLASHWINDOW T) + else (FLASHWINDOW T) (PRIN3 "No file to print" T))) - (See% right (IF FILE2 - THEN (if (PDFFILEP FILE2) + (See% right (if FILE2 + then (if (PDFFILEP FILE2) then (SEE-PDF FILE2) else (TEDIT-SEE FILE2 (RELCREATEREGION (CL:IF (LISPSOURCEFILEP FILE2) @@ -2059,17 +2066,17 @@ 'LEFT 'TOP `(,WINDOW 0.5) - (IPLUS (FETCH (REGION BOTTOM) - OF (WINDOWPROP WINDOW + (IPLUS (fetch (REGION BOTTOM) + of (WINDOWPROP WINDOW 'REGION)) -1) NIL) NIL (CONCAT "SEE window for " LABEL2))) - ELSE (FLASHWINDOW T) + else (FLASHWINDOW T) (PRIN3 "No file to print" T))) ((See See% both) - (IF (AND FILE1 (PDFFILEP FILE1)) + (if (AND FILE1 (PDFFILEP FILE1)) then (SEE-PDF FILE1) (CL:WHEN (AND FILE2 (PDFFILEP FILE2)) (SEE-PDF FILE2)) @@ -2083,7 +2090,7 @@ 'LEFT 'TOP `(,WINDOW 0.5 -701) - (IPLUS (FETCH (REGION BOTTOM) OF (WINDOWPROP WINDOW + (IPLUS (fetch (REGION BOTTOM) of (WINDOWPROP WINDOW 'REGION)) -1) NIL)))) @@ -2337,25 +2344,25 @@ (MOVD? 'NILL 'TEDIT.FILEDATE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2683 23662 (COMPAREDIRECTORIES 2693 . 8028) (COMPAREDIRECTORIES.INFOS 8030 . 11259) ( -COMPAREDIRECTORIES.CANDIDATES 11261 . 14646) (CDENTRIES.SELECT 14648 . 19550) ( -COMPAREDIRECTORIES.INFOS.TYPE 19552 . 20896) (MATCHNAME 20898 . 21578) (CD.INSURECDVALUE 21580 . 23194 -) (CD.UPDATEWIDTHS 23196 . 23660)) (23663 34971 (CDFILES 23673 . 29770) (CDFILES.MATCH 29772 . 31782) -(CDFILES.PATS 31784 . 34969)) (34972 52990 (CDPRINT 34982 . 37499) (CDPRINT.HEADER 37501 . 38398) ( -CDPRINT.LINE 38400 . 41829) (CDPRINT.MAXWIDTHS 41831 . 45946) (CDPRINT.COLHEADERS 45948 . 47233) ( -CDPRINT.COLUMNS 47235 . 52355) (CDTEDIT 52357 . 52988)) (52991 62112 (CDMAP 53001 . 54433) (CDENTRY -54435 . 54744) (CDSUBSET 54746 . 56185) (CDMERGE 56187 . 60171) (CDMERGE.COMMON 60173 . 61488) ( -CD.SORT 61490 . 62110)) (62113 69651 (BINCOMP 62123 . 66412) (EOLTYPE 66414 . 68976) (EOLTYPE.SHOW -68978 . 69649)) (70179 82706 (FIND-UNCOMPILED-FILES 70189 . 73832) (FIND-UNSOURCED-FILES 73834 . 76218 -) (FIND-SOURCE-FILES 76220 . 77958) (FIND-COMPILED-FILES 77960 . 79837) (FIND-UNLOADED-FILES 79839 . -80692) (FIND-LOADED-FILES 80694 . 81122) (FIND-MULTICOMPILED-FILES 81124 . 82704)) (82707 91138 ( -CREATED-AS 82717 . 87514) (SOURCE-FOR-COMPILED-P 87516 . 90443) (COMPILE-SOURCE-DATE-DIFF 90445 . -91136)) (91139 101902 (FIX-DIRECTORY-DATES 91149 . 94599) (FIX-EQUIV-DATES 94601 . 96126) ( -COPY-COMPARED-FILES 96128 . 97949) (COPY-MISSING-FILES 97951 . 100108) (COMPILED-ON-SAME-SOURCE 100110 - . 101900)) (102096 109974 (CDBROWSER 102106 . 106073) (CDBROWSER.STRINGS 106075 . 109972)) (110136 -111872 (CD.TABLEITEM 110146 . 110366) (CD.TABLEITEM.PRINTFN 110368 . 110567) (CD.TABLEITEM.COPYFN -110569 . 111627) (CDTABLEBROWSER.HEADING.REPAINTFN 111629 . 111870)) (111873 139210 ( -CDTABLEBROWSER.WHENSELECTEDFN 111883 . 112351) (CD.COMMANDSELECTEDFN 112353 . 118526) (CD-MENUFN -118528 . 125005) (CD-COMPARE-FILES 125007 . 128534) (CDBROWSER-COPY 128536 . 134084) ( -CDBROWSER-DELETE-FILE 134086 . 138689) (CD-SWAPDIRS 138691 . 139208))))) + (FILEMAP (NIL (2651 23630 (COMPAREDIRECTORIES 2661 . 7996) (COMPAREDIRECTORIES.INFOS 7998 . 11227) ( +COMPAREDIRECTORIES.CANDIDATES 11229 . 14614) (CDENTRIES.SELECT 14616 . 19518) ( +COMPAREDIRECTORIES.INFOS.TYPE 19520 . 20864) (MATCHNAME 20866 . 21546) (CD.INSURECDVALUE 21548 . 23162 +) (CD.UPDATEWIDTHS 23164 . 23628)) (23631 34939 (CDFILES 23641 . 29738) (CDFILES.MATCH 29740 . 31750) +(CDFILES.PATS 31752 . 34937)) (34940 52958 (CDPRINT 34950 . 37467) (CDPRINT.HEADER 37469 . 38366) ( +CDPRINT.LINE 38368 . 41797) (CDPRINT.MAXWIDTHS 41799 . 45914) (CDPRINT.COLHEADERS 45916 . 47201) ( +CDPRINT.COLUMNS 47203 . 52323) (CDTEDIT 52325 . 52956)) (52959 62080 (CDMAP 52969 . 54401) (CDENTRY +54403 . 54712) (CDSUBSET 54714 . 56153) (CDMERGE 56155 . 60139) (CDMERGE.COMMON 60141 . 61456) ( +CD.SORT 61458 . 62078)) (62081 69619 (BINCOMP 62091 . 66380) (EOLTYPE 66382 . 68944) (EOLTYPE.SHOW +68946 . 69617)) (70147 82674 (FIND-UNCOMPILED-FILES 70157 . 73800) (FIND-UNSOURCED-FILES 73802 . 76186 +) (FIND-SOURCE-FILES 76188 . 77926) (FIND-COMPILED-FILES 77928 . 79805) (FIND-UNLOADED-FILES 79807 . +80660) (FIND-LOADED-FILES 80662 . 81090) (FIND-MULTICOMPILED-FILES 81092 . 82672)) (82675 91106 ( +CREATED-AS 82685 . 87482) (SOURCE-FOR-COMPILED-P 87484 . 90411) (COMPILE-SOURCE-DATE-DIFF 90413 . +91104)) (91107 101870 (FIX-DIRECTORY-DATES 91117 . 94567) (FIX-EQUIV-DATES 94569 . 96094) ( +COPY-COMPARED-FILES 96096 . 97917) (COPY-MISSING-FILES 97919 . 100076) (COMPILED-ON-SAME-SOURCE 100078 + . 101868)) (102064 109942 (CDBROWSER 102074 . 106041) (CDBROWSER.STRINGS 106043 . 109940)) (110104 +111840 (CD.TABLEITEM 110114 . 110334) (CD.TABLEITEM.PRINTFN 110336 . 110535) (CD.TABLEITEM.COPYFN +110537 . 111595) (CDTABLEBROWSER.HEADING.REPAINTFN 111597 . 111838)) (111841 139566 ( +CDTABLEBROWSER.WHENSELECTEDFN 111851 . 112319) (CD.COMMANDSELECTEDFN 112321 . 118494) (CD-MENUFN +118496 . 125361) (CD-COMPARE-FILES 125363 . 128890) (CDBROWSER-COPY 128892 . 134440) ( +CDBROWSER-DELETE-FILE 134442 . 139045) (CD-SWAPDIRS 139047 . 139564))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index 341d2592..e69a8efb 100644 Binary files a/lispusers/COMPAREDIRECTORIES.LCOM and b/lispusers/COMPAREDIRECTORIES.LCOM differ