From 9529c35631bcdc6a2cec881a86821b9cc77c22aa Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:52:43 -0700 Subject: [PATCH] FILEBROWSER: FB.COPYFN uses COPYINSERT instead of BKSYSBUF (#1277) So shift-selecting produces strings for file names with funky characters --- library/FILEBROWSER | 112 +++++++++++++++++++-------------------- library/FILEBROWSER.LCOM | Bin 88040 -> 87886 bytes 2 files changed, 55 insertions(+), 57 deletions(-) diff --git a/library/FILEBROWSER b/library/FILEBROWSER index 13e9a48f..2b93aaab 100644 --- a/library/FILEBROWSER +++ b/library/FILEBROWSER @@ -1,13 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10) -(FILECREATED " 4-Aug-2022 09:32:02" |{DSK}larry>medley>library>FILEBROWSER.;2| 266567 +(FILECREATED "18-Jul-2023 22:19:30" |{WMEDLEY}FILEBROWSER.;24| 266436 - :CHANGES-TO (VARS FILEBROWSERCOMS) + :EDIT-BY |rmk| - :PREVIOUS-DATE " 2-Dec-2021 19:33:12" |{DSK}larry>medley>library>FILEBROWSER.;1|) + :CHANGES-TO (FNS FB.COPYFN) + :PREVIOUS-DATE " 4-Aug-2022 09:32:02" |{WMEDLEY}FILEBROWSER.;23|) -; Copyright (c) 1983-1991, 1993-1994, 1999-2001, 2021 by Venue & Xerox Corporation. (PRETTYCOMPRINT FILEBROWSERCOMS) @@ -463,8 +463,7 @@ Your deletions are thus ignored."))) (* \; "Entries") -(DEFCOMMAND "fb" (&REST PAT&PROPS) - (APPLY 'FB PAT&PROPS)) +(DEFCOMMAND "fb" (&REST PAT&PROPS) (APPLY 'FB PAT&PROPS)) (DEFINEQ (FB @@ -943,8 +942,9 @@ Your deletions are thus ignored."))) (AND OLDFONT (DSPFONT OLDFONT STREAM))))) (FB.COPYFN - (LAMBDA (TBROWSER ITEM) (* |bvm:| "13-Oct-85 17:44") - (BKSYSBUF (|fetch| (FBFILEDATA FILENAME) |of| (|fetch| TIDATA |of| ITEM))))) + (LAMBDA (TBROWSER ITEM) (* \; "Edited 18-Jul-2023 22:19 by rmk") + (* |bvm:| "13-Oct-85 17:44") + (COPYINSERT (|fetch| (FBFILEDATA FILENAME) |of| (|fetch| TIDATA |of| ITEM))))) ) @@ -4253,54 +4253,52 @@ then click Recompute")))) (ADDTOVAR LAMA FB.PROMPTW.FORMAT FB.PROMPTWPRINT) ) -(PUTPROPS FILEBROWSER COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 -1991 1993 1994 1999 2000 2001 2021)) (DECLARE\: DONTCOPY - (FILEMAP (NIL (32375 55256 (FB 32385 . 33520) (FB.COPYBINARYCOMMAND 33522 . 33868) (FB.COPYTEXTCOMMAND - 33870 . 34212) (FILEBROWSER 34214 . 47320) (FB.TABLEBROWSER 47322 . 47539) (FB.SELECTEDFILES 47541 . -48178) (FB.FETCHFILENAME 48180 . 48572) (FB.DIRECTORYP 48574 . 48968) (FB.PROMPTWPRINT 48970 . 50016) -(FB.PROMPTW.FORMAT 50018 . 50755) (FB.PROMPTFORINPUT 50757 . 53009) (FB.YES-OR-NO-P 53011 . 54045) ( -FB.ALLOW.ABORT 54047 . 54901) (\\FB.HARDCOPY.TOFILE.EXTENSION 54903 . 55254)) (55280 56233 (FB.STARTUP - 55290 . 55805) (FB.MAKERIGIDWINDOW 55807 . 56231)) (56234 61606 (FB.PRINTFN 56244 . 61397) (FB.COPYFN - 61399 . 61604)) (61656 67996 (FB.MENU.WHENSELECTEDFN 61666 . 62024) (FB.COMMANDSELECTEDFN 62026 . -63565) (FB.SUBITEMP 63567 . 64168) (FB.MAKE.BROWSER.BUSY 64170 . 64974) (FB.FINISH.COMMAND 64976 . -67007) (FB.HANDLE.ABORT.BUTTON 67009 . 67994)) (67997 73513 (FB.DELETECOMMAND 68007 . 68288) ( -FB.DELVERCOMMAND 68290 . 71483) (FB.IS.NOT.SUBDIRECTORY.ITEM 71485 . 71666) (FB.DELVER.FILES 71668 . -72757) (FB.DELETE.FILE 72759 . 73511)) (73514 74839 (FB.UNDELETECOMMAND 73524 . 73809) ( -FB.UNDELETEALLCOMMAND 73811 . 74090) (FB.UNDELETE.FILE 74092 . 74837)) (74840 99021 (FB.COPYCOMMAND -74850 . 75119) (FB.RENAMECOMMAND 75121 . 75396) (FB.COPY/RENAME.COMMAND 75398 . 76321) ( -FB.COPY/RENAME.ONE 76323 . 78645) (FB.COPY/RENAME.MANY 78647 . 84867) (FB.MERGE.DIRECTORIES 84869 . -85287) (FB.GREATEST.PREFIX 85289 . 86645) (FB.MAYBE.INSERT.FILE 86647 . 94087) (FB.GET.NEW.FILE.SPEC -94089 . 97920) (FB.CANONICAL.DIRECTORY 97922 . 99019)) (99022 106806 (FB.HARDCOPYCOMMAND 99032 . -100162) (FB.HARDCOPY.TOFILE 100164 . 106804)) (106807 117006 (FB.EDITCOMMAND 106817 . 107684) ( -FB.EDITCOMMAND.ONEFILE 107686 . 111090) (FB.EDITLISPFILE 111092 . 112197) (FB.BROWSECOMMAND 112199 . -117004)) (117007 128928 (FB.FASTSEECOMMAND 117017 . 120467) (FB.FASTSEE.ONEFILE 120469 . 123626) ( -FB.SEEFULLFN 123628 . 127759) (FB.SEEBUTTONFN 127761 . 128926)) (128929 130675 (FB.LOADCOMMAND 128939 - . 129446) (FB.COMPILECOMMAND 129448 . 129986) (FB.OPERATE.ON.FILES 129988 . 130673)) (130676 178861 ( -FB.UPDATECOMMAND 130686 . 130911) (FB.FIX-DIRECTORY-DATES 130913 . 131936) (FB.MAYBE.EXPUNGE 131938 . -132999) (FB.UPDATEBROWSERITEMS 133001 . 146216) (FB.DATE 146218 . 146859) (FB.ADJUST.DATE.WIDTH 146861 - . 149829) (FB.SET.BROWSER.TITLE 149831 . 150833) (FB.MAYBE.WIDEN.NAMES 150835 . 152954) ( -FB.SET.DEFAULT.NAME.WIDTH 152956 . 154320) (FB.CREATE.FILEBUCKET 154322 . 161542) ( -FB.CHECK.NAME.LENGTH 161544 . 163965) (FB.ADD.FILEGROUP 163967 . 165494) (FB.INSERT.DIRECTORY 165496 - . 165734) (FB.MAKE.SUBDIRECTORY.ITEM 165736 . 167145) (FB.ADD.FILE 167147 . 167760) (FB.INSERT.FILE -167762 . 171174) (FB.ANALYZE.PATTERN 171176 . 176440) (FB.CANONICALIZE.PATTERN 176442 . 177754) ( -FB.GETALLFILEINFO 177756 . 178859)) (178862 187021 (FB.SORT.VERSIONS 178872 . 181643) ( -FB.DECREASING.VERSION 181645 . 182314) (FB.INCREASING.VERSION 182316 . 182937) ( -FB.NAMES.DECREASING.VERSION 182939 . 183974) (FB.NAMES.INCREASING.VERSION 183976 . 184973) ( -FB.DECREASING.NUMERIC.ATTR 184975 . 185655) (FB.INCREASING.NUMERIC.ATTR 185657 . 186331) ( -FB.ALPHABETIC.ATTR 186333 . 187019)) (187022 196864 (FB.SORTCOMMAND 187032 . 193862) ( -FB.INSERT.SUBDIRECTORIES 193864 . 194661) (FB.GET.SORT.MENU 194663 . 196862)) (196865 213086 ( -FB.EXPUNGECOMMAND 196875 . 199460) (FB.NEWPATTERNCOMMAND 199462 . 199860) (FB.NEWINFOCOMMAND 199862 . -202694) (FB.DEPTHCOMMAND 202696 . 204471) (FB.SHAPECOMMAND 204473 . 207815) (FB.REMOVE.FILE 207817 . -209638) (FB.COUNT.FILE.CHANGE 209640 . 211085) (FB.SETNEWPATTERN 211087 . 212257) (FB.GET.NEWPATTERN -212259 . 212843) (FB.OPTIONSCOMMAND 212845 . 213084)) (213121 214174 (FB.GETWINDOW 213131 . 214172)) ( -214175 215187 (FB.INFOMENU.SHADEINITIALSELECTIONS 214185 . 214832) (FB.INFO.ITEM.NAMED 214834 . 215185 -)) (215188 224720 (FB.MAKECOUNTERWINDOW 215198 . 216726) (FB.COUNTERW.REDISPLAYFN 216728 . 217315) ( -FB.UPDATE.COUNTERS 217317 . 219389) (FB.DISPLAY.COUNTERS 219391 . 224451) (FB.COUNTER.STRING 224453 . -224718)) (224721 229430 (FB.MAKEHEADINGWINDOW 224731 . 226345) (FB.HEADINGW.REDISPLAYFN 226347 . -226613) (FB.HEADINGW.RESHAPEFN 226615 . 226991) (FB.HEADINGW.DISPLAY 226993 . 229428)) (229431 233614 -(FB.ICONFN 229441 . 229788) (FB.INFOMENU.WHENSELECTEDFN 229790 . 230520) (FB.CLOSEFN 230522 . 231725) -(FB.EXPUNGE?.MENU 231727 . 232139) (FB.AFTERCLOSEFN 232141 . 232502) (FB.CLOSE&EXPUNGE 232504 . 233612 -)) (233615 245673 (FB.HARDCOPY.DIRECTORY 233625 . 243982) (FB.HARDCOPY.PRINT.TITLE 243984 . 244310) ( -FB.HARDCOPY.MAXWIDTH 244312 . 245671))))) + (FILEMAP (NIL (32272 55153 (FB 32282 . 33417) (FB.COPYBINARYCOMMAND 33419 . 33765) (FB.COPYTEXTCOMMAND + 33767 . 34109) (FILEBROWSER 34111 . 47217) (FB.TABLEBROWSER 47219 . 47436) (FB.SELECTEDFILES 47438 . +48075) (FB.FETCHFILENAME 48077 . 48469) (FB.DIRECTORYP 48471 . 48865) (FB.PROMPTWPRINT 48867 . 49913) +(FB.PROMPTW.FORMAT 49915 . 50652) (FB.PROMPTFORINPUT 50654 . 52906) (FB.YES-OR-NO-P 52908 . 53942) ( +FB.ALLOW.ABORT 53944 . 54798) (\\FB.HARDCOPY.TOFILE.EXTENSION 54800 . 55151)) (55177 56130 (FB.STARTUP + 55187 . 55702) (FB.MAKERIGIDWINDOW 55704 . 56128)) (56131 61614 (FB.PRINTFN 56141 . 61294) (FB.COPYFN + 61296 . 61612)) (61664 68004 (FB.MENU.WHENSELECTEDFN 61674 . 62032) (FB.COMMANDSELECTEDFN 62034 . +63573) (FB.SUBITEMP 63575 . 64176) (FB.MAKE.BROWSER.BUSY 64178 . 64982) (FB.FINISH.COMMAND 64984 . +67015) (FB.HANDLE.ABORT.BUTTON 67017 . 68002)) (68005 73521 (FB.DELETECOMMAND 68015 . 68296) ( +FB.DELVERCOMMAND 68298 . 71491) (FB.IS.NOT.SUBDIRECTORY.ITEM 71493 . 71674) (FB.DELVER.FILES 71676 . +72765) (FB.DELETE.FILE 72767 . 73519)) (73522 74847 (FB.UNDELETECOMMAND 73532 . 73817) ( +FB.UNDELETEALLCOMMAND 73819 . 74098) (FB.UNDELETE.FILE 74100 . 74845)) (74848 99029 (FB.COPYCOMMAND +74858 . 75127) (FB.RENAMECOMMAND 75129 . 75404) (FB.COPY/RENAME.COMMAND 75406 . 76329) ( +FB.COPY/RENAME.ONE 76331 . 78653) (FB.COPY/RENAME.MANY 78655 . 84875) (FB.MERGE.DIRECTORIES 84877 . +85295) (FB.GREATEST.PREFIX 85297 . 86653) (FB.MAYBE.INSERT.FILE 86655 . 94095) (FB.GET.NEW.FILE.SPEC +94097 . 97928) (FB.CANONICAL.DIRECTORY 97930 . 99027)) (99030 106814 (FB.HARDCOPYCOMMAND 99040 . +100170) (FB.HARDCOPY.TOFILE 100172 . 106812)) (106815 117014 (FB.EDITCOMMAND 106825 . 107692) ( +FB.EDITCOMMAND.ONEFILE 107694 . 111098) (FB.EDITLISPFILE 111100 . 112205) (FB.BROWSECOMMAND 112207 . +117012)) (117015 128936 (FB.FASTSEECOMMAND 117025 . 120475) (FB.FASTSEE.ONEFILE 120477 . 123634) ( +FB.SEEFULLFN 123636 . 127767) (FB.SEEBUTTONFN 127769 . 128934)) (128937 130683 (FB.LOADCOMMAND 128947 + . 129454) (FB.COMPILECOMMAND 129456 . 129994) (FB.OPERATE.ON.FILES 129996 . 130681)) (130684 178869 ( +FB.UPDATECOMMAND 130694 . 130919) (FB.FIX-DIRECTORY-DATES 130921 . 131944) (FB.MAYBE.EXPUNGE 131946 . +133007) (FB.UPDATEBROWSERITEMS 133009 . 146224) (FB.DATE 146226 . 146867) (FB.ADJUST.DATE.WIDTH 146869 + . 149837) (FB.SET.BROWSER.TITLE 149839 . 150841) (FB.MAYBE.WIDEN.NAMES 150843 . 152962) ( +FB.SET.DEFAULT.NAME.WIDTH 152964 . 154328) (FB.CREATE.FILEBUCKET 154330 . 161550) ( +FB.CHECK.NAME.LENGTH 161552 . 163973) (FB.ADD.FILEGROUP 163975 . 165502) (FB.INSERT.DIRECTORY 165504 + . 165742) (FB.MAKE.SUBDIRECTORY.ITEM 165744 . 167153) (FB.ADD.FILE 167155 . 167768) (FB.INSERT.FILE +167770 . 171182) (FB.ANALYZE.PATTERN 171184 . 176448) (FB.CANONICALIZE.PATTERN 176450 . 177762) ( +FB.GETALLFILEINFO 177764 . 178867)) (178870 187029 (FB.SORT.VERSIONS 178880 . 181651) ( +FB.DECREASING.VERSION 181653 . 182322) (FB.INCREASING.VERSION 182324 . 182945) ( +FB.NAMES.DECREASING.VERSION 182947 . 183982) (FB.NAMES.INCREASING.VERSION 183984 . 184981) ( +FB.DECREASING.NUMERIC.ATTR 184983 . 185663) (FB.INCREASING.NUMERIC.ATTR 185665 . 186339) ( +FB.ALPHABETIC.ATTR 186341 . 187027)) (187030 196872 (FB.SORTCOMMAND 187040 . 193870) ( +FB.INSERT.SUBDIRECTORIES 193872 . 194669) (FB.GET.SORT.MENU 194671 . 196870)) (196873 213094 ( +FB.EXPUNGECOMMAND 196883 . 199468) (FB.NEWPATTERNCOMMAND 199470 . 199868) (FB.NEWINFOCOMMAND 199870 . +202702) (FB.DEPTHCOMMAND 202704 . 204479) (FB.SHAPECOMMAND 204481 . 207823) (FB.REMOVE.FILE 207825 . +209646) (FB.COUNT.FILE.CHANGE 209648 . 211093) (FB.SETNEWPATTERN 211095 . 212265) (FB.GET.NEWPATTERN +212267 . 212851) (FB.OPTIONSCOMMAND 212853 . 213092)) (213129 214182 (FB.GETWINDOW 213139 . 214180)) ( +214183 215195 (FB.INFOMENU.SHADEINITIALSELECTIONS 214193 . 214840) (FB.INFO.ITEM.NAMED 214842 . 215193 +)) (215196 224728 (FB.MAKECOUNTERWINDOW 215206 . 216734) (FB.COUNTERW.REDISPLAYFN 216736 . 217323) ( +FB.UPDATE.COUNTERS 217325 . 219397) (FB.DISPLAY.COUNTERS 219399 . 224459) (FB.COUNTER.STRING 224461 . +224726)) (224729 229438 (FB.MAKEHEADINGWINDOW 224739 . 226353) (FB.HEADINGW.REDISPLAYFN 226355 . +226621) (FB.HEADINGW.RESHAPEFN 226623 . 226999) (FB.HEADINGW.DISPLAY 227001 . 229436)) (229439 233622 +(FB.ICONFN 229449 . 229796) (FB.INFOMENU.WHENSELECTEDFN 229798 . 230528) (FB.CLOSEFN 230530 . 231733) +(FB.EXPUNGE?.MENU 231735 . 232147) (FB.AFTERCLOSEFN 232149 . 232510) (FB.CLOSE&EXPUNGE 232512 . 233620 +)) (233623 245681 (FB.HARDCOPY.DIRECTORY 233633 . 243990) (FB.HARDCOPY.PRINT.TITLE 243992 . 244318) ( +FB.HARDCOPY.MAXWIDTH 244320 . 245679))))) STOP diff --git a/library/FILEBROWSER.LCOM b/library/FILEBROWSER.LCOM index d6b6eea57f2039403762b6292966fd8a63f22aca..7dbfd6f5f8cecf80af4a1c47e5d943ae1c7ff831 100644 GIT binary patch delta 396 zcmaE{p7q>1)(L@zh8DVBr8&Ar21dpTMn+bKmR81wN(vfE$@#ejnK`K`3i){oN(wdA z;l8deKCY3qHWMd^)tl64DsU;GXf?1hFtIWPYOP5sN`+~zQK(7INX$!5Ew-vraC6dg z_78}3^HZqF%&SpQatrnGQ9w3BPfri1JteUuHKhi-@n%YzTpDhkIzFz>L9UJ=t}Y6w zj)1t|0NuSNCN&C1W@aYFW(roWE}kK}PLT>VMY-8PTdbTt9R1u~gLOmv6*S!Zf)TEq zypd6OvJ;~?C$i5OjW=^LT~y)$dBoE%*fl6blWX!nVQCgF4Ity5fcWH?m-3q}RWILA t2nccw35j&}_YDa0^b1jN^Yn3b3i1yJ>H&%cYjSPo{^u9T;^*nZ1ppHvaH9YK delta 559 zcmaKpOG?8~6o%=*ff2!p4;;ubpd^EoK+uVkkAHB^&&N5>_j4Z)bGJvkpev>Exq?)LK((-;V^k19 z63^&h*bhk$XapjpSCwGzdgp=;NHOfj@uWB)y^u_b)2GbJO)7&R{wd01y?}Lwmoljz z^L4JC#|FZNDawLWZR|U?@06NOWqOxcU;RgYkODGI!_0$#?Rx33<^)R91*u)~1K>Sn z-#rc--*yiI8L;O&?S|V5lnN_n21u!pGk!Y_Gz;f)SVJNR{~c>Nqs`tjFXBRZFX#m2 zR#je