From d9e445ad8c17f8a6611c02a7728fe999f4c4bfdd Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 16 Dec 2021 20:06:41 -0800 Subject: [PATCH] TEDIT: added TITLE argument to TEDIT-SEE So caller can provide more informative information (useful in COMPAREDIRECTORIES) --- library/TEDIT | 91 ++++++++++++++++++++++----------------------- library/TEDIT.LCOM | Bin 38905 -> 38924 bytes 2 files changed, 44 insertions(+), 47 deletions(-) diff --git a/library/TEDIT b/library/TEDIT index e4939206..3d3ffcc9 100644 --- a/library/TEDIT +++ b/library/TEDIT @@ -1,12 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "13-Oct-2021 10:00:40"  -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDIT.;19 142287 +(FILECREATED "16-Dec-2021 12:34:26" {DSK}kaplan>Local>medley3.5>my-medley>library>TEDIT.;21 142324 - changes to%: (FNS TEDIT-SEE) + :CHANGES-TO (FNS TEDIT-SEE) - previous date%: "11-Oct-2021 14:03:12" -{DSK}kaplan>Local>medley3.5>git-medley>library>TEDIT.;18) + :PREVIOUS-DATE "13-Oct-2021 10:00:40" +{DSK}kaplan>Local>medley3.5>my-medley>library>TEDIT.;20) (* ; " @@ -27,9 +26,9 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (TEDIT.STARTUP.MONITORLOCK (CREATE.MONITORLOCK 'TEDIT.STARTUP)) (TEDIT.RESTART.MENU (\CREATE.TEDIT.RESTART.MENU)) (* ; - "Original was (CREATE MENU ITEMS _ '(NewEditProcess)).") + "Original was (CREATE MENU ITEMS _ '(NewEditProcess)).") (* ; - "Changed by yabu.fx, for SUNLOADUP without DWIM.") + "Changed by yabu.fx, for SUNLOADUP without DWIM.") ) (GLOBALVARS TEDIT.TENTATIVE TEDIT.DEFAULT.PROPS) (FNS \TEDIT2 COERCETEXTOBJ TEDIT TEDIT-SEE TEDIT.CHARWIDTH TEDIT.COPY TEDIT.DELETE @@ -40,10 +39,10 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. \TEDIT.FOREIGN.COPY? \TEDIT.QUIT \TEDIT.WORDDELETE \TEDIT1) (P (MOVD? 'NILL 'OBJECTOUTOFTEDIT)) (* ; - "HOOK for looked-string copy, etc. Used in \TEDIT.FOREIGN.COPY?.") + "HOOK for looked-string copy, etc. Used in \TEDIT.FOREIGN.COPY?.") (COMS (FNS \CREATE.TEDIT.RESTART.MENU)) (* ; - "Added by yabu.fx, for SUNLOADUP without DWIM.") + "Added by yabu.fx, for SUNLOADUP without DWIM.") (COMS (* ; "Debugging functions") (FNS PLCHAIN PRINTLINE SEEFILE)) (COMS (* ; "Object-oriented editing") @@ -56,10 +55,10 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (VARS TEDITSYSTEMDATE (TEDITSUPPORT "TEditSupport.PA")) (FNS MAKETEDITFORM) (P (ADDTOVAR LAFITESPECIALFORMS ("TEdit Report" 'MAKETEDITFORM - "Report a problem with TEdit")) + "Report a problem with TEdit")) (SETQ LAFITEFORMSMENU NIL))) (COMS (* ; - "LISTFILES Interface, so the system can decide if a file is a TEdit file.") + "LISTFILES Interface, so the system can decide if a file is a TEdit file.") (ADDVARS (PRINTFILETYPES (TEDIT (TEST \TEDIT.FORMATTEDP1) (EXTENSION (TEDIT]) @@ -330,8 +329,9 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (RETURN PROC]) (TEDIT-SEE - [LAMBDA (FILE WINDOW FORMAT) (* ; "Edited 13-Oct-2021 10:00 by rmk:") - (* ; "Edited 27-Feb-2021 20:07 by rmk:") + [LAMBDA (FILE WINDOW FORMAT TITLE) (* ; "Edited 16-Dec-2021 12:33 by rmk") + (* ; "Edited 13-Oct-2021 10:00 by rmk:") + (* ; "Edited 27-Feb-2021 20:07 by rmk:") (* ; "Edited 1-Feb-88 19:00 by bvm:") (* ;; "See FILE in a scrollable READONLY TEDIT window. If FILE is a LISP source file, copy first to a temporary NODIRCORE image file that interpretes the fontchange characters rather than showing black boxes.") @@ -347,28 +347,25 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (IF (\TEDIT.FORMATTEDP1 STREAM) ELSEIF (LISPSOURCEFILEP STREAM) THEN + (* ;; "Lisp source file") - (* ;; "Lisp source file") - - (SETQ SEESTREAM (OPENTEXTSTREAM)) - (DSPFONT DEFAULTFONT SEESTREAM) - (COPY.TEXT.TO.IMAGE STREAM SEESTREAM) + (SETQ SEESTREAM (OPENTEXTSTREAM)) + (DSPFONT DEFAULTFONT SEESTREAM) + (COPY.TEXT.TO.IMAGE STREAM SEESTREAM) ELSE + (* ;; "Not a Lisp source file and not a Tedit file. If it is not random access, we copy it so we can scroll around.") - (* ;; "Not a Lisp source file and not a Tedit file. If it is not random access, we copy it so we can scroll around.") + (* ;; "Maybe there is a conventional way of finding out the external format of a plain-text stream (an EMACS header?), here we nudge towards :UTF-8 (if it exists).") - (* ;; "Maybe there is a conventional way of finding out the external format of a plain-text stream (an EMACS header?), here we nudge towards :UTF-8 (if it exists).") - - (SETFILEINFO STREAM 'FORMAT (OR FORMAT (FIND-FORMAT :UTF-8) - :DEFAULT)) - (CL:UNLESS (RANDACCESSP STREAM) - (SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW)) - (COPYCHARS STREAM SEESTREAM))) - [SETQ TSTREAM (TEXTSTREAM (TEDIT SEESTREAM WINDOW NIL - `(READONLY T FONT ,DEFAULTFONT] - (WINDOWPROP (WFROMDS TSTREAM) + (SETFILEINFO STREAM 'FORMAT (OR FORMAT (FIND-FORMAT :UTF-8) + :DEFAULT)) + (CL:UNLESS (RANDACCESSP STREAM) + (SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW)) + (COPYCHARS STREAM SEESTREAM))) + [SETQ TSTREAM (TEXTSTREAM (TEDIT SEESTREAM WINDOW NIL `(READONLY T FONT ,DEFAULTFONT] + [WINDOWPROP (WFROMDS TSTREAM) 'TITLE - (CONCAT "SEE window for " (FULLNAME STREAM))) + (OR TITLE (CONCAT "SEE window for " (FULLNAME STREAM] (FULLNAME STREAM]) (TEDIT.CHARWIDTH @@ -2236,7 +2233,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (* ; "TEDIT Support information") -(RPAQQ TEDITSYSTEMDATE "13-Oct-2021 10:00:40") +(RPAQQ TEDITSYSTEMDATE "16-Dec-2021 12:34:26") (RPAQ TEDITSUPPORT "TEditSupport.PA") (DEFINEQ @@ -2258,23 +2255,23 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation. (ADDTOVAR PRINTFILETYPES (TEDIT (TEST \TEDIT.FORMATTEDP1) - (EXTENSION (TEDIT)))) + (EXTENSION (TEDIT)))) (PUTPROPS TEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1995 1999 2018 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4330 117453 (\TEDIT2 4340 . 7091) (COERCETEXTOBJ 7093 . 15869) (TEDIT 15871 . 20840) ( -TEDIT-SEE 20842 . 23129) (TEDIT.CHARWIDTH 23131 . 25155) (TEDIT.COPY 25157 . 33593) (TEDIT.DELETE -33595 . 34285) (TEDIT.DO.BLUEPENDINGDELETE 34287 . 37354) (TEDIT.INSERT 37356 . 42886) (TEDIT.KILL -42888 . 44445) (TEDIT.MAPLINES 44447 . 45846) (TEDIT.MAPPIECES 45848 . 46804) (TEDIT.MOVE 46806 . -56590) (TEDIT.QUIT 56592 . 58592) (TEDIT.STRINGWIDTH 58594 . 59265) (TEDIT.\INSERT 59267 . 61292) ( -TEXTOBJ 61294 . 62419) (TEXTSTREAM 62421 . 64036) (\TEDIT.INCLUDE 64038 . 67938) (\TEDIT.INSERT.PIECES - 67940 . 77855) (\TEDIT.MOVE.PIECEMAPFN 77857 . 79936) (\TEDIT.OBJECT.SHOWSEL 79938 . 83567) ( -\TEDIT.RESTARTFN 83569 . 85564) (\TEDIT.CHARDELETE 85566 . 89528) (\TEDIT.COPY.PIECEMAPFN 89530 . -92755) (\TEDIT.DELETE 92757 . 100275) (\TEDIT.DIFFUSE.PARALOOKS 100277 . 103041) (\TEDIT.FOREIGN.COPY? - 103043 . 106770) (\TEDIT.QUIT 106772 . 109918) (\TEDIT.WORDDELETE 109920 . 114753) (\TEDIT1 114755 . -117451)) (117567 117683 (\CREATE.TEDIT.RESTART.MENU 117577 . 117681)) (117782 121471 (PLCHAIN 117792 - . 118066) (PRINTLINE 118068 . 120832) (SEEFILE 120834 . 121469)) (121512 141155 (TEDIT.INSERT.OBJECT -121522 . 130599) (TEDIT.EDIT.OBJECT 130601 . 132857) (TEDIT.FIND.OBJECT 132859 . 133752) ( -TEDIT.FIND.OBJECT.SUBTREE 133754 . 134560) (TEDIT.PUT.OBJECT 134562 . 136221) (TEDIT.GET.OBJECT 136223 - . 139422) (TEDIT.OBJECT.CHANGED 139424 . 141153)) (141433 141796 (MAKETEDITFORM 141443 . 141794))))) + (FILEMAP (NIL (4330 117494 (\TEDIT2 4340 . 7091) (COERCETEXTOBJ 7093 . 15869) (TEDIT 15871 . 20840) ( +TEDIT-SEE 20842 . 23170) (TEDIT.CHARWIDTH 23172 . 25196) (TEDIT.COPY 25198 . 33634) (TEDIT.DELETE +33636 . 34326) (TEDIT.DO.BLUEPENDINGDELETE 34328 . 37395) (TEDIT.INSERT 37397 . 42927) (TEDIT.KILL +42929 . 44486) (TEDIT.MAPLINES 44488 . 45887) (TEDIT.MAPPIECES 45889 . 46845) (TEDIT.MOVE 46847 . +56631) (TEDIT.QUIT 56633 . 58633) (TEDIT.STRINGWIDTH 58635 . 59306) (TEDIT.\INSERT 59308 . 61333) ( +TEXTOBJ 61335 . 62460) (TEXTSTREAM 62462 . 64077) (\TEDIT.INCLUDE 64079 . 67979) (\TEDIT.INSERT.PIECES + 67981 . 77896) (\TEDIT.MOVE.PIECEMAPFN 77898 . 79977) (\TEDIT.OBJECT.SHOWSEL 79979 . 83608) ( +\TEDIT.RESTARTFN 83610 . 85605) (\TEDIT.CHARDELETE 85607 . 89569) (\TEDIT.COPY.PIECEMAPFN 89571 . +92796) (\TEDIT.DELETE 92798 . 100316) (\TEDIT.DIFFUSE.PARALOOKS 100318 . 103082) (\TEDIT.FOREIGN.COPY? + 103084 . 106811) (\TEDIT.QUIT 106813 . 109959) (\TEDIT.WORDDELETE 109961 . 114794) (\TEDIT1 114796 . +117492)) (117608 117724 (\CREATE.TEDIT.RESTART.MENU 117618 . 117722)) (117823 121512 (PLCHAIN 117833 + . 118107) (PRINTLINE 118109 . 120873) (SEEFILE 120875 . 121510)) (121553 141196 (TEDIT.INSERT.OBJECT +121563 . 130640) (TEDIT.EDIT.OBJECT 130642 . 132898) (TEDIT.FIND.OBJECT 132900 . 133793) ( +TEDIT.FIND.OBJECT.SUBTREE 133795 . 134601) (TEDIT.PUT.OBJECT 134603 . 136262) (TEDIT.GET.OBJECT 136264 + . 139463) (TEDIT.OBJECT.CHANGED 139465 . 141194)) (141474 141837 (MAKETEDITFORM 141484 . 141835))))) STOP diff --git a/library/TEDIT.LCOM b/library/TEDIT.LCOM index 630abb322521625e2e0bfe0c56dac514fb3cb8b4..dde38748a4b0898768d0540b9c3bc5b7d627c795 100644 GIT binary patch delta 499 zcmaKp!Artm7{=WagB_w$B#_|6EEJjS`?fY+AdI=$Vs6WQYKI^!r6RpZ7fFl+OxBi)KedVDJ*6rcpeV^yY`+hw0cQ5?IQCt-(-7^tO7y-h%tms%BU8%S~ z6#LyyuRARFE>8#T!LUrMibD!}808?1l%Fk(bVbu;GAye`2Nwba85EW3$_r?ee2K5% z;Gjt#z?kp^nD{PES~W%nx0`#<{hgC@^~AhCGPehGO4cUFa-u&7=?7WgKs66MiUqF| z7DPcr5JgQ=HCdg!?rL-EVzJ0Ww;lGn|H(@-pHJmX%QmWYLl2A^eIXg@ldWGLA5}=9 zEQ(46I!Eo3es2Wfa9e|%={6vKu!2IvF!FGE-n$$OFGk;9@tsHf%Z9QhNE(Vfq~_ra zDp7{HS=rPD#0r>D0@JHIdJvCgXjyK}Yvo~K$}G~^szjPJ$@b|Po7I<|vq_R($e~h( zLucQ%8UdgpfZ4QdS9c7+iUfW$_(Aw}&j&0kQ1#qu49Bt*y|D^mN)?*s)I{t}ZEkP* dD}xULG=jJbhdyvSBoWQH`*GYo8(rUx$tT)9YO(+T