From 4c183732296c031bd80df0cdd7bc61b8589bbf1c Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Wed, 29 May 2024 15:46:15 -0700 Subject: [PATCH] Fix FILEBROWSER error when a borrowed function needs the prompt window. FB.PROMPTW.FORMAT now uses the global PROMPTWINDOW if called under a borrowed function (i.e., not a FILEBROWSER window). Tweaked the format string provided by FB.FASTSEE.ONEFILE to go to newline conditionally. --- library/FILEBROWSER | 163 +++++++++++++++++++-------------------- library/FILEBROWSER.LCOM | Bin 87940 -> 87971 bytes 2 files changed, 81 insertions(+), 82 deletions(-) diff --git a/library/FILEBROWSER b/library/FILEBROWSER index 8b61e706..aee83ad1 100644 --- a/library/FILEBROWSER +++ b/library/FILEBROWSER @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED " 4-Nov-2023 23:55:27" |{WMEDLEY}FILEBROWSER.;27| 266102 +(FILECREATED "29-May-2024 15:30:07" {LIB}FILEBROWSER.\;2 266071 - :EDIT-BY |rmk| + :EDIT-BY "mth" - :CHANGES-TO (VARS FILEBROWSERCOMS) - (FNS FB.EDITCOMMAND.ONEFILE) + :CHANGES-TO (FNS FB.PROMPTW.FORMAT FB.FASTSEE.ONEFILE) - :PREVIOUS-DATE " 4-Nov-2023 23:50:29" |{WMEDLEY}FILEBROWSER.;26|) + :PREVIOUS-DATE " 4-Nov-2023 23:55:27" {LIB}FILEBROWSER.\;1) (PRETTYCOMPRINT FILEBROWSERCOMS) @@ -729,14 +728,17 @@ Your deletions are thus ignored."))) (PRIN1 THING WINDOW)))))))) (FB.PROMPTW.FORMAT - (CL:LAMBDA (BROWSER FORMAT-STRING &REST ARGS) (* \; "Edited 4-Feb-88 23:15 by bvm:") + (CL:LAMBDA (BROWSER FORMAT-STRING &REST ARGS) (* \; "Edited 29-May-2024 15:16 by mth") + (* \; "Edited 4-Feb-88 23:15 by bvm:") (* |;;| "Outputs to FOLDER's prompt window using FORMAT.") (LET ((*PRINT-CASE* :UPCASE) (*PRINT-BASE* 10) - (WINDOW (|ffetch| (FILEBROWSER PROMPTWINDOW) |of| (\\DTEST BROWSER - 'FILEBROWSER)))) + (WINDOW (OR (AND (|type?| FILEBROWSER BROWSER) + (|ffetch| (FILEBROWSER PROMPTWINDOW) |of| (\\DTEST BROWSER + 'FILEBROWSER))) + PROMPTWINDOW))) (* |;;| "*PRINT-CASE* is bound so symbols get printed in \"expected\" case. *PRINT-BASE* is 10 for benefit of printing numbers in the non-format case.") @@ -1896,10 +1898,9 @@ Your deletions are thus ignored."))) SEEWINDOW UNFORMATTED (CDR TAIL))))))) (FB.FASTSEE.ONEFILE - (LAMBDA (BROWSER FILE WINDOW UNFORMATTED MORE) (* \; - "Edited 21-Feb-2021 14:46 by rmk:") - (* \; - "Edited 20-Nov-2000 14:23 by rmk:") + (LAMBDA (BROWSER FILE WINDOW UNFORMATTED MORE) (* \; "Edited 29-May-2024 15:28 by mth") + (* \; "Edited 21-Feb-2021 14:46 by rmk:") + (* \; "Edited 20-Nov-2000 14:23 by rmk:") (* \; "Edited 19-Aug-91 13:06 by jds") (COND ((DIRECTORYNAMEP FILE) @@ -1921,32 +1922,30 @@ Your deletions are thus ignored."))) (* |;;| "Failed on this file. If this was the only file, the message can be a little more terse (which is desirable, because the typical message is \"File not found xxx\")") - (FB.PROMPTW.FORMAT BROWSER "~:[Failed~;~:*Couldn't see ~A~] because ~A" + (FB.PROMPTW.FORMAT BROWSER "~&~:[Failed~;~:*Couldn't see ~A~] because ~A" (AND MORE FILE) CONDITION) |else| (RESETLST - (RESETSAVE NIL (LIST (FUNCTION (LAMBDA (STREAM WINDOW) - (AND RESETSTATE (OPENWP WINDOW) - (WINDOWPROP - WINDOW - 'TITLE - (CONCAT (WINDOWPROP WINDOW - 'TITLE) - " -- " "Aborted"))) - (CLOSEF STREAM))) - STREAM WINDOW)) - (WINDOWPROP WINDOW 'MORETYPE (COND - (MORE 'YETMOREBUTTONS) - (T 'LASTMOREBUTTONS))) - (COND - (UNFORMATTED (COPYCHARS STREAM WINDOW)) - (T (PFCOPYBYTES STREAM WINDOW))) - (WINDOWPROP WINDOW 'TITLE (CONCAT (WINDOWPROP WINDOW 'TITLE) - " -- " "Finished")) - (COND - (MORE (* \; "Wait for OK to proceed") - (FB.SEEFULLFN (WINDOWPROP WINDOW 'DSP) - 'FINISHEDMOREBUTTONS)))))))))) + (RESETSAVE NIL (LIST (FUNCTION (LAMBDA (STREAM WINDOW) + (AND RESETSTATE (OPENWP WINDOW) + (WINDOWPROP WINDOW 'TITLE + (CONCAT (WINDOWPROP WINDOW + 'TITLE) + " -- " "Aborted"))) + (CLOSEF STREAM))) + STREAM WINDOW)) + (WINDOWPROP WINDOW 'MORETYPE (COND + (MORE 'YETMOREBUTTONS) + (T 'LASTMOREBUTTONS))) + (COND + (UNFORMATTED (COPYCHARS STREAM WINDOW)) + (T (PFCOPYBYTES STREAM WINDOW))) + (WINDOWPROP WINDOW 'TITLE (CONCAT (WINDOWPROP WINDOW 'TITLE) + " -- " "Finished")) + (COND + (MORE (* \; "Wait for OK to proceed") + (FB.SEEFULLFN (WINDOWPROP WINDOW 'DSP) + 'FINISHEDMOREBUTTONS)))))))))) (FB.SEEFULLFN (LAMBDA (DSP PROP) (* |bvm:| "18-Sep-85 23:29") @@ -4250,51 +4249,51 @@ then click Recompute")))) (ADDTOVAR LAMA FB.PROMPTW.FORMAT FB.PROMPTWPRINT) ) (DECLARE\: DONTCOPY - (FILEMAP (NIL (31928 54809 (FB 31938 . 33073) (FB.COPYBINARYCOMMAND 33075 . 33421) (FB.COPYTEXTCOMMAND - 33423 . 33765) (FILEBROWSER 33767 . 46873) (FB.TABLEBROWSER 46875 . 47092) (FB.SELECTEDFILES 47094 . -47731) (FB.FETCHFILENAME 47733 . 48125) (FB.DIRECTORYP 48127 . 48521) (FB.PROMPTWPRINT 48523 . 49569) -(FB.PROMPTW.FORMAT 49571 . 50308) (FB.PROMPTFORINPUT 50310 . 52562) (FB.YES-OR-NO-P 52564 . 53598) ( -FB.ALLOW.ABORT 53600 . 54454) (\\FB.HARDCOPY.TOFILE.EXTENSION 54456 . 54807)) (54833 55786 (FB.STARTUP - 54843 . 55358) (FB.MAKERIGIDWINDOW 55360 . 55784)) (55787 61270 (FB.PRINTFN 55797 . 60950) (FB.COPYFN - 60952 . 61268)) (61320 67660 (FB.MENU.WHENSELECTEDFN 61330 . 61688) (FB.COMMANDSELECTEDFN 61690 . -63229) (FB.SUBITEMP 63231 . 63832) (FB.MAKE.BROWSER.BUSY 63834 . 64638) (FB.FINISH.COMMAND 64640 . -66671) (FB.HANDLE.ABORT.BUTTON 66673 . 67658)) (67661 73177 (FB.DELETECOMMAND 67671 . 67952) ( -FB.DELVERCOMMAND 67954 . 71147) (FB.IS.NOT.SUBDIRECTORY.ITEM 71149 . 71330) (FB.DELVER.FILES 71332 . -72421) (FB.DELETE.FILE 72423 . 73175)) (73178 74503 (FB.UNDELETECOMMAND 73188 . 73473) ( -FB.UNDELETEALLCOMMAND 73475 . 73754) (FB.UNDELETE.FILE 73756 . 74501)) (74504 98685 (FB.COPYCOMMAND -74514 . 74783) (FB.RENAMECOMMAND 74785 . 75060) (FB.COPY/RENAME.COMMAND 75062 . 75985) ( -FB.COPY/RENAME.ONE 75987 . 78309) (FB.COPY/RENAME.MANY 78311 . 84531) (FB.MERGE.DIRECTORIES 84533 . -84951) (FB.GREATEST.PREFIX 84953 . 86309) (FB.MAYBE.INSERT.FILE 86311 . 93751) (FB.GET.NEW.FILE.SPEC -93753 . 97584) (FB.CANONICAL.DIRECTORY 97586 . 98683)) (98686 106470 (FB.HARDCOPYCOMMAND 98696 . 99826 -) (FB.HARDCOPY.TOFILE 99828 . 106468)) (106471 116680 (FB.EDITCOMMAND 106481 . 107348) ( -FB.EDITCOMMAND.ONEFILE 107350 . 110764) (FB.EDITLISPFILE 110766 . 111871) (FB.BROWSECOMMAND 111873 . -116678)) (116681 128602 (FB.FASTSEECOMMAND 116691 . 120141) (FB.FASTSEE.ONEFILE 120143 . 123300) ( -FB.SEEFULLFN 123302 . 127433) (FB.SEEBUTTONFN 127435 . 128600)) (128603 130349 (FB.LOADCOMMAND 128613 - . 129120) (FB.COMPILECOMMAND 129122 . 129660) (FB.OPERATE.ON.FILES 129662 . 130347)) (130350 178535 ( -FB.UPDATECOMMAND 130360 . 130585) (FB.FIX-DIRECTORY-DATES 130587 . 131610) (FB.MAYBE.EXPUNGE 131612 . -132673) (FB.UPDATEBROWSERITEMS 132675 . 145890) (FB.DATE 145892 . 146533) (FB.ADJUST.DATE.WIDTH 146535 - . 149503) (FB.SET.BROWSER.TITLE 149505 . 150507) (FB.MAYBE.WIDEN.NAMES 150509 . 152628) ( -FB.SET.DEFAULT.NAME.WIDTH 152630 . 153994) (FB.CREATE.FILEBUCKET 153996 . 161216) ( -FB.CHECK.NAME.LENGTH 161218 . 163639) (FB.ADD.FILEGROUP 163641 . 165168) (FB.INSERT.DIRECTORY 165170 - . 165408) (FB.MAKE.SUBDIRECTORY.ITEM 165410 . 166819) (FB.ADD.FILE 166821 . 167434) (FB.INSERT.FILE -167436 . 170848) (FB.ANALYZE.PATTERN 170850 . 176114) (FB.CANONICALIZE.PATTERN 176116 . 177428) ( -FB.GETALLFILEINFO 177430 . 178533)) (178536 186695 (FB.SORT.VERSIONS 178546 . 181317) ( -FB.DECREASING.VERSION 181319 . 181988) (FB.INCREASING.VERSION 181990 . 182611) ( -FB.NAMES.DECREASING.VERSION 182613 . 183648) (FB.NAMES.INCREASING.VERSION 183650 . 184647) ( -FB.DECREASING.NUMERIC.ATTR 184649 . 185329) (FB.INCREASING.NUMERIC.ATTR 185331 . 186005) ( -FB.ALPHABETIC.ATTR 186007 . 186693)) (186696 196538 (FB.SORTCOMMAND 186706 . 193536) ( -FB.INSERT.SUBDIRECTORIES 193538 . 194335) (FB.GET.SORT.MENU 194337 . 196536)) (196539 212760 ( -FB.EXPUNGECOMMAND 196549 . 199134) (FB.NEWPATTERNCOMMAND 199136 . 199534) (FB.NEWINFOCOMMAND 199536 . -202368) (FB.DEPTHCOMMAND 202370 . 204145) (FB.SHAPECOMMAND 204147 . 207489) (FB.REMOVE.FILE 207491 . -209312) (FB.COUNT.FILE.CHANGE 209314 . 210759) (FB.SETNEWPATTERN 210761 . 211931) (FB.GET.NEWPATTERN -211933 . 212517) (FB.OPTIONSCOMMAND 212519 . 212758)) (212795 213848 (FB.GETWINDOW 212805 . 213846)) ( -213849 214861 (FB.INFOMENU.SHADEINITIALSELECTIONS 213859 . 214506) (FB.INFO.ITEM.NAMED 214508 . 214859 -)) (214862 224394 (FB.MAKECOUNTERWINDOW 214872 . 216400) (FB.COUNTERW.REDISPLAYFN 216402 . 216989) ( -FB.UPDATE.COUNTERS 216991 . 219063) (FB.DISPLAY.COUNTERS 219065 . 224125) (FB.COUNTER.STRING 224127 . -224392)) (224395 229104 (FB.MAKEHEADINGWINDOW 224405 . 226019) (FB.HEADINGW.REDISPLAYFN 226021 . -226287) (FB.HEADINGW.RESHAPEFN 226289 . 226665) (FB.HEADINGW.DISPLAY 226667 . 229102)) (229105 233288 -(FB.ICONFN 229115 . 229462) (FB.INFOMENU.WHENSELECTEDFN 229464 . 230194) (FB.CLOSEFN 230196 . 231399) -(FB.EXPUNGE?.MENU 231401 . 231813) (FB.AFTERCLOSEFN 231815 . 232176) (FB.CLOSE&EXPUNGE 232178 . 233286 -)) (233289 245347 (FB.HARDCOPY.DIRECTORY 233299 . 243656) (FB.HARDCOPY.PRINT.TITLE 243658 . 243984) ( -FB.HARDCOPY.MAXWIDTH 243986 . 245345))))) + (FILEMAP (NIL (31871 54979 (FB 31881 . 33016) (FB.COPYBINARYCOMMAND 33018 . 33364) (FB.COPYTEXTCOMMAND + 33366 . 33708) (FILEBROWSER 33710 . 46816) (FB.TABLEBROWSER 46818 . 47035) (FB.SELECTEDFILES 47037 . +47674) (FB.FETCHFILENAME 47676 . 48068) (FB.DIRECTORYP 48070 . 48464) (FB.PROMPTWPRINT 48466 . 49512) +(FB.PROMPTW.FORMAT 49514 . 50478) (FB.PROMPTFORINPUT 50480 . 52732) (FB.YES-OR-NO-P 52734 . 53768) ( +FB.ALLOW.ABORT 53770 . 54624) (\\FB.HARDCOPY.TOFILE.EXTENSION 54626 . 54977)) (55003 55956 (FB.STARTUP + 55013 . 55528) (FB.MAKERIGIDWINDOW 55530 . 55954)) (55957 61440 (FB.PRINTFN 55967 . 61120) (FB.COPYFN + 61122 . 61438)) (61490 67830 (FB.MENU.WHENSELECTEDFN 61500 . 61858) (FB.COMMANDSELECTEDFN 61860 . +63399) (FB.SUBITEMP 63401 . 64002) (FB.MAKE.BROWSER.BUSY 64004 . 64808) (FB.FINISH.COMMAND 64810 . +66841) (FB.HANDLE.ABORT.BUTTON 66843 . 67828)) (67831 73347 (FB.DELETECOMMAND 67841 . 68122) ( +FB.DELVERCOMMAND 68124 . 71317) (FB.IS.NOT.SUBDIRECTORY.ITEM 71319 . 71500) (FB.DELVER.FILES 71502 . +72591) (FB.DELETE.FILE 72593 . 73345)) (73348 74673 (FB.UNDELETECOMMAND 73358 . 73643) ( +FB.UNDELETEALLCOMMAND 73645 . 73924) (FB.UNDELETE.FILE 73926 . 74671)) (74674 98855 (FB.COPYCOMMAND +74684 . 74953) (FB.RENAMECOMMAND 74955 . 75230) (FB.COPY/RENAME.COMMAND 75232 . 76155) ( +FB.COPY/RENAME.ONE 76157 . 78479) (FB.COPY/RENAME.MANY 78481 . 84701) (FB.MERGE.DIRECTORIES 84703 . +85121) (FB.GREATEST.PREFIX 85123 . 86479) (FB.MAYBE.INSERT.FILE 86481 . 93921) (FB.GET.NEW.FILE.SPEC +93923 . 97754) (FB.CANONICAL.DIRECTORY 97756 . 98853)) (98856 106640 (FB.HARDCOPYCOMMAND 98866 . 99996 +) (FB.HARDCOPY.TOFILE 99998 . 106638)) (106641 116850 (FB.EDITCOMMAND 106651 . 107518) ( +FB.EDITCOMMAND.ONEFILE 107520 . 110934) (FB.EDITLISPFILE 110936 . 112041) (FB.BROWSECOMMAND 112043 . +116848)) (116851 128571 (FB.FASTSEECOMMAND 116861 . 120311) (FB.FASTSEE.ONEFILE 120313 . 123269) ( +FB.SEEFULLFN 123271 . 127402) (FB.SEEBUTTONFN 127404 . 128569)) (128572 130318 (FB.LOADCOMMAND 128582 + . 129089) (FB.COMPILECOMMAND 129091 . 129629) (FB.OPERATE.ON.FILES 129631 . 130316)) (130319 178504 ( +FB.UPDATECOMMAND 130329 . 130554) (FB.FIX-DIRECTORY-DATES 130556 . 131579) (FB.MAYBE.EXPUNGE 131581 . +132642) (FB.UPDATEBROWSERITEMS 132644 . 145859) (FB.DATE 145861 . 146502) (FB.ADJUST.DATE.WIDTH 146504 + . 149472) (FB.SET.BROWSER.TITLE 149474 . 150476) (FB.MAYBE.WIDEN.NAMES 150478 . 152597) ( +FB.SET.DEFAULT.NAME.WIDTH 152599 . 153963) (FB.CREATE.FILEBUCKET 153965 . 161185) ( +FB.CHECK.NAME.LENGTH 161187 . 163608) (FB.ADD.FILEGROUP 163610 . 165137) (FB.INSERT.DIRECTORY 165139 + . 165377) (FB.MAKE.SUBDIRECTORY.ITEM 165379 . 166788) (FB.ADD.FILE 166790 . 167403) (FB.INSERT.FILE +167405 . 170817) (FB.ANALYZE.PATTERN 170819 . 176083) (FB.CANONICALIZE.PATTERN 176085 . 177397) ( +FB.GETALLFILEINFO 177399 . 178502)) (178505 186664 (FB.SORT.VERSIONS 178515 . 181286) ( +FB.DECREASING.VERSION 181288 . 181957) (FB.INCREASING.VERSION 181959 . 182580) ( +FB.NAMES.DECREASING.VERSION 182582 . 183617) (FB.NAMES.INCREASING.VERSION 183619 . 184616) ( +FB.DECREASING.NUMERIC.ATTR 184618 . 185298) (FB.INCREASING.NUMERIC.ATTR 185300 . 185974) ( +FB.ALPHABETIC.ATTR 185976 . 186662)) (186665 196507 (FB.SORTCOMMAND 186675 . 193505) ( +FB.INSERT.SUBDIRECTORIES 193507 . 194304) (FB.GET.SORT.MENU 194306 . 196505)) (196508 212729 ( +FB.EXPUNGECOMMAND 196518 . 199103) (FB.NEWPATTERNCOMMAND 199105 . 199503) (FB.NEWINFOCOMMAND 199505 . +202337) (FB.DEPTHCOMMAND 202339 . 204114) (FB.SHAPECOMMAND 204116 . 207458) (FB.REMOVE.FILE 207460 . +209281) (FB.COUNT.FILE.CHANGE 209283 . 210728) (FB.SETNEWPATTERN 210730 . 211900) (FB.GET.NEWPATTERN +211902 . 212486) (FB.OPTIONSCOMMAND 212488 . 212727)) (212764 213817 (FB.GETWINDOW 212774 . 213815)) ( +213818 214830 (FB.INFOMENU.SHADEINITIALSELECTIONS 213828 . 214475) (FB.INFO.ITEM.NAMED 214477 . 214828 +)) (214831 224363 (FB.MAKECOUNTERWINDOW 214841 . 216369) (FB.COUNTERW.REDISPLAYFN 216371 . 216958) ( +FB.UPDATE.COUNTERS 216960 . 219032) (FB.DISPLAY.COUNTERS 219034 . 224094) (FB.COUNTER.STRING 224096 . +224361)) (224364 229073 (FB.MAKEHEADINGWINDOW 224374 . 225988) (FB.HEADINGW.REDISPLAYFN 225990 . +226256) (FB.HEADINGW.RESHAPEFN 226258 . 226634) (FB.HEADINGW.DISPLAY 226636 . 229071)) (229074 233257 +(FB.ICONFN 229084 . 229431) (FB.INFOMENU.WHENSELECTEDFN 229433 . 230163) (FB.CLOSEFN 230165 . 231368) +(FB.EXPUNGE?.MENU 231370 . 231782) (FB.AFTERCLOSEFN 231784 . 232145) (FB.CLOSE&EXPUNGE 232147 . 233255 +)) (233258 245316 (FB.HARDCOPY.DIRECTORY 233268 . 243625) (FB.HARDCOPY.PRINT.TITLE 243627 . 243953) ( +FB.HARDCOPY.MAXWIDTH 243955 . 245314))))) STOP diff --git a/library/FILEBROWSER.LCOM b/library/FILEBROWSER.LCOM index 43dddf8f8535a3de5355c7eef87a08fc363ef4a3..7edc09c94f1b79c50e377db4aa6fa39265c732cb 100644 GIT binary patch delta 714 zcmZuv&ubGw7|o`%#latKQd5W)zK&2f!iL>Vc9X7%TAw;`MQl^}+S34^hq}1hvz98oq%K$o~ z=Ky7r;jC$BS*sAv7^ar6oP%}0^MS(7C2DMHh#OoFc@O>6Q|IXP*{EPl_}*1LWYv-K z$?e<9nA^S{-yOf@ZYD=g^v}KT_l)3`tKEwZ69|^O#?;(R-+uRJnfm2zcs<&kZ#RCt zYPyJHZrR`cuBj&{JTw=HfU4xOvS}J7F+>y~rAmFNAjIIWctuYe1&GFBAUfws;LHr7 zf#c(VEyDmUp%)=xF61>?w{pbZ-s`|oafB6FXS=0OBRa~0q`NMtz{Nn(vw16ooZl@> zA!qjP=Q%`kB3O#0%0vl7qJR@i%{GY;lWfW7VHhB+WOTZBu6>Ups26K(Qcrb)q@M58 z#>rif1=g9BW_oWsU)+(c4FS0-Il}O0&e_|zJ&7Q~0=`zOY}Oi8m$DbxTs-^(HAlgj delta 734 zcmZ3yp0#B?>x9611ruGr{4!l510!PvBV#L5Q!68LB?S$ov!AJ@oQo1Dy~qQs&~J2y`sSEnHV@L<;QL8chW*C1k@4O|49ftc;9-nv;rB zVaC-c)Ffvl=B1|=Th%DIIq6M)8Y5C)lbKhepyU?nq6Ub=!3(1}6ife!#?ZPai8