1
0
mirror of synced 2026-04-20 09:56:12 +00:00

Compare commits

...

7 Commits

Author SHA1 Message Date
Frank Halasz
14fbff63cf Merge pull request #1419 from Interlisp/fgh_LDEKBDTYPE
Set LDEKBDTYPE to X in run-medley - if not already set.  Works around issue with loading VIRTUALKEYBOARDS
2023-11-17 23:20:26 -08:00
Frank Halasz
bec32f475a Merge pull request #1420 from Interlisp/fgh_ShellBrowserGit
Fix minor issue in ShellBrowser - when using the git path was missing the web--browse subcommand.
2023-11-17 23:19:31 -08:00
rmkaplan
6e845d747f ADIR fix UNPACKFILENAME.STRING address #1416 (#1421)
The early . was seen as starting an extension, the ! then was seen as starting a version.  When the other marks caused those hypotheses to be revised, the extension's end wasn't being revised
2023-11-14 07:11:58 -08:00
Frank Halasz
459aeef74a Merge branch 'master' into fgh_LDEKBDTYPE 2023-11-13 13:07:55 -08:00
Frank Halasz
19ceac6515 Fix the git case in ShellBrowser. Was missing the web--browse argument. 2023-11-13 13:04:16 -08:00
Frank Halasz
914604a6eb Set LDEKBDTYPE to X in run-medley - if not already set. Fixes issue with loading VIRTUALKEYBOARDS 2023-11-13 12:42:34 -08:00
Larry Masinter
05f3ad19eb Update CLHS reference to use Interlisp CHLS instead; use UNIXUTILS ShellBrowser (#1412) 2023-11-13 12:12:56 -08:00
7 changed files with 53 additions and 41 deletions

View File

@@ -1,11 +1,11 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "10-Nov-2023 21:59:02" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;24 16469
(FILECREATED "13-Nov-2023 12:57:10" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;26 16663
:CHANGES-TO (FNS ShellOpen SLASHIT)
:CHANGES-TO (FNS ShellBrowser)
:PREVIOUS-DATE "10-Nov-2023 19:34:44"
{DSK}<home>frank>il>medley>gmedley>docs>primer>UNIXUTILS.;10)
:PREVIOUS-DATE "11-Nov-2023 09:06:39" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;25
)
(PRETTYCOMPRINT UNIXUTILSCOMS)
@@ -18,6 +18,8 @@
(INITVARS (ShellBrowser)
(ShellOpener))
(FUNCTIONS ShellCommand ShellWhich)
(ADDVARS (MEDLEY-INIT-VARS (ShellBrowser)
(ShellOpener)))
(FNS ShellBrowser ShellBrowse ShellOpener ShellOpen PROCESS-COMMAND SLASHIT UNIX-FILE-NAME)
(PROPS (UNIXUTILS FILETYPE))))
(DECLARE%: EVAL@COMPILE DONTCOPY
@@ -53,6 +55,9 @@
NIL)
(T (SETFILEPTR S 0)
(RSTRING S])
(ADDTOVAR MEDLEY-INIT-VARS (ShellBrowser)
(ShellOpener))
(DEFINEQ
(ShellBrowser
@@ -75,7 +80,7 @@
then
(* ;; " Systems with git installed")
CMDPATH
(CONCAT CMDPATH " web--browse")
elseif (SETQ CMDPATH (ShellWhich "lynx"))
then
(* ;; " Systems with lynx installed")
@@ -313,7 +318,7 @@
(PUTPROPS UNIXUTILS FILETYPE CL:COMPILE-FILE)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1065 1438 (ShellCommand 1065 . 1438)) (1440 1837 (ShellWhich 1440 . 1837)) (1838 16391
(ShellBrowser 1848 . 3596) (ShellBrowse 3598 . 4283) (ShellOpener 4285 . 5973) (ShellOpen 5975 . 11130
) (PROCESS-COMMAND 11132 . 11745) (SLASHIT 11747 . 13789) (UNIX-FILE-NAME 13791 . 16389)))))
(FILEMAP (NIL (1146 1519 (ShellCommand 1146 . 1519)) (1521 1918 (ShellWhich 1521 . 1918)) (2008 16585
(ShellBrowser 2018 . 3790) (ShellBrowse 3792 . 4477) (ShellOpener 4479 . 6167) (ShellOpen 6169 . 11324
) (PROCESS-COMMAND 11326 . 11939) (SLASHIT 11941 . 13983) (UNIX-FILE-NAME 13985 . 16583)))))
STOP

Binary file not shown.

View File

@@ -1,12 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "16-Jun-2023 14:38:33" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;11 87625
(FILECREATED "11-Nov-2023 09:31:38" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;2 87772
:EDIT-BY "lmm"
:CHANGES-TO (VARS HELPSYSCOMS)
(FNS CLHS.LOOKUP)
:PREVIOUS-DATE "13-Jan-2023 10:46:39" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;10)
:PREVIOUS-DATE "16-Jun-2023 14:38:33" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;1)
(PRETTYCOMPRINT HELPSYSCOMS)
@@ -28,7 +29,7 @@
(COMS (FNS CLHS.INDEX CLHS.LOOKUP CLHS.OPENER REPO.LOOKUP)
(VARS CLHS.INDEX)
[INITVARS (CLHS.ROOT.URL "http://clhs.lisp.se/")
[INITVARS (CLHS.ROOT.URL "https://interlisp.org/clhs/")
(CLHS.INDEX)
(CLHS.OPENER)
(HELPSYS.REPO.TYPES '(FNS FUNCTIONS VARS VARIABLES]
@@ -94,8 +95,7 @@
DINFO HASH)
)
(DEFCOMMAND "man" (ENTRY)
"Lookup ENTRY in the IRM."
(DEFCOMMAND "man" (ENTRY) "Lookup ENTRY in the IRM."
(GENERIC.MAN.LOOKUP ENTRY))
(DEFINEQ
@@ -266,9 +266,10 @@
else (LIST (SUBSTRING LINE POSLINK (CL:1- POSENDLINK])
(CLHS.LOOKUP
[LAMBDA (ENTRY PHASES) (* ; "Edited 12-Oct-2022 18:32 by FGH")
[LAMBDA (ENTRY PHASES) (* ; "Edited 11-Nov-2023 09:11 by lmm")
(* ; "Edited 12-Oct-2022 18:32 by FGH")
(* ; "Edited 24-Aug-2022 17:08 by larry")
(LET [(OPENER (CLHS.OPENER))
(LET [(OPENER (ShellBrowser))
(URL NIL)
POS
(ENTRY (L-CASE (MKSTRING ENTRY]
@@ -1329,7 +1330,7 @@
("yes-or-no-p" "f_y_or_n.htm" "yes-or-no-p")
("zerop" "f_zerop.htm" "zerop")))
(RPAQ? CLHS.ROOT.URL "http://clhs.lisp.se/")
(RPAQ? CLHS.ROOT.URL "https://interlisp.org/clhs/")
(RPAQ? CLHS.INDEX )
@@ -1700,14 +1701,14 @@
(PUTPROPS HELPSYS FILETYPE :FAKE-COMPILE-FILE)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (4609 10342 (HELPSYS 4619 . 6460) (IRM.LOOKUP 6462 . 8100) (GENERIC.MAN.LOOKUP 8102 .
9771) (IRM.SMART.LOOKUP 9773 . 9929) (IRM.RESET 9931 . 10340)) (10599 17546 (CLHS.INDEX 10609 . 13307)
(CLHS.LOOKUP 13309 . 15209) (CLHS.OPENER 15211 . 16534) (REPO.LOOKUP 16536 . 17544)) (70634 72152 (
IRM.GET.DINFOGRAPH 70644 . 71519) (IRM.DISPLAY.REF 71521 . 72150)) (72154 72516 (IRM.LOAD-GRAPH 72154
. 72516)) (72841 78345 (IRM.DISPLAY.CREF 72851 . 74565) (IRM.CREF.BOX 74567 . 75394) (IRM.PUT.CREF
75396 . 75621) (IRM.GET.CREF 75623 . 75994) (IRM.CREF.BUTTONEVENTFN 75996 . 78343)) (78900 87206 (
\IRM.GET.REF 78910 . 80241) (\IRM.SMART.REF 80243 . 82170) (\IRM.CHOOSE.REF 82172 . 83423) (
\IRM.WILD.REF 83425 . 84680) (\IRM.WILDCARD 84682 . 85048) (\IRM.WILD.MATCH 85050 . 86280) (
\IRM.GET.HASHFILE 86282 . 86745) (\IRM.GET.KEYWORDS 86747 . 87204)) (87343 87499 (\IRM.AROUND-EXIT
87343 . 87499)))))
(FILEMAP (NIL (4643 10376 (HELPSYS 4653 . 6494) (IRM.LOOKUP 6496 . 8134) (GENERIC.MAN.LOOKUP 8136 .
9805) (IRM.SMART.LOOKUP 9807 . 9963) (IRM.RESET 9965 . 10374)) (10633 17686 (CLHS.INDEX 10643 . 13341)
(CLHS.LOOKUP 13343 . 15349) (CLHS.OPENER 15351 . 16674) (REPO.LOOKUP 16676 . 17684)) (70781 72299 (
IRM.GET.DINFOGRAPH 70791 . 71666) (IRM.DISPLAY.REF 71668 . 72297)) (72301 72663 (IRM.LOAD-GRAPH 72301
. 72663)) (72988 78492 (IRM.DISPLAY.CREF 72998 . 74712) (IRM.CREF.BOX 74714 . 75541) (IRM.PUT.CREF
75543 . 75768) (IRM.GET.CREF 75770 . 76141) (IRM.CREF.BUTTONEVENTFN 76143 . 78490)) (79047 87353 (
\IRM.GET.REF 79057 . 80388) (\IRM.SMART.REF 80390 . 82317) (\IRM.CHOOSE.REF 82319 . 83570) (
\IRM.WILD.REF 83572 . 84827) (\IRM.WILDCARD 84829 . 85195) (\IRM.WILD.MATCH 85197 . 86427) (
\IRM.GET.HASHFILE 86429 . 86892) (\IRM.GET.KEYWORDS 86894 . 87351)) (87490 87646 (\IRM.AROUND-EXIT
87490 . 87646)))))
STOP

Binary file not shown.

View File

@@ -163,6 +163,10 @@ if [ -z "$geometry" ] ; then
screensize="-sc 1440x900"
fi
if [ -z "${LDEKBDTYPE}" ]; then
export LDEKBDTYPE="X"
fi
if ! command -v "$prog" > /dev/null 2>&1; then
# if lde is already on path, don't reset it
# otherwise check for MAIKODIR

View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "14-Sep-2023 23:20:17" {WMEDLEY}<sources>ADIR.;30 67297
(FILECREATED "13-Nov-2023 20:28:57" {WMEDLEY}<sources>ADIR.;31 67473
:EDIT-BY rmk
:CHANGES-TO (FNS \COPYSYS)
:CHANGES-TO (FNS UNPACKFILENAME.STRING)
:PREVIOUS-DATE "14-Sep-2023 22:56:19" {WMEDLEY}<sources>ADIR.;29)
:PREVIOUS-DATE "14-Sep-2023 23:20:17" {WMEDLEY}<sources>ADIR.;30)
(PRETTYCOMPRINT ADIRCOMS)
@@ -317,7 +317,8 @@
(DEFINEQ
(UNPACKFILENAME.STRING
[LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG) (* ; "Edited 28-Apr-2022 11:40 by rmk")
[LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG) (* ; "Edited 13-Nov-2023 20:28 by rmk")
(* ; "Edited 28-Apr-2022 11:40 by rmk")
(* ; "Edited 24-Apr-2022 14:11 by rmk")
(* ;; "")
@@ -514,7 +515,8 @@
(CL:UNLESS (EQ NAMESTART $$OFFSET) (* ;
 "Allow . in first NAME position : .git")
(SETQ NAMEEND (SUB1 $$OFFSET))
(SETQ EXTENSIONSTART $$OFFSET)))
(SETQ EXTENSIONSTART $$OFFSET)
(SETQ EXTENSIONEND NIL)))
(; (CL:WHEN VERSIONSTART (* ; "What about x;1;2")
(* ;; "This gives old behavior is NAME=x, VERSION=1;2")
@@ -1250,14 +1252,14 @@
(ADDTOVAR LAMA PACKFILENAME.STRING PACKFILENAME)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (3106 15763 (DELFILE 3116 . 3277) (FULLNAME 3279 . 3646) (INFILE 3648 . 3907) (INFILEP
3909 . 4044) (IOFILE 4046 . 4297) (OPENFILE 4299 . 4602) (OPENSTREAM 4604 . 8944) (OUTFILE 8946 . 9208
) (OUTFILEP 9210 . 9346) (RENAMEFILE 9348 . 9654) (SIMPLE.FINDFILE 9656 . 10066) (VMEMSIZE 10068 .
10235) (\COPYSYS 10237 . 14482) (\FLUSHVM 14484 . 15556) (\LOGOUT0 15558 . 15761)) (16221 38126 (
UNPACKFILENAME.STRING 16231 . 35505) (\UPF.DIRECTORY 35507 . 38124)) (39654 42326 (UNPACKFILENAME
39664 . 39850) (LASTCHPOS 39852 . 40546) (FILENAMEFIELD 40548 . 41033) (FILENAMEFIELD.STRING 41035 .
41614) (PACKFILENAME 41616 . 41959) (PACKFILENAME.STRING 41961 . 42324)) (56796 57709 (
FILEDIRCASEARRAY 56806 . 57707)) (57876 65056 (LOGOUT 57886 . 58803) (MAKESYS 58805 . 60434) (SYSOUT
60436 . 61988) (SAVEVM 61990 . 62790) (HERALD 62792 . 62952) (INTERPRET.REM.CM 62954 . 64679) (
\USEREVENT 64681 . 65054)) (65238 66965 (USERNAME 65248 . 66204) (SETUSERNAME 66206 . 66963)))))
(FILEMAP (NIL (3119 15776 (DELFILE 3129 . 3290) (FULLNAME 3292 . 3659) (INFILE 3661 . 3920) (INFILEP
3922 . 4057) (IOFILE 4059 . 4310) (OPENFILE 4312 . 4615) (OPENSTREAM 4617 . 8957) (OUTFILE 8959 . 9221
) (OUTFILEP 9223 . 9359) (RENAMEFILE 9361 . 9667) (SIMPLE.FINDFILE 9669 . 10079) (VMEMSIZE 10081 .
10248) (\COPYSYS 10250 . 14495) (\FLUSHVM 14497 . 15569) (\LOGOUT0 15571 . 15774)) (16234 38302 (
UNPACKFILENAME.STRING 16244 . 35681) (\UPF.DIRECTORY 35683 . 38300)) (39830 42502 (UNPACKFILENAME
39840 . 40026) (LASTCHPOS 40028 . 40722) (FILENAMEFIELD 40724 . 41209) (FILENAMEFIELD.STRING 41211 .
41790) (PACKFILENAME 41792 . 42135) (PACKFILENAME.STRING 42137 . 42500)) (56972 57885 (
FILEDIRCASEARRAY 56982 . 57883)) (58052 65232 (LOGOUT 58062 . 58979) (MAKESYS 58981 . 60610) (SYSOUT
60612 . 62164) (SAVEVM 62166 . 62966) (HERALD 62968 . 63128) (INTERPRET.REM.CM 63130 . 64855) (
\USEREVENT 64857 . 65230)) (65414 67141 (USERNAME 65424 . 66380) (SETUSERNAME 66382 . 67139)))))
STOP

Binary file not shown.