From 40ae5fb9b338c430d84b7219c83162cbf59ca820 Mon Sep 17 00:00:00 2001
From: Matt Heffron <heffron@alumni.caltech.edu>
Date: Tue, 21 May 2024 23:15:59 -0700
Subject: [PATCH] Fix issue #1727 Edit of function from popup menu in
 MASTERSCOPE show paths graph locks mouse process. Left buttonfn didn't
 include :DONTWAIT option when launching the editor; middle buttonfn did.

---
 library/BROWSER      |  55 ++++++++++++++++++++-----------------------
 library/BROWSER.LCOM | Bin 12328 -> 11705 bytes
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/library/BROWSER b/library/BROWSER
index 5ca7aee9..a23b4691 100644
--- a/library/BROWSER
+++ b/library/BROWSER
@@ -1,16 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "26-Apr-2023 12:41:36" {DSK}<home>larry>il>medley>library>BROWSER.;6
 29801  
+
(FILECREATED "21-May-2024 18:46:31" {LIB}BROWSER.;2
 29502  
 
-      :EDIT-BY "lmm"
+      :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS BROWSER.LEFTFN NUMSPATHS STBROWSER MSPATHS.DISPATCH BROWSER 
-                       BROWSER.WHENFNSCHANGED BRPATHS1 GET.BROWSE.PP.WINDOW 
-                       GET.BROWSE.DESCRIBE.WINDOW BROWSEPP PPREPAINTFN PPRESHAPEFN DESCRIBEREPAINTFN
-                       BROWSERDESCRIBE BROWSER.MIDDLEFN DEDITPROCESSRUNNINGP REDRAWBROWSEGRAPH)
-                  (VARS BROWSERCOMS BROWSER.BORDERS)
+      :CHANGES-TO (FNS BROWSER.LEFTFN)
 
-      :PREVIOUS-DATE "15-Apr-2023 18:55:36" {DSK}<home>larry>il>medley>library>BROWSER.;1)
+      :PREVIOUS-DATE "26-Apr-2023 12:41:36" {LIB}BROWSER.;1)
 
 
 (PRETTYCOMPRINT BROWSERCOMS)
@@ -202,28 +198,29 @@
                 (RETURN ENTRY])
 
 (BROWSER.LEFTFN

-  [LAMBDA (NODE NWINDOW)
                                     (* ; "Edited 26-Apr-2023 12:41 by lmm")


+  [LAMBDA (NODE NWINDOW)
                                     (* ; "Edited 21-May-2024 18:40 by mth")


+                                                             (* ; "Edited 26-Apr-2023 12:41 by lmm")


                                                              (* ; "Edited 31-Mar-87 11:16 by jop")

                                                              (* ; 
 
                                                 "function that is applied upon selection of a node.")

     (PROG (FN SELECTION)
-          (IF
 (NULL NODE)
-              THEN
 (RETURN)
+          (if
 (NULL NODE)
+              then
 (RETURN)
                    (MOVEW NWINDOW)                           (* ; 
 
                                                       " really want to just drag the content around")

                    (RETURN))
-          (IF
 (NULL (SETQ FN (FETCH
 NODELABEL OF
 NODE)))
-              THEN
 (RETURN))
-          [SETQ SELECTION (MENU (CREATE
 MENU
+          (if
 (NULL (SETQ FN (fetch
 NODELABEL of
 NODE)))
+              then
 (RETURN))
+          [SETQ SELECTION (MENU (create
 MENU
                                        ITEMS _ '(CallsFrom CallsTo Edit Show InspectCode]
 
      (* ;; "Mot implemented: Ignore Avoid")

 
           (DESTRUCTURING-BIND (FROM
 TO
 INVERTED AVOIDING SEPARATE NOTRACE MARKING DEPTH)
-                 (FOR
 BW IN
 BROWSERWINDOWS WHEN
 (EQ (FETCH
 (BROWSEWIN WINDOW) OF
 BW)
-                                                    NWINDOW) DO
 (RETURN (FETCH
 (BROWSEWIN ARGS)
-                                                                           OF
 BW))
-                    FINALLY
 (PROMPTPRINT "No browser window found for" FN)
+                 (for
 BW in
 BROWSERWINDOWS when
 (EQ (fetch
 (BROWSEWIN WINDOW) of
 BW)
+                                                    NWINDOW) do
 (RETURN (fetch
 (BROWSEWIN ARGS)
+                                                                           of
 BW))
+                    finally
 (PROMPTPRINT "No browser window found for" FN)
                           (RETURN))
 
                  (* ;; "Now we have the arguments to MSPATHS .. insert this node?")

@@ -245,11 +242,11 @@
                      NIL
                      (Ignore                                 (* ; "local ignore")
)
                      (Avoid                                  (* ; " global ignore")
)
-                     (Edit (ED FN (IF
 (HASDEF FN 'FNS)
-                                      THEN
 'FNS
-                                    ELSEIF
 (HASDEF FN 'FUNCTIONS)
-                                      THEN
 'FUNCTIONS
-                                    ELSE
 (PROMPTPRINT FN "no definition")
+                     (Edit (ED FN (if
 (HASDEF FN 'FNS)
+                                      then
 '(FNS :DONTWAIT)
+                                    elseif
 (HASDEF FN 'FUNCTIONS)
+                                      then
 '(FUNCTIONS :DONTWAIT)
+                                    else
 (PROMPTPRINT FN "no definition")
                                          NIL)))
                      (Show (CL:UNLESS (EQ FN (WINDOWPROP (GET.BROWSE.PP.WINDOW
)
                                                     'FNBROWSED))
@@ -544,10 +541,10 @@
 (BROWSER
 T)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2085 28437 (MSPATHS.DISPATCH 2095 . 2569) (NUMSPATHS 2571 . 6158) (BROWSER 6160 . 6731)
- (BROWSER.WHENFNSCHANGED 6733 . 8518) (BRPATHS1 8520 . 11171) (BROWSER.LEFTFN 11173 . 14599) (
-GET.BROWSE.PP.WINDOW 14601 . 15426) (GET.BROWSE.DESCRIBE.WINDOW 15428 . 16176) (BROWSEPP 16178 . 17052
-) (PPREPAINTFN 17054 . 20180) (PPRESHAPEFN 20182 . 20358) (DESCRIBEREPAINTFN 20360 . 21064) (
-BROWSERDESCRIBE 21066 . 21808) (BROWSER.MIDDLEFN 21810 . 23125) (DEDITPROCESSRUNNINGP 23127 . 23382) (
-REDRAWBROWSEGRAPH 23384 . 24148) (STBROWSER 24150 . 28435)))))
+  (FILEMAP (NIL (1653 28138 (MSPATHS.DISPATCH 1663 . 2137) (NUMSPATHS 2139 . 5726) (BROWSER 5728 . 6299)
+ (BROWSER.WHENFNSCHANGED 6301 . 8086) (BRPATHS1 8088 . 10739) (BROWSER.LEFTFN 10741 . 14300) (
+GET.BROWSE.PP.WINDOW 14302 . 15127) (GET.BROWSE.DESCRIBE.WINDOW 15129 . 15877) (BROWSEPP 15879 . 16753
+) (PPREPAINTFN 16755 . 19881) (PPRESHAPEFN 19883 . 20059) (DESCRIBEREPAINTFN 20061 . 20765) (
+BROWSERDESCRIBE 20767 . 21509) (BROWSER.MIDDLEFN 21511 . 22826) (DEDITPROCESSRUNNINGP 22828 . 23083) (
+REDRAWBROWSEGRAPH 23085 . 23849) (STBROWSER 23851 . 28136)))))
 STOP
diff --git a/library/BROWSER.LCOM b/library/BROWSER.LCOM
index d242ec04bdc320e7ed213a4b192568bc39cf1a72..dbea7de0cdbc5b90b234e1ff29c450eabf3668de 100644
GIT binary patch
delta 589
zcmZWl!EO^V5Tz)m<<M3XK_w1TOQ7swSGG61o4CDrv);yHyBl_$ricTCHfk%i4WhYJ
z70NFlMf?Ltq@0lW0X~HPV4R9lR7>_ezwx{ozi;n<y!~=8W8U8A%Hx!`fOA1(5k>@>
z<ZyES@$_tb1d|IOaGmSqb5fPVT2=lwcY(0*UmatDVO>nX`S59cTX}dgx;P$Rz7X)Y
zGFO?&3OGf{Y>?-GBD34>zV8z_8cnh1J@vMrl(<ea)4A$aN*a{{;de%7ZPAKE!0wF-
zyc1FmLZ#Yx$r~W&(-Q)s+mpqvsy*|vgl1OM;QT+M3!-1CeO(S}FU5BAorjwZYr<ly
zvH9pJWl;zEz+y0^jS)!7Vmg1l`ecTHSuOy%U+PpByY|MHFSvyaYSot&s@fY}CIW;V
zC`wbwuBF>cwuLB$Jz2fFQHdZ`ebYlWwE3uws0GOogB3+@j9&a+eYdhPd4TKtR`1wG
z#~xoNi-YxFD-I7K8x;7koXf{QlOTxDfExmB5NTPMq148O0Drf%<_^a>hi0L3u-gYT
M&UF@R8_%Bq0ZAN@qyPW_

delta 832
zcmb7CO^ee|6g40WL`J4)hY?-e38=3~L%!QasigUsM%$N=q@58rcG}P>q|+hoEQ(6;
z9|#YZF2v0&#jXT#@6NxXzrdH+nGWve!Q-8CZ}RTB=e}<*&tAPhAPc6rKwN(^J{cwP
z04B%4!D}mg{`SeyWE|I%UYgG9qoh8L2T44yC!@o(M<b2E+Yjx4f2@^&<s`XmoTOz*
zkYo@vU9Rbh%E4h8U)<Y2>KzZ`>3tpAp>IUZkhk0nm`%Xs5h@UGW1C?~h}`XeSNlHr
zeqj5Ciz5dEOTMC~<PUn-XTxY!97a^^ew@%EG0Z05oF++}!gM~JoX+5~CZ6Xx81!be
z!T+@?imu39iA9dvvdzFYBHJQwm^+KBcmPtZDu|%lmK&8DFMvzNV~z#gY#Mma4$F}T
z$iX3;yVkOutSQ`CnE~sb&h6Q{@MrZC!5cd)+X!;^L?FKlMe+{aB_Gi)HSPzJsXGrA
zB|u#x2!Vc>56JY|>#_|mu<Rf#fli(6x?U$NTeM%`M0Gtsv8t=8E^8dHS9u3wiKWt)
zXAFB|AxkwCd=M)@8>goR1`TN$RKdkvJD?_KOvw|K49Z}1J=b#aUdE(6QO%$TA$<iw
zrjs%uPt+)^0rsN6Ftc!#MrA>ur~+++h?~Xhw4kzlwwW@whu7%(vfIp0HX|Q~%U?Ht
rG9YW<bg&t@9-WOWsh1fQ?~u=1-)~8h1PHq=$TkmjjHTtL!p^<FOXueu