Skip to content

Commit 65cfd1d

Browse files
authored
Pass the DW? argument to restore DWIMIFY functionality (#1765)
Got lost somewhere along the way, probably when I was creating the browser
1 parent 7dcc200 commit 65cfd1d

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

lispusers/COMPARESOURCES

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED " 7-Feb-2024 16:08:54" {WMEDLEY}<lispusers>COMPARESOURCES.;137 40939
3+
(FILECREATED "13-Jun-2024 11:46:26" {WMEDLEY}<lispusers>COMPARESOURCES.;138 40991
44

55
:EDIT-BY rmk
66

7-
:CHANGES-TO (VARS COMPARESOURCESCOMS)
8-
(FNS COMPARESOURCES CSBROWSER \CS.IGNOREFORMS)
7+
:CHANGES-TO (FNS \CS.COMPARE.MASTERS)
98

10-
:PREVIOUS-DATE "17-Jun-2023 15:22:40" {WMEDLEY}<lispusers>COMPARESOURCES.;131)
9+
:PREVIOUS-DATE " 7-Feb-2024 16:08:54" {WMEDLEY}<lispusers>COMPARESOURCES.;137)
1110

1211

1312
(PRETTYCOMPRINT COMPARESOURCESCOMS)
@@ -142,7 +141,8 @@
142141
'SAME])
143142

144143
(\CS.COMPARE.MASTERS
145-
[LAMBDA (BODY1 BODY2 DW?) (* ; "Edited 17-Jun-2023 15:19 by rmk")
144+
[LAMBDA (BODY1 BODY2 DW?) (* ; "Edited 13-Jun-2024 11:46 by rmk")
145+
(* ; "Edited 17-Jun-2023 15:19 by rmk")
146146
(* ; "Edited 25-Feb-2022 18:02 by rmk")
147147
(* ; "Edited 18-Jan-2022 22:00 by rmk")
148148
(* ; "Edited 19-Dec-2021 21:05 by rmk")
@@ -155,8 +155,8 @@
155155
 "We don't care about editdate comments")
156156
(SETQ BODY2 (CL:REMOVE-IF (FUNCTION EDITDATE?)
157157
BODY2))
158-
(SETQ BODY1 (\CS.FIXFNS BODY1))
159-
(SETQ BODY2 (\CS.FIXFNS BODY2))
158+
(SETQ BODY1 (\CS.FIXFNS BODY1 DW?))
159+
(SETQ BODY2 (\CS.FIXFNS BODY2 DW?))
160160
(CL:WHEN (AND (SETQ THING1 (ASSOC 'DEFINE-FILE-INFO BODY1))
161161
(SETQ THING2 (ASSOC 'DEFINE-FILE-INFO BODY2))
162162
(\CS.COMPARE.DEFINE-FILE-INFO THING1 THING2))
@@ -703,17 +703,17 @@
703703
)
704704
)
705705
(DECLARE%: DONTCOPY
706-
(FILEMAP (NIL (1748 26130 (COMPARESOURCES 1758 . 8406) (\CS.COMPARE.MASTERS 8408 . 15929) (
707-
\CS.COMPARE.TYPES 15931 . 19197) (\CS.EXAMINE 19199 . 22377) (\CS.FIXFNS 22379 . 23881) (
708-
\CS.SORT.DECLARES 23883 . 24226) (\CS.SORT.DECLARE1 24228 . 25648) (\CS.FILTER.GARBAGE 25650 . 26128))
709-
(26131 31474 (\CS.ISFNFORM 26141 . 26409) (\CS.COMPARE.FNS 26411 . 26653) (\CS.FNSID 26655 . 26799) (
710-
\CS.ISVARFORM 26801 . 26906) (\CS.COMPARE.VARS 26908 . 27570) (\CS.ISMACROFORM 27572 . 27710) (
711-
\CS.ISRECFORM 27712 . 28040) (\CS.REC.NAME 28042 . 28361) (\CS.ISCOURIERFORM 28363 . 28463) (
712-
\CS.ISTEMPLATEFORM 28465 . 28563) (\CS.COMPARE.TEMPLATES 28565 . 28930) (\CS.ISPROPFORM 28932 . 29087)
713-
(\CS.PROP.NAME 29089 . 29234) (\CS.COMPARE.PROPS 29236 . 29393) (\CS.ISADDVARFORM 29395 . 29488) (
714-
\CS.COMPARE.ADDVARS 29490 . 29655) (\CS.ISFPKGCOMFORM 29657 . 29864) (\CS.COMPARE.FPKGCOMS 29866 .
715-
30073) (\CS.COMPARE.DEFINE-FILE-INFO 30075 . 30665) (\CS.IGNOREFORMS 30667 . 31472)) (31475 37539 (
716-
CSOBJ.CREATE 31485 . 31898) (CSOBJ.DISPLAYFN 31900 . 32653) (CSOBJ.IMAGEBOXFN 32655 . 34816) (
717-
CSOBJ.BUTTONEVENTINFN 34818 . 37289) (CSOBJ.COPYBUTTONEVENTINFN 37291 . 37537)) (38420 40605 (
718-
CSBROWSER 38430 . 40603)))))
706+
(FILEMAP (NIL (1683 26182 (COMPARESOURCES 1693 . 8341) (\CS.COMPARE.MASTERS 8343 . 15981) (
707+
\CS.COMPARE.TYPES 15983 . 19249) (\CS.EXAMINE 19251 . 22429) (\CS.FIXFNS 22431 . 23933) (
708+
\CS.SORT.DECLARES 23935 . 24278) (\CS.SORT.DECLARE1 24280 . 25700) (\CS.FILTER.GARBAGE 25702 . 26180))
709+
(26183 31526 (\CS.ISFNFORM 26193 . 26461) (\CS.COMPARE.FNS 26463 . 26705) (\CS.FNSID 26707 . 26851) (
710+
\CS.ISVARFORM 26853 . 26958) (\CS.COMPARE.VARS 26960 . 27622) (\CS.ISMACROFORM 27624 . 27762) (
711+
\CS.ISRECFORM 27764 . 28092) (\CS.REC.NAME 28094 . 28413) (\CS.ISCOURIERFORM 28415 . 28515) (
712+
\CS.ISTEMPLATEFORM 28517 . 28615) (\CS.COMPARE.TEMPLATES 28617 . 28982) (\CS.ISPROPFORM 28984 . 29139)
713+
(\CS.PROP.NAME 29141 . 29286) (\CS.COMPARE.PROPS 29288 . 29445) (\CS.ISADDVARFORM 29447 . 29540) (
714+
\CS.COMPARE.ADDVARS 29542 . 29707) (\CS.ISFPKGCOMFORM 29709 . 29916) (\CS.COMPARE.FPKGCOMS 29918 .
715+
30125) (\CS.COMPARE.DEFINE-FILE-INFO 30127 . 30717) (\CS.IGNOREFORMS 30719 . 31524)) (31527 37591 (
716+
CSOBJ.CREATE 31537 . 31950) (CSOBJ.DISPLAYFN 31952 . 32705) (CSOBJ.IMAGEBOXFN 32707 . 34868) (
717+
CSOBJ.BUTTONEVENTINFN 34870 . 37341) (CSOBJ.COPYBUTTONEVENTINFN 37343 . 37589)) (38472 40657 (
718+
CSBROWSER 38482 . 40655)))))
719719
STOP

lispusers/COMPARESOURCES.LCOM

-18 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)