From 65cfd1dd69b885c162c8c15c9ca002d255f5fd42 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:35:22 -0700 Subject: [PATCH] Pass the DW? argument to restore DWIMIFY functionality (#1765) Got lost somewhere along the way, probably when I was creating the browser --- lispusers/COMPARESOURCES | 40 +++++++++++++++++----------------- lispusers/COMPARESOURCES.LCOM | Bin 17039 -> 17021 bytes 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lispusers/COMPARESOURCES b/lispusers/COMPARESOURCES index e2116c12..3d6023dc 100644 --- a/lispusers/COMPARESOURCES +++ b/lispusers/COMPARESOURCES @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Feb-2024 16:08:54" {WMEDLEY}COMPARESOURCES.;137 40939 +(FILECREATED "13-Jun-2024 11:46:26" {WMEDLEY}COMPARESOURCES.;138 40991 :EDIT-BY rmk - :CHANGES-TO (VARS COMPARESOURCESCOMS) - (FNS COMPARESOURCES CSBROWSER \CS.IGNOREFORMS) + :CHANGES-TO (FNS \CS.COMPARE.MASTERS) - :PREVIOUS-DATE "17-Jun-2023 15:22:40" {WMEDLEY}COMPARESOURCES.;131) + :PREVIOUS-DATE " 7-Feb-2024 16:08:54" {WMEDLEY}COMPARESOURCES.;137) (PRETTYCOMPRINT COMPARESOURCESCOMS) @@ -142,7 +141,8 @@ 'SAME]) (\CS.COMPARE.MASTERS - [LAMBDA (BODY1 BODY2 DW?) (* ; "Edited 17-Jun-2023 15:19 by rmk") + [LAMBDA (BODY1 BODY2 DW?) (* ; "Edited 13-Jun-2024 11:46 by rmk") + (* ; "Edited 17-Jun-2023 15:19 by rmk") (* ; "Edited 25-Feb-2022 18:02 by rmk") (* ; "Edited 18-Jan-2022 22:00 by rmk") (* ; "Edited 19-Dec-2021 21:05 by rmk") @@ -155,8 +155,8 @@  "We don't care about editdate comments") (SETQ BODY2 (CL:REMOVE-IF (FUNCTION EDITDATE?) BODY2)) - (SETQ BODY1 (\CS.FIXFNS BODY1)) - (SETQ BODY2 (\CS.FIXFNS BODY2)) + (SETQ BODY1 (\CS.FIXFNS BODY1 DW?)) + (SETQ BODY2 (\CS.FIXFNS BODY2 DW?)) (CL:WHEN (AND (SETQ THING1 (ASSOC 'DEFINE-FILE-INFO BODY1)) (SETQ THING2 (ASSOC 'DEFINE-FILE-INFO BODY2)) (\CS.COMPARE.DEFINE-FILE-INFO THING1 THING2)) @@ -703,17 +703,17 @@ ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1748 26130 (COMPARESOURCES 1758 . 8406) (\CS.COMPARE.MASTERS 8408 . 15929) ( -\CS.COMPARE.TYPES 15931 . 19197) (\CS.EXAMINE 19199 . 22377) (\CS.FIXFNS 22379 . 23881) ( -\CS.SORT.DECLARES 23883 . 24226) (\CS.SORT.DECLARE1 24228 . 25648) (\CS.FILTER.GARBAGE 25650 . 26128)) - (26131 31474 (\CS.ISFNFORM 26141 . 26409) (\CS.COMPARE.FNS 26411 . 26653) (\CS.FNSID 26655 . 26799) ( -\CS.ISVARFORM 26801 . 26906) (\CS.COMPARE.VARS 26908 . 27570) (\CS.ISMACROFORM 27572 . 27710) ( -\CS.ISRECFORM 27712 . 28040) (\CS.REC.NAME 28042 . 28361) (\CS.ISCOURIERFORM 28363 . 28463) ( -\CS.ISTEMPLATEFORM 28465 . 28563) (\CS.COMPARE.TEMPLATES 28565 . 28930) (\CS.ISPROPFORM 28932 . 29087) - (\CS.PROP.NAME 29089 . 29234) (\CS.COMPARE.PROPS 29236 . 29393) (\CS.ISADDVARFORM 29395 . 29488) ( -\CS.COMPARE.ADDVARS 29490 . 29655) (\CS.ISFPKGCOMFORM 29657 . 29864) (\CS.COMPARE.FPKGCOMS 29866 . -30073) (\CS.COMPARE.DEFINE-FILE-INFO 30075 . 30665) (\CS.IGNOREFORMS 30667 . 31472)) (31475 37539 ( -CSOBJ.CREATE 31485 . 31898) (CSOBJ.DISPLAYFN 31900 . 32653) (CSOBJ.IMAGEBOXFN 32655 . 34816) ( -CSOBJ.BUTTONEVENTINFN 34818 . 37289) (CSOBJ.COPYBUTTONEVENTINFN 37291 . 37537)) (38420 40605 ( -CSBROWSER 38430 . 40603))))) + (FILEMAP (NIL (1683 26182 (COMPARESOURCES 1693 . 8341) (\CS.COMPARE.MASTERS 8343 . 15981) ( +\CS.COMPARE.TYPES 15983 . 19249) (\CS.EXAMINE 19251 . 22429) (\CS.FIXFNS 22431 . 23933) ( +\CS.SORT.DECLARES 23935 . 24278) (\CS.SORT.DECLARE1 24280 . 25700) (\CS.FILTER.GARBAGE 25702 . 26180)) + (26183 31526 (\CS.ISFNFORM 26193 . 26461) (\CS.COMPARE.FNS 26463 . 26705) (\CS.FNSID 26707 . 26851) ( +\CS.ISVARFORM 26853 . 26958) (\CS.COMPARE.VARS 26960 . 27622) (\CS.ISMACROFORM 27624 . 27762) ( +\CS.ISRECFORM 27764 . 28092) (\CS.REC.NAME 28094 . 28413) (\CS.ISCOURIERFORM 28415 . 28515) ( +\CS.ISTEMPLATEFORM 28517 . 28615) (\CS.COMPARE.TEMPLATES 28617 . 28982) (\CS.ISPROPFORM 28984 . 29139) + (\CS.PROP.NAME 29141 . 29286) (\CS.COMPARE.PROPS 29288 . 29445) (\CS.ISADDVARFORM 29447 . 29540) ( +\CS.COMPARE.ADDVARS 29542 . 29707) (\CS.ISFPKGCOMFORM 29709 . 29916) (\CS.COMPARE.FPKGCOMS 29918 . +30125) (\CS.COMPARE.DEFINE-FILE-INFO 30127 . 30717) (\CS.IGNOREFORMS 30719 . 31524)) (31527 37591 ( +CSOBJ.CREATE 31537 . 31950) (CSOBJ.DISPLAYFN 31952 . 32705) (CSOBJ.IMAGEBOXFN 32707 . 34868) ( +CSOBJ.BUTTONEVENTINFN 34870 . 37341) (CSOBJ.COPYBUTTONEVENTINFN 37343 . 37589)) (38472 40657 ( +CSBROWSER 38482 . 40655))))) STOP diff --git a/lispusers/COMPARESOURCES.LCOM b/lispusers/COMPARESOURCES.LCOM index 70a5f6a1947c062967c3d3ab706f8f84999f169c..67905ef5c7293c75e8357a46c5a7257656c1569c 100644 GIT binary patch delta 1147 zcmZuw%Wl&^6vc%Nsgxo}qps*xL{TH;$TQ;^k6j7LaVEtjv5W1LRCEEQK}4l#Ns0uk zY+wz@dw!xHz%TG02(e>_#EtW8g%|dH%sF#>AD=&Ie?Mwpo)!qxci#1MYETmhaZKS* z@%30%WEpa$OGyJW4mC?~*zdeNJvr;X=^R1l{aJso;iS>ly=UDXLh7wX0~T?WN~Hux zFV6As|M=`uIk#E&8_J86o2c5ALlZ^mFKu%}f@#<`0Y}yRM6d2c|Ku2Qj`zq7wpFYr zA#B!z^!e86tui>fk=paaR;<^MHC@-%v|RdIyRTUn#igIi+S_y~Us|r_uHkcd&8_Ax z^!(0^Au$LXcyUFw-KHNXAci!dvDes*{2)P3P)JmS9@^Z5QJA2~=oJ*wdc)pfsL-E0Cc8UB}U-1j6&zoj#gmW*RmJg(KP-47#U1>=YG?zQo3P zZY{z>6HrfDZo|dtwWI(iQE>v6wHU^hjl&#SotmoqfuH!pFwg_Hsj%J*vY^r@y)dmg zDL3g9O&7y-8fI9JF{!GJhMVDhElTHdPDVJJkP)+LEW{ZK%ajvhPWu>#t;kbjNrFrz zj#f_hgL(*@q$@?DS*csRt4VyXwW(7AZVAA}?Y!#taCHwqpu@0_CBWT3>GaMAxYkr! fIb1rw4WtazG8eL-KSYn>cun&}S{FZx-yi$~Du^I4 delta 1203 zcmZuxOK;Oa5Uv3US_B*#q6#V)Swd=r9K0{T4hYxTR4$1fY$r{n3W?A_BWO}JL4s2* za6WnB^-I!98_L#o6S!_OI~^;V$1OLC!3*mRHv{JE(N(!aOV)zuaJIxFt#+5OwQ*T%YSXRc-2t^0ulqFWSdty&}U zg9J50heSrGp)4p&V1gpkFIW+_w6bk7H?l1@v#|^g2Z0v`9tDd{gL>g+MngH-Z^#%d z!lC{=PB6v}m^M#;-&?EY8e@MUdCPa}yAT0bb3igkG~QgTzhz zFaRO+%%fnFwJ;Xue|KP<&C62r<0J-#JkIXUh**faIlB?Hc_t-6vkug>=P<_3*vnvj z$)CNT56>p@#*|fqWJwXuCTr2wA(Hj5CBa%qCP`lw9^Ro@x>dhD=@Z7&uLUyZplLt| zu^}8Cbx%>$7b12XNbL0PaM&C4v1m9fIo-kctLk*QNz(YE)2VXNg* zCBj%bBZADF5w>CFaE6IxnG-@&679E#lZhYn>zSp zm>lQ#u=}Rh$9eC3LWN=JRKPdmxZ58M@hza1Si>Rp+dxWKZ<^Z$?I~&$J8Hg9EOGX; H`0MdMo+2`;