github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-05-01 22:16:57 +00:00
Code Issues Projects Releases Wiki Activity

Rmk66: 2 little glitches, plus GITFNS prc dealing better with forking (#887)

Browse Source 
* VTCHAT:  Changed name of CHARSET field to avoid ambiguity

Even though field was never referenced

* INSPECT: WHERE argument was passed incorrectly to datatype subfunction

* GITFNS: Better recognition of funny cases (colon) etc

Reconciled with Larry's previous commit

* COMPAREDIRECTORIES:  Bug fix in separate-panel display
This commit is contained in:
rmkaplan
2022-08-12 22:01:04 -07:00
committed by GitHub
parent 431d80fb3c
commit 39a7512458
8 changed files with 145 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lispusers/COMPAREDIRECTORIES
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "25-Jul-2022 15:31:50" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;248 128327
(FILECREATED "11-Aug-2022 21:10:25" 
{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;249 128449
:CHANGES-TO (FNS CDBROWSER.STRINGS)
:PREVIOUS-DATE "20-Jul-2022 21:20:33"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;247)
:PREVIOUS-DATE "25-Jul-2022 15:31:50"
{DSK}<Users>kaplan>Local>medley3.5>release-medley>lispusers>COMPAREDIRECTORIES.;1)
(* ; "
@@ -1707,7 +1707,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
BROWSER)])
(CDBROWSER.STRINGS
[LAMBDA (CDVALUE COLHEADINGS SEPARATEDIRECTIONS) (* ; "Edited 25-Jul-2022 15:31 by rmk")
[LAMBDA (CDVALUE COLHEADINGS SEPARATEDIRECTIONS) (* ; "Edited 11-Aug-2022 20:23 by rmk")
(* ; "Edited 25-Jul-2022 15:31 by rmk")
(* ; "Edited 20-Jul-2022 21:14 by rmk")
(* ; "Edited 22-Feb-2022 18:30 by rmk")
(* ; "Edited 14-Dec-2021 21:03 by rmk")
@@ -1758,8 +1759,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(* ;; "Stick a blank object between")
(SETQ PAIRS (NCONC (DREVERSE L2R)
`(("")
(""))
[APPEND '(("")
(""]
(DREVERSE R2L)))))
(CL:WHEN COLHEADERS
(PUSH PAIRS (LIST COLHEADERS)))
@@ -2153,25 +2154,25 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(PUTPROPS COMPAREDIRECTORIES COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1994 1998
2018 2020 2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (2634 22191 (COMPAREDIRECTORIES 2644 . 7477) (COMPAREDIRECTORIES.INFOS 7479 . 10353) (
COMPAREDIRECTORIES.CANDIDATES 10355 . 13740) (CDENTRIES.SELECT 13742 . 18517) (
COMPAREDIRECTORIES.INFOS.TYPE 18519 . 19425) (MATCHNAME 19427 . 20107) (CD.INSURECDVALUE 20109 . 21723
) (CD.UPDATEWIDTHS 21725 . 22189)) (22192 31861 (CDFILES 22202 . 27955) (CDFILES.MATCH 27957 . 29582)
(CDFILES.PATS 29584 . 31859)) (31862 49683 (CDPRINT 31872 . 34389) (CDPRINT.HEADER 34391 . 35288) (
CDPRINT.LINE 35290 . 38522) (CDPRINT.MAXWIDTHS 38524 . 42639) (CDPRINT.COLHEADERS 42641 . 43926) (
CDPRINT.COLUMNS 43928 . 49048) (CDTEDIT 49050 . 49681)) (49684 58053 (CDMAP 49694 . 51126) (CDENTRY
51128 . 51437) (CDSUBSET 51439 . 52878) (CDMERGE 52880 . 56734) (CDMERGE.COMMON 56736 . 58051)) (58054
65592 (BINCOMP 58064 . 62353) (EOLTYPE 62355 . 64917) (EOLTYPE.SHOW 64919 . 65590)) (66120 78647 (
FIND-UNCOMPILED-FILES 66130 . 69773) (FIND-UNSOURCED-FILES 69775 . 72159) (FIND-SOURCE-FILES 72161 .
73899) (FIND-COMPILED-FILES 73901 . 75778) (FIND-UNLOADED-FILES 75780 . 76633) (FIND-LOADED-FILES
76635 . 77063) (FIND-MULTICOMPILED-FILES 77065 . 78645)) (78648 87079 (CREATED-AS 78658 . 83455) (
SOURCE-FOR-COMPILED-P 83457 . 86384) (COMPILE-SOURCE-DATE-DIFF 86386 . 87077)) (87080 97386 (
FIX-DIRECTORY-DATES 87090 . 90083) (FIX-EQUIV-DATES 90085 . 91610) (COPY-COMPARED-FILES 91612 . 93433)
(COPY-MISSING-FILES 93435 . 95592) (COMPILED-ON-SAME-SOURCE 95594 . 97384)) (97580 105189 (CDBROWSER
97590 . 101517) (CDBROWSER.STRINGS 101519 . 105187)) (105351 107087 (CD.TABLEITEM 105361 . 105581) (
CD.TABLEITEM.PRINTFN 105583 . 105782) (CD.TABLEITEM.COPYFN 105784 . 106842) (
CDTABLEBROWSER.HEADING.REPAINTFN 106844 . 107085)) (107088 127743 (CDTABLEBROWSER.WHENSELECTEDFN
107098 . 107566) (CD.COMMANDSELECTEDFN 107568 . 112669) (CD-MENUFN 112671 . 116982) (CD-COMPARE-FILES
116984 . 120336) (CDBROWSER-COPY 120338 . 124007) (CDBROWSER-DELETE-FILE 124009 . 127222) (CD-SWAPDIRS
127224 . 127741)))))
(FILEMAP (NIL (2632 22189 (COMPAREDIRECTORIES 2642 . 7475) (COMPAREDIRECTORIES.INFOS 7477 . 10351) (
COMPAREDIRECTORIES.CANDIDATES 10353 . 13738) (CDENTRIES.SELECT 13740 . 18515) (
COMPAREDIRECTORIES.INFOS.TYPE 18517 . 19423) (MATCHNAME 19425 . 20105) (CD.INSURECDVALUE 20107 . 21721
) (CD.UPDATEWIDTHS 21723 . 22187)) (22190 31859 (CDFILES 22200 . 27953) (CDFILES.MATCH 27955 . 29580)
(CDFILES.PATS 29582 . 31857)) (31860 49681 (CDPRINT 31870 . 34387) (CDPRINT.HEADER 34389 . 35286) (
CDPRINT.LINE 35288 . 38520) (CDPRINT.MAXWIDTHS 38522 . 42637) (CDPRINT.COLHEADERS 42639 . 43924) (
CDPRINT.COLUMNS 43926 . 49046) (CDTEDIT 49048 . 49679)) (49682 58051 (CDMAP 49692 . 51124) (CDENTRY
51126 . 51435) (CDSUBSET 51437 . 52876) (CDMERGE 52878 . 56732) (CDMERGE.COMMON 56734 . 58049)) (58052
65590 (BINCOMP 58062 . 62351) (EOLTYPE 62353 . 64915) (EOLTYPE.SHOW 64917 . 65588)) (66118 78645 (
FIND-UNCOMPILED-FILES 66128 . 69771) (FIND-UNSOURCED-FILES 69773 . 72157) (FIND-SOURCE-FILES 72159 .
73897) (FIND-COMPILED-FILES 73899 . 75776) (FIND-UNLOADED-FILES 75778 . 76631) (FIND-LOADED-FILES
76633 . 77061) (FIND-MULTICOMPILED-FILES 77063 . 78643)) (78646 87077 (CREATED-AS 78656 . 83453) (
SOURCE-FOR-COMPILED-P 83455 . 86382) (COMPILE-SOURCE-DATE-DIFF 86384 . 87075)) (87078 97384 (
FIX-DIRECTORY-DATES 87088 . 90081) (FIX-EQUIV-DATES 90083 . 91608) (COPY-COMPARED-FILES 91610 . 93431)
(COPY-MISSING-FILES 93433 . 95590) (COMPILED-ON-SAME-SOURCE 95592 . 97382)) (97578 105311 (CDBROWSER
97588 . 101515) (CDBROWSER.STRINGS 101517 . 105309)) (105473 107209 (CD.TABLEITEM 105483 . 105703) (
CD.TABLEITEM.PRINTFN 105705 . 105904) (CD.TABLEITEM.COPYFN 105906 . 106964) (
CDTABLEBROWSER.HEADING.REPAINTFN 106966 . 107207)) (107210 127865 (CDTABLEBROWSER.WHENSELECTEDFN
107220 . 107688) (CD.COMMANDSELECTEDFN 107690 . 112791) (CD-MENUFN 112793 . 117104) (CD-COMPARE-FILES
117106 . 120458) (CDBROWSER-COPY 120460 . 124129) (CDBROWSER-DELETE-FILE 124131 . 127344) (CD-SWAPDIRS
127346 . 127863)))))
STOP

BIN
lispusers/COMPAREDIRECTORIES.LCOM
View File

Binary file not shown.

66
lispusers/GITFNS
View File

@@ -1,11 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 9-Aug-2022 09:35:32" {DSK}<home>larry>medley>lispusers>GITFNS.;5 115355
(FILECREATED "11-Aug-2022 17:54:59" 
{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>GITFNS.;444 115395
:CHANGES-TO (VARS GITFNSCOMS)
(FNS GIT-MAKE-PROJECT GIT-INIT GIT-INIT-MEDLEY)
:CHANGES-TO (FNS GIT-MAKE-PROJECT GIT-INIT)
(VARS GITFNSCOMS)
:PREVIOUS-DATE "25-Jul-2022 15:14:26" {DSK}<home>larry>medley>lispusers>GITFNS.;1)
:PREVIOUS-DATE "25-Jul-2022 15:14:26"
{DSK}<Users>kaplan>Local>medley3.5>release-medley>lispusers>GITFNS.;1)
(PRETTYCOMPRINT GITFNSCOMS)
@@ -161,7 +163,7 @@
(GIT-MAKE-PROJECT
[LAMBDA (PROJECTNAME PROJECTPATH WORKINGPATH EXCLUSIONS DEFAULTSUBDIRS)
(* ; "Edited 8-Aug-2022 22:03 by lmm")
(* ; "Edited 11-Aug-2022 17:54 by rmk")
(* ; "Edited 13-Jul-2022 13:47 by rmk")
(* ; "Edited 6-Jul-2022 19:34 by rmk")
(* ; "Edited 17-May-2022 17:08 by rmk")
@@ -2158,31 +2160,31 @@
(PUTPROPS GITFNS FILETYPE :TCOMPL)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (3965 19213 (GIT-CLONEP 3975 . 5238) (GIT-INIT 5240 . 5667) (GIT-MAKE-PROJECT 5669 .
14054) (GIT-GET-PROJECT 14056 . 15981) (GIT-PROJECT-PATH 15983 . 17027) (FIND-ANCESTOR-DIRECTORY 17029
. 17378) (GIT-FIND-CLONE 17380 . 18461) (GIT-MAINBRANCH 18463 . 18858) (GIT-MAINBRANCH? 18860 . 19211
)) (25594 28382 (ALLSUBDIRS 25604 . 26890) (MEDLEYSUBDIRS 26892 . 27585) (GITSUBDIRS 27587 . 28380)) (
28383 33173 (TOGIT 28393 . 29799) (FROMGIT 29801 . 30782) (GIT-DELETE-FILE 30784 . 31630) (
MYMEDLEY-DELETE-FILES 31632 . 33171)) (33174 35706 (MYMEDLEYSUBDIR 33184 . 33640) (GITSUBDIR 33642 .
34085) (STRIPDIR 34087 . 34458) (STRIPHOST 34460 . 34700) (STRIPNAME 34702 . 35455) (STRIPWHERE 35457
. 35704)) (35707 37609 (GFILE4MFILE 35717 . 36080) (MFILE4GFILE 36082 . 36651) (GIT-REPO-FILENAME
36653 . 37607)) (37658 47480 (GIT-COMMIT 37668 . 38494) (GIT-PUSH 38496 . 39140) (GIT-PULL 39142 .
39754) (GIT-APPROVAL 39756 . 40105) (GIT-GET-FILE 40107 . 42072) (GIT-FILE-EXISTS? 42074 . 42348) (
GIT-REMOTE-UPDATE 42350 . 43074) (GIT-REMOTE-ADD 43076 . 43383) (GIT-FILE-DATE 43385 . 44316) (
GIT-FILE-HISTORY 44318 . 46252) (GIT-PRINT-FILE-HISTORY 46254 . 47304) (GIT-FETCH 47306 . 47478)) (
47510 58242 (GIT-BRANCH-DIFF 47520 . 54304) (GIT-COMMIT-DIFFS 54306 . 54859) (GIT-BRANCH-RELATIONS
54861 . 58240)) (58287 69089 (GIT-BRANCH-NUM 58297 . 58870) (GIT-CHECKOUT 58872 . 59931) (
GIT-WHICH-BRANCH 59933 . 60231) (GIT-MAKE-BRANCH 60233 . 62446) (GIT-BRANCHES 62448 . 64421) (
GIT-BRANCH-EXISTS? 64423 . 65127) (GIT-PICK-BRANCH 65129 . 65457) (GIT-PRC-MENU 65459 . 67207) (
GIT-PULL-REQUESTS 67209 . 68475) (GIT-SHORT-BRANCH-NAME 68477 . 68768) (GIT-LONG-NAME 68770 . 69087))
(69119 72454 (GIT-MY-CURRENT-BRANCH 69129 . 69499) (GIT-MY-BRANCHP 69501 . 70006) (GIT-MY-NEXT-BRANCH
70008 . 70502) (GIT-MY-BRANCHES 70504 . 72452)) (72500 76452 (GIT-ADD-WORKTREE 72510 . 73994) (
GIT-REMOVE-WORKTREE 73996 . 74926) (GIT-LIST-WORKTREES 74928 . 75732) (WORKTREEDIR 75734 . 76450)) (
76500 106701 (GIT-GET-DIFFERENT-FILES 76510 . 82335) (GIT-BRANCHES-COMPARE-DIRECTORIES 82337 . 88318)
(GIT-WORKING-COMPARE-DIRECTORIES 88320 . 93146) (GIT-COMPARE-WORKTREE 93148 . 97126) (GITCDOBJBUTTONFN
97128 . 101618) (GIT-CD-LABELFN 101620 . 102702) (GIT-CD-MENUFN 102704 . 104911) (
GIT-WORKING-COMPARE-FILES 104913 . 105533) (GIT-BRANCHES-COMPARE-FILES 105535 . 106699)) (106771
115288 (CDGITDIR 106781 . 107341) (GIT-COMMAND 107343 . 108901) (GITORIGIN 108903 . 109600) (
GIT-INITIALS 109602 . 109906) (GIT-COMMAND-TO-FILE 109908 . 113397) (PROCESS-COMMAND 113399 . 114012)
(GIT-RESULT-TO-LINES 114014 . 114621) (STRIPLOCAL 114623 . 115286)))))
(FILEMAP (NIL (4005 19253 (GIT-CLONEP 4015 . 5278) (GIT-INIT 5280 . 5707) (GIT-MAKE-PROJECT 5709 .
14094) (GIT-GET-PROJECT 14096 . 16021) (GIT-PROJECT-PATH 16023 . 17067) (FIND-ANCESTOR-DIRECTORY 17069
. 17418) (GIT-FIND-CLONE 17420 . 18501) (GIT-MAINBRANCH 18503 . 18898) (GIT-MAINBRANCH? 18900 . 19251
)) (25634 28422 (ALLSUBDIRS 25644 . 26930) (MEDLEYSUBDIRS 26932 . 27625) (GITSUBDIRS 27627 . 28420)) (
28423 33213 (TOGIT 28433 . 29839) (FROMGIT 29841 . 30822) (GIT-DELETE-FILE 30824 . 31670) (
MYMEDLEY-DELETE-FILES 31672 . 33211)) (33214 35746 (MYMEDLEYSUBDIR 33224 . 33680) (GITSUBDIR 33682 .
34125) (STRIPDIR 34127 . 34498) (STRIPHOST 34500 . 34740) (STRIPNAME 34742 . 35495) (STRIPWHERE 35497
. 35744)) (35747 37649 (GFILE4MFILE 35757 . 36120) (MFILE4GFILE 36122 . 36691) (GIT-REPO-FILENAME
36693 . 37647)) (37698 47520 (GIT-COMMIT 37708 . 38534) (GIT-PUSH 38536 . 39180) (GIT-PULL 39182 .
39794) (GIT-APPROVAL 39796 . 40145) (GIT-GET-FILE 40147 . 42112) (GIT-FILE-EXISTS? 42114 . 42388) (
GIT-REMOTE-UPDATE 42390 . 43114) (GIT-REMOTE-ADD 43116 . 43423) (GIT-FILE-DATE 43425 . 44356) (
GIT-FILE-HISTORY 44358 . 46292) (GIT-PRINT-FILE-HISTORY 46294 . 47344) (GIT-FETCH 47346 . 47518)) (
47550 58282 (GIT-BRANCH-DIFF 47560 . 54344) (GIT-COMMIT-DIFFS 54346 . 54899) (GIT-BRANCH-RELATIONS
54901 . 58280)) (58327 69129 (GIT-BRANCH-NUM 58337 . 58910) (GIT-CHECKOUT 58912 . 59971) (
GIT-WHICH-BRANCH 59973 . 60271) (GIT-MAKE-BRANCH 60273 . 62486) (GIT-BRANCHES 62488 . 64461) (
GIT-BRANCH-EXISTS? 64463 . 65167) (GIT-PICK-BRANCH 65169 . 65497) (GIT-PRC-MENU 65499 . 67247) (
GIT-PULL-REQUESTS 67249 . 68515) (GIT-SHORT-BRANCH-NAME 68517 . 68808) (GIT-LONG-NAME 68810 . 69127))
(69159 72494 (GIT-MY-CURRENT-BRANCH 69169 . 69539) (GIT-MY-BRANCHP 69541 . 70046) (GIT-MY-NEXT-BRANCH
70048 . 70542) (GIT-MY-BRANCHES 70544 . 72492)) (72540 76492 (GIT-ADD-WORKTREE 72550 . 74034) (
GIT-REMOVE-WORKTREE 74036 . 74966) (GIT-LIST-WORKTREES 74968 . 75772) (WORKTREEDIR 75774 . 76490)) (
76540 106741 (GIT-GET-DIFFERENT-FILES 76550 . 82375) (GIT-BRANCHES-COMPARE-DIRECTORIES 82377 . 88358)
(GIT-WORKING-COMPARE-DIRECTORIES 88360 . 93186) (GIT-COMPARE-WORKTREE 93188 . 97166) (GITCDOBJBUTTONFN
97168 . 101658) (GIT-CD-LABELFN 101660 . 102742) (GIT-CD-MENUFN 102744 . 104951) (
GIT-WORKING-COMPARE-FILES 104953 . 105573) (GIT-BRANCHES-COMPARE-FILES 105575 . 106739)) (106811
115328 (CDGITDIR 106821 . 107381) (GIT-COMMAND 107383 . 108941) (GITORIGIN 108943 . 109640) (
GIT-INITIALS 109642 . 109946) (GIT-COMMAND-TO-FILE 109948 . 113437) (PROCESS-COMMAND 113439 . 114052)
(GIT-RESULT-TO-LINES 114054 . 114661) (STRIPLOCAL 114663 . 115326)))))
STOP

BIN
lispusers/GITFNS.LCOM
View File

Binary file not shown.