github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-02-26 17:13:17 +00:00
Code Issues Projects Releases Wiki Activity

Fix to Issue#1022 "Error during greet" (#1027)

Browse Source 
* Fix to Issue#1022 Error during greet

* More fix to Issue#1022.  Turns out need to reset MEDLEYDIR for AFTERMAKESYS as well as at greet time.  Discovered during loadup-online.sh with no greet file.

* Removing AFTERMAKESYS event action from (MEDLEY-INIT-VARS).  Cleaning up a bit the GREET event action in (MEDLEY-INIT-VARS).  Remove issue with MEDLEY-INIT-VARS being called after the user greet file in the AFTERMAKESYS case.
This commit is contained in:
Frank Halasz
2022-11-26 11:46:41 -08:00
committed by GitHub
parent d9c144d966
commit 9d09033cc4
4 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
greetfiles/MEDLEYDIR-INIT
View File

@@ -1,10 +1,11 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 9-Mar-2022 11:50:44" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;2 4690
(FILECREATED "22-Nov-2022 20:59:24" {DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;6 2860
:CHANGES-TO (VARS MEDLEYDIR-INITCOMS)
:PREVIOUS-DATE "28-Feb-2022 21:13:20" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;1)
:PREVIOUS-DATE "22-Nov-2022 20:42:43"
{DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;5)
(PRETTYCOMPRINT MEDLEYDIR-INITCOMS)
@@ -13,7 +14,7 @@
([P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
"")
"/sources/MEDLEYDIR.LCOM"))
(MEDLEY-INIT-VARS)
(MEDLEY-INIT-VARS 'GREET)
(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
(FILES BACKGROUND-YIELD)
(VARS
@@ -38,7 +39,7 @@
"")
"/sources/MEDLEYDIR.LCOM"))
(MEDLEY-INIT-VARS)
(MEDLEY-INIT-VARS 'GREET)
(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
@@ -81,44 +82,7 @@
:PACKAGE "INTERLISP"])
)
(ADDTOVAR FONTDEFS
[LARGER (FONTCHANGEFLG . ALL)
(FILELINELENGTH . 102)
(FONTPROFILE (DEFAULTFONT 1 (GACHA 12)
(GACHA 10)
(TERMINAL 10)
(POSTSCRIPT (TERMINAL 10)))
(ITALICFONT 1 (HELVETICA 12 MIR)
(GACHA 10 MIR)
(MODERN 10 MIR)
(POSTSCRIPT (MODERN 10 MIR)))
(BOLDFONT 2 (HELVETICA 12 BRR)
(HELVETICA 10 BRR)
(MODERN 10 BRR)
(POSTSCRIPT (HELVETICA 12 BRR)))
(LITTLEFONT 3 (HELVETICA 10)
(HELVETICA 6 MIR)
(MODERN 10 MIR)
(POSTSCRIPT (MODERN 10 MIR)))
(TINYFONT 6 (GACHA 10)
(GACHA 6)
(TERMINAL 6)
(POSTSCRIPT (TERMINAL 6)))
(BIGFONT 4 (HELVETICA 12 BRR)
NIL
(MODERN 12 BRR)
(POSTSCRIPT (MODERN 12 BRR)))
(MENUFONT 5 (HELVETICA 12)
(HELVETICA 12)
(POSTSCRIPT (HELVETICA 12)))
(COMMENTFONT 6 (HELVETICA 12)
(HELVETICA 10)
(MODERN 10)
(POSTSCRIPT (MODERN 10)))
(TEXTFONT 7 (TIMESROMAN 12)
NIL
(CLASSIC 12)
(POSTSCRIPT (CLASSIC 12])
(ADDTOVAR FONTDEFS )
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1949 2774 (INTERLISPMODE 1959 . 2772)))))
(FILEMAP (NIL (1986 2811 (INTERLISPMODE 1996 . 2809)))))
STOP

BIN
greetfiles/MEDLEYDIR-INIT.LCOM
View File

Binary file not shown.

26
sources/MEDLEYDIR
View File

@@ -1,10 +1,11 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "25-Oct-2022 12:19:14" {DSK}<home>larry>ilisp>medley>sources>MEDLEYDIR.;11 9572
(FILECREATED "22-Nov-2022 20:50:20" {DSK}<home>frank>il>medley>wmedley>sources>MEDLEYDIR.;10 10271
:CHANGES-TO (FNS MEDLEY-INIT-VARS)
:PREVIOUS-DATE "24-Oct-2022 22:35:01" {DSK}<home>larry>ilisp>medley>sources>MEDLEYDIR.;10)
:PREVIOUS-DATE "21-Nov-2022 17:31:30" {DSK}<home>frank>il>medley>wmedley>sources>MEDLEYDIR.;9
)
(PRETTYCOMPRINT MEDLEYDIRCOMS)
@@ -33,7 +34,11 @@
(DEFINEQ
(MEDLEY-INIT-VARS
[LAMBDA (EVENT) (* ; "Edited 25-Oct-2022 12:18 by lmm")
[LAMBDA (EVENT) (* ; "Edited 22-Nov-2022 20:38 by FGH")
(* ; "Edited 21-Nov-2022 17:31 by FGH")
(* ; "Edited 21-Nov-2022 15:39 by frank")
(* ; "Edited 21-Nov-2022 14:33 by FGH")
(* ; "Edited 25-Oct-2022 12:18 by lmm")
(* ; "Edited 18-Oct-2022 18:08 by lmm")
(* ;; "Called on events including before & after loadup")
@@ -52,9 +57,8 @@
[SETQ \SAVE.MEDLEYDIR (CONS MEDLEYDIR (FOR X IN MEDLEY-INIT-VARS
COLLECT (CONS (CAR X)
(GETTOPVAL (CAR X])
((AFTERSYSOUT AFTERMAKESYS AFTERLOGOUT AFTERSAVEVM RESTART INIT NIL)
(* ;;
((AFTERSYSOUT AFTERLOGOUT AFTERSAVEVM RESTART INIT NIL)
(* ;;
 "Any old values, restore them, substituting the new MEDLEYDIR")
(PROG (OLDMD NEWMD SAME TMP)
@@ -81,6 +85,12 @@
ELSE (MEDLEYSUBSTDIR OLDMD NEWMD (CDR TMP]
(SETQ \SAVE.MEDLEYDIR T) (* ; "only use once")
))
((GREET)
(SETQ MEDLEYDIR)
(SETQ MEDLEYDIR (MEDLEYDIR))
[for X in MEDLEY-INIT-VARS do (/SETTOPVAL (CAR X)
(EVAL (CADR X]
(SETQ \SAVE.MEDLEYDIR T))
(PROGN (* ; "no changes")
NIL])
@@ -191,6 +201,6 @@
(ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (1459 7197 (MEDLEY-INIT-VARS 1469 . 4258) (MEDLEYDIR 4260 . 6215) (MEDLEYSUBSTDIR 6217
. 7195)))))
(FILEMAP (NIL (1469 7896 (MEDLEY-INIT-VARS 1479 . 4957) (MEDLEYDIR 4959 . 6914) (MEDLEYSUBSTDIR 6916
. 7894)))))
STOP

BIN
sources/MEDLEYDIR.LCOM
View File

Binary file not shown.