diff --git a/sources/LLKEY b/sources/LLKEY
index 930c038a..3c772daf 100644
--- a/sources/LLKEY
+++ b/sources/LLKEY
@@ -1,10 +1,8 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "24-Aug-2021 16:54:52" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;6 199507 
+(FILECREATED "27-Aug-2021 16:18:18" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;9 199890 
 
-      changes to%:  (FNS KEYACTION)
-
-      previous date%: "24-Aug-2021 16:43:30" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;5)
+      previous date%: "24-Aug-2021 16:54:52" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;7)
 
 
 (* ; "
@@ -1582,29 +1580,29 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 
 
 (RPAQQ \ORIGKEYACTIONS
-       ((0 (53 "%%" NOLOCKSHIFT))
-        (1 (52 "$" NOLOCKSHIFT))
-        (2 (54 "~" NOLOCKSHIFT))
+       ((0 ("5" "%%" NOLOCKSHIFT))
+        (1 ("4" "$" NOLOCKSHIFT))
+        (2 ("6" "~" NOLOCKSHIFT))
         (3 ("e" "E" LOCKSHIFT))
-        (4 (55 "&" NOLOCKSHIFT))
+        (4 ("7" "&" NOLOCKSHIFT))
         (5 ("d" "D" LOCKSHIFT))
         (6 ("u" "U" LOCKSHIFT))
         (7 ("v" "V" LOCKSHIFT))
-        (8 (48 ")" NOLOCKSHIFT))
+        (8 ("0" ")" NOLOCKSHIFT))
         (9 ("k" "K" LOCKSHIFT))
         (10 ("-" "-" NOLOCKSHIFT))
         (11 ("p" "P" LOCKSHIFT))
         (12 ("/" "?" NOLOCKSHIFT))
         (13 ("\" "|" NOLOCKSHIFT))
-        (14 (10 96 NOLOCKSHIFT))
-        (15 (8 8 NOLOCKSHIFT))
-        (16 (51 "#" NOLOCKSHIFT))
-        (17 (50 "@" NOLOCKSHIFT))
+        (14 ("LF" "`" NOLOCKSHIFT))
+        (15 ("Bs" "Bs" NOLOCKSHIFT))
+        (16 ("3" "#" NOLOCKSHIFT))
+        (17 ("2" "@" NOLOCKSHIFT))
         (18 ("w" "W" LOCKSHIFT))
         (19 ("q" "Q" LOCKSHIFT))
         (20 ("s" "S" LOCKSHIFT))
         (21 ("a" "A" LOCKSHIFT))
-        (22 (57 "(" NOLOCKSHIFT))
+        (22 ("9" "(" NOLOCKSHIFT))
         (23 ("i" "I" LOCKSHIFT))
         (24 ("x" "X" LOCKSHIFT))
         (25 ("o" "O" LOCKSHIFT))
@@ -1612,11 +1610,11 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
         (27 ("," "<" NOLOCKSHIFT))
         (28 ("'" "%"" NOLOCKSHIFT))
         (29 ("]" "}" NOLOCKSHIFT))
-        (30 (194 194 NOLOCKSHIFT))
-        (31 (193 193 NOLOCKSHIFT))
-        (32 (49 "!" NOLOCKSHIFT))
-        (33 (27 27 NOLOCKSHIFT))
-        (34 (9 9 NOLOCKSHIFT))
+        (30 ("#B" "#B" NOLOCKSHIFT))
+        (31 ("#A" "#A" NOLOCKSHIFT))
+        (32 ("1" "!" NOLOCKSHIFT))
+        (33 ("Esc" "Esc" NOLOCKSHIFT))
+        (34 ("Tab" "Tab" NOLOCKSHIFT))
         (35 ("f" "F" LOCKSHIFT))
         (36 CTRLDOWN . CTRLUP)
         (37 ("c" "C" LOCKSHIFT))
@@ -1626,24 +1624,24 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
         (41 1SHIFTDOWN . 1SHIFTUP)
         (42 ("." ">" NOLOCKSHIFT))
         (43 (";" ":" NOLOCKSHIFT))
-        (44 (13 13 NOLOCKSHIFT))
+        (44 ("CR" "CR" NOLOCKSHIFT))
         (45 ("_" "^" NOLOCKSHIFT))
-        (46 (127 535 NOLOCKSHIFT))
+        (46 ("Del" "Function,^W" NOLOCKSHIFT))
         (47 ("(" "[" NOLOCKSHIFT))
         (48 ("r" "R" LOCKSHIFT))
         (49 ("t" "T" LOCKSHIFT))
         (50 ("g" "G" LOCKSHIFT))
         (51 ("y" "Y" LOCKSHIFT))
         (52 ("h" "H" LOCKSHIFT))
-        (53 (56 "*" NOLOCKSHIFT))
+        (53 ("8" "*" NOLOCKSHIFT))
         (54 ("n" "N" LOCKSHIFT))
         (55 ("m" "M" LOCKSHIFT))
         (56 LOCKDOWN . LOCKUP)
-        (57 (32 32 NOLOCKSHIFT))
+        (57 ("Sp" "Sp" NOLOCKSHIFT))
         (58 ("[" "{" NOLOCKSHIFT))
         (59 ("=" "+" NOLOCKSHIFT))
         (60 2SHIFTDOWN . 2SHIFTUP)
-        (61 (195 195 NOLOCKSHIFT))
+        (61 ("#C" "#C" NOLOCKSHIFT))
         (63 (")" "]" NOLOCKSHIFT))
         (77 EVENT . EVENT)
         (78 EVENT . EVENT)
@@ -1792,50 +1790,50 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
         (105 ("\" "|" NOLOCKSHIFT))))
 
 (RPAQQ \MAIKOKEYACTIONST4
-       ((61 ("^E" "^G" NOLOCKSHIFT))
-        (91 ("2,10" "2,50" NOLOCKSHIFT))
-        (92 ("2,1" "2,41" NOLOCKSHIFT))
-        (30 ("2,1" "2,41" NOLOCKSHIFT))
-        (109 ("2,25" "2,65" NOLOCKSHIFT))
-        (63 ("2,4" "2,44" NOLOCKSHIFT))
+       ((61 ("^E" "Bell" NOLOCKSHIFT))
+        (91 ("Function,Bs" "Function,(" NOLOCKSHIFT))
+        (92 ("Function,^A" "Function,!" NOLOCKSHIFT))
+        (30 ("Function,^A" "Function,!" NOLOCKSHIFT))
+        (109 ("Function,^U" "Function,65" NOLOCKSHIFT))
+        (63 ("Function,^D" "Function,$" NOLOCKSHIFT))
         (14 METADOWN . METAUP)
-        (93 ("2,24" "2,64" NOLOCKSHIFT))
+        (93 ("Function,^T" "Function,64" NOLOCKSHIFT))
         (62)
-        (111 ("1,o" "1,O" NOLOCKSHIFT))
+        (111 ("Meta,o" "Meta,O" NOLOCKSHIFT))
         (89)
-        (90 ("2,3" "2,43" NOLOCKSHIFT))
-        (73 ("2,11" "2,11" NOLOCKSHIFT))
-        (74 ("2,12" "2,12" NOLOCKSHIFT))
+        (90 ("Function,^C" "Function,#" NOLOCKSHIFT))
+        (73 ("Function,Tab" "Function,Tab" NOLOCKSHIFT))
+        (74 ("Function,LF" "Function,LF" NOLOCKSHIFT))
         (75 ("^B" "^B" NOLOCKSHIFT))
-        (81 ("2,14" 55 NOLOCKSHIFT))
-        (82 (173 56 NOLOCKSHIFT))
-        (83 ("2,15" 57 NOLOCKSHIFT))
-        (84 (172 52 NOLOCKSHIFT))
-        (85 ("2,16" 53 NOLOCKSHIFT))
-        (87 (174 54 NOLOCKSHIFT))
-        (94 ("2,17" 49 NOLOCKSHIFT))
-        (69 (175 50 NOLOCKSHIFT))
-        (70 ("2,20" 51 NOLOCKSHIFT))
-        (98 ("2,21" 48 NOLOCKSHIFT))
-        (76 ("2,13" "2,13" NOLOCKSHIFT))
-        (110 ("2,53" "2,53" NOLOCKSHIFT))
+        (81 ("Function,FF" "7" NOLOCKSHIFT))
+        (82 ("#-" "8" NOLOCKSHIFT))
+        (83 ("Function,CR" "9" NOLOCKSHIFT))
+        (84 ("#," "4" NOLOCKSHIFT))
+        (85 ("Function,^N" "5" NOLOCKSHIFT))
+        (87 ("#." "6" NOLOCKSHIFT))
+        (94 ("Function,^O" "1" NOLOCKSHIFT))
+        (69 ("#/" "2" NOLOCKSHIFT))
+        (70 ("Function,^P" "3" NOLOCKSHIFT))
+        (98 ("Function,^Q" "0" NOLOCKSHIFT))
+        (76 ("Function,^K" "Function,^K" NOLOCKSHIFT))
+        (110 ("Function,+" "Function,+" NOLOCKSHIFT))
         (72 LOCKTOGGLE)
-        (97 ("2,101" "2,141" NOLOCKSHIFT))
-        (99 ("2,102" "2,142" NOLOCKSHIFT))
-        (100 ("2,103" "2,143" NOLOCKSHIFT))
-        (67 ("2,104" "2,144" NOLOCKSHIFT))
-        (68 ("2,105" "2,145" NOLOCKSHIFT))
-        (101 ("2,106" "2,146" NOLOCKSHIFT))
-        (66 ("2,107" "2,147" NOLOCKSHIFT))
-        (104 ("2,110" "2,150" NOLOCKSHIFT))
-        (80 ("2,111" "2,151" NOLOCKSHIFT))
-        (106 ("2,113" "2,153" NOLOCKSHIFT))
-        (107 ("2,114" "2,154" NOLOCKSHIFT))
-        (108 ("2,115" "2,155" NOLOCKSHIFT))
+        (97 ("Function,A" "Function,a" NOLOCKSHIFT))
+        (99 ("Function,B" "Function,b" NOLOCKSHIFT))
+        (100 ("Function,C" "Function,c" NOLOCKSHIFT))
+        (67 ("Function,D" "Function,d" NOLOCKSHIFT))
+        (68 ("Function,E" "Function,e" NOLOCKSHIFT))
+        (101 ("Function,F" "Function,f" NOLOCKSHIFT))
+        (66 ("Function,G" "Function,g" NOLOCKSHIFT))
+        (104 ("Function,H" "Function,h" NOLOCKSHIFT))
+        (80 ("Function,I" "Function,i" NOLOCKSHIFT))
+        (106 ("Function,K" "Function,k" NOLOCKSHIFT))
+        (107 ("Function,L" "Function,l" NOLOCKSHIFT))
+        (108 ("Function,M" "Function,m" NOLOCKSHIFT))
         (13 ("^W" "^U" NOLOCKSHIFT))
-        (33 ("ESC" "ESC" NOLOCKSHIFT))
+        (33 ("Esc" "Esc" NOLOCKSHIFT))
         (64 IGNORE . IGNORE)
-        (65 (27 27 NOLOCKSHIFT))
+        (65 ("Esc" "Esc" NOLOCKSHIFT))
         (95 IGNORE . IGNORE)
         (96 IGNORE . IGNORE)
         (102 IGNORE . IGNORE)
@@ -1845,8 +1843,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
         (56 LOCKTOGGLE . IGNORE)
         (45 ("`" "~" NOLOCKSHIFT))
         (31 METADOWN . METAUP)
-        (71 (10 10 NOLOCKSHIFT))
-        (47 ("2,22" "2,62" NOLOCKSHIFT))
+        (71 ("LF" "LF" NOLOCKSHIFT))
+        (47 ("Function,^R" "Function,62" NOLOCKSHIFT))
         (86 IGNORE . IGNORE)
         (88 IGNORE . IGNORE)
         (105 ("\" "|" NOLOCKSHIFT))))
@@ -3924,33 +3922,33 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (PUTPROPS LLKEY COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
 1992 1999 1920 2000 2018 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (14733 22049 (BKSYSCHARCODE 14743 . 15092) (\CLEARSYSBUF 15094 . 15652) (\GETKEY 15654
- . 16829) (\NSYSBUFCHARS 16831 . 17573) (\SAVESYSBUF 17575 . 19184) (\SYSBUFP 19186 . 19490) (
-\GETSYSBUF 19492 . 19672) (\PUTSYSBUF 19674 . 20887) (\PEEKSYSBUF 20889 . 22047)) (23346 60180 (
-\KEYBOARDINIT 23356 . 25076) (\KEYBOARDEVENTFN 25078 . 29778) (\ALLOCLOCKED 29780 . 30370) (
-\SETIOPOINTERS 30372 . 34908) (\KEYBOARDOFF 34910 . 35324) (\KEYBOARDON 35326 . 35705) (\KEYHANDLER 
-35707 . 35838) (\KEYHANDLER1 35840 . 43286) (\RESETKEYBOARD 43288 . 44936) (\DOMOUSECHORDING 44938 . 
-48758) (\DOTRANSITIONS 48760 . 49437) (\DECODETRANSITION 49439 . 56128) (MOUSECHORDWAIT 56130 . 56794)
- (\TRACKCURSOR 56796 . 60178)) (95464 117014 (KEYACTION 95474 . 96327) (KEYACTIONTABLE 96329 . 97511) 
-(KEYBOARDTYPE 97513 . 98615) (RESETKEYACTION 98617 . 100376) (\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS 
-100378 . 102280) (\KEYACTION1 102282 . 112398) (KEYDOWNP 112400 . 112735) (KEYNUMBERP 112737 . 112935)
- (\KEYNAMETONUMBER 112937 . 113631) (\KEYNUMBERTONAME 113633 . 113823) (MODIFY.KEYACTIONS 113825 . 
-114686) (METASHIFT 114688 . 115632) (SHIFTDOWNP 115634 . 117012)) (117077 117373 (
-SETUP.OFFICE.KEYBOARD 117087 . 117371)) (120076 121788 (\INIT.KEYBOARD.STREAM 120086 . 121786)) (
-122053 138430 (\DOBUFFEREDTRANSITIONS 122063 . 137493) (\TIMER.INTERRUPTFRAME 137495 . 138220) (
-\PERIODIC.INTERRUPTFRAME 138222 . 138428)) (138684 142761 (\HARDCURSORUP 138694 . 140576) (
-\HARDCURSORPOSITION 140578 . 142614) (\HARDCURSORDOWN 142616 . 142759)) (142762 166822 (CURSOR.INIT 
-142772 . 146472) (\CURSORDESTINATION 146474 . 148792) (\SOFTCURSORUP 148794 . 154048) (
-\SOFTCURSORUPCURRENT 154050 . 161086) (\SOFTCURSORPOSITION 161088 . 161853) (\SOFTCURSORDOWN 161855 . 
-162563) (CURSORPROP 162565 . 162907) (GETCURSORPROP 162909 . 163097) (PUTCURSORPROP 163099 . 164254) (
-\CURSORBITSPERPIXEL 164256 . 166372) (\CURSORIMAGEPROPNAME 166374 . 166598) (\CURSORMASKPROPNAME 
-166600 . 166820)) (166823 184773 (CURSORCREATE 166833 . 169508) (CURSOR 169510 . 171322) (
-\CURSOR-VALID-P 171324 . 172411) (\CURSORUP 172413 . 174128) (\CURSORPOSITION 174130 . 176658) (
-\CURSORDOWN 176660 . 176893) (ADJUSTCURSORPOSITION 176895 . 177473) (CURSORPOSITION 177475 . 179017) (
-CURSORSCREEN 179019 . 179675) (CURSOREXIT 179677 . 181068) (FLIPCURSOR 181070 . 182196) (FLIPCURSORBAR
- 182198 . 183178) (LASTMOUSEX 183180 . 183434) (LASTMOUSEY 183436 . 183690) (CREATEPOSITION 183692 . 
-183898) (POSITIONP 183900 . 184184) (CURSORHOTSPOT 184186 . 184771)) (186011 187559 (GETMOUSESTATE 
-186021 . 186680) (\EVENTKEYS 186682 . 187557)) (193986 194782 (MACHINETYPE 193996 . 194396) (
-SETMAINTPANEL 194398 . 194780)) (194812 195951 (BEEPON 194822 . 195475) (BEEPOFF 195477 . 195949)) (
-196402 196665 (WITHOUT-INTERRUPTS 196412 . 196663)))))
+  (FILEMAP (NIL (14696 22012 (BKSYSCHARCODE 14706 . 15055) (\CLEARSYSBUF 15057 . 15615) (\GETKEY 15617
+ . 16792) (\NSYSBUFCHARS 16794 . 17536) (\SAVESYSBUF 17538 . 19147) (\SYSBUFP 19149 . 19453) (
+\GETSYSBUF 19455 . 19635) (\PUTSYSBUF 19637 . 20850) (\PEEKSYSBUF 20852 . 22010)) (23309 60143 (
+\KEYBOARDINIT 23319 . 25039) (\KEYBOARDEVENTFN 25041 . 29741) (\ALLOCLOCKED 29743 . 30333) (
+\SETIOPOINTERS 30335 . 34871) (\KEYBOARDOFF 34873 . 35287) (\KEYBOARDON 35289 . 35668) (\KEYHANDLER 
+35670 . 35801) (\KEYHANDLER1 35803 . 43249) (\RESETKEYBOARD 43251 . 44899) (\DOMOUSECHORDING 44901 . 
+48721) (\DOTRANSITIONS 48723 . 49400) (\DECODETRANSITION 49402 . 56091) (MOUSECHORDWAIT 56093 . 56757)
+ (\TRACKCURSOR 56759 . 60141)) (95847 117397 (KEYACTION 95857 . 96710) (KEYACTIONTABLE 96712 . 97894) 
+(KEYBOARDTYPE 97896 . 98998) (RESETKEYACTION 99000 . 100759) (\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS 
+100761 . 102663) (\KEYACTION1 102665 . 112781) (KEYDOWNP 112783 . 113118) (KEYNUMBERP 113120 . 113318)
+ (\KEYNAMETONUMBER 113320 . 114014) (\KEYNUMBERTONAME 114016 . 114206) (MODIFY.KEYACTIONS 114208 . 
+115069) (METASHIFT 115071 . 116015) (SHIFTDOWNP 116017 . 117395)) (117460 117756 (
+SETUP.OFFICE.KEYBOARD 117470 . 117754)) (120459 122171 (\INIT.KEYBOARD.STREAM 120469 . 122169)) (
+122436 138813 (\DOBUFFEREDTRANSITIONS 122446 . 137876) (\TIMER.INTERRUPTFRAME 137878 . 138603) (
+\PERIODIC.INTERRUPTFRAME 138605 . 138811)) (139067 143144 (\HARDCURSORUP 139077 . 140959) (
+\HARDCURSORPOSITION 140961 . 142997) (\HARDCURSORDOWN 142999 . 143142)) (143145 167205 (CURSOR.INIT 
+143155 . 146855) (\CURSORDESTINATION 146857 . 149175) (\SOFTCURSORUP 149177 . 154431) (
+\SOFTCURSORUPCURRENT 154433 . 161469) (\SOFTCURSORPOSITION 161471 . 162236) (\SOFTCURSORDOWN 162238 . 
+162946) (CURSORPROP 162948 . 163290) (GETCURSORPROP 163292 . 163480) (PUTCURSORPROP 163482 . 164637) (
+\CURSORBITSPERPIXEL 164639 . 166755) (\CURSORIMAGEPROPNAME 166757 . 166981) (\CURSORMASKPROPNAME 
+166983 . 167203)) (167206 185156 (CURSORCREATE 167216 . 169891) (CURSOR 169893 . 171705) (
+\CURSOR-VALID-P 171707 . 172794) (\CURSORUP 172796 . 174511) (\CURSORPOSITION 174513 . 177041) (
+\CURSORDOWN 177043 . 177276) (ADJUSTCURSORPOSITION 177278 . 177856) (CURSORPOSITION 177858 . 179400) (
+CURSORSCREEN 179402 . 180058) (CURSOREXIT 180060 . 181451) (FLIPCURSOR 181453 . 182579) (FLIPCURSORBAR
+ 182581 . 183561) (LASTMOUSEX 183563 . 183817) (LASTMOUSEY 183819 . 184073) (CREATEPOSITION 184075 . 
+184281) (POSITIONP 184283 . 184567) (CURSORHOTSPOT 184569 . 185154)) (186394 187942 (GETMOUSESTATE 
+186404 . 187063) (\EVENTKEYS 187065 . 187940)) (194369 195165 (MACHINETYPE 194379 . 194779) (
+SETMAINTPANEL 194781 . 195163)) (195195 196334 (BEEPON 195205 . 195858) (BEEPOFF 195860 . 196332)) (
+196785 197048 (WITHOUT-INTERRUPTS 196795 . 197046)))))
 STOP
diff --git a/sources/LLKEY.LCOM b/sources/LLKEY.LCOM
index be7ba76b..550e93c5 100644
Binary files a/sources/LLKEY.LCOM and b/sources/LLKEY.LCOM differ
diff --git a/sources/TTYIN b/sources/TTYIN
index 045144e3..ded331e8 100644
--- a/sources/TTYIN
+++ b/sources/TTYIN
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "16-Aug-2021 23:40:36" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;12 329478 
+(FILECREATED "27-Aug-2021 17:02:43" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;19 329093 
 
-      changes to%:  (FNS \TTYIN.RPEOF)
+      changes to%:  (VARS TTYINCOMS)
 
-      previous date%: "14-Aug-2021 10:55:39" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;10)
+      previous date%: "27-Aug-2021 16:49:59" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>TTYIN.;18)
 
 
 (* ; "
@@ -80,8 +80,10 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                     "This is so that you can (MOVD 'TTYINPROMPTFORWORD 'PROMPTFORWORD) and not die")
                      (P (MOVD? 'PROMPTFORWORD 'NON-TTYIN-PROMPTFORWORD NIL T]
         (DECLARE%: DOEVAL@COMPILE DONTCOPY (COMS * TTCOMPILETIME))
-        (INITVARS (DORADO.RESTORE.BUF.CODES '(194))
-               (TTYIN.RESTORE.BUF.CODES '(516 530))
+        
+        (* ;; " The DORADO branch is deprecated (DORADO.RESTORE.BUF.CODES (CHARCODE (%"#B%")))")
+
+        (INITVARS (TTYIN.RESTORE.BUF.CODES (CHARCODE ("Function,^D" "Function,^R")))
                (TTYINBUFFER)
                (?ACTIVATEFLG T)
                (EDITPREFIXCHAR)
@@ -375,7 +377,7 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
           (SETQ TTYINBUFFER \TTYINSTATE])
 
 (TTYIN1
-  [LAMBDA NIL                                           (* ; "Edited 13-Jun-2021 09:55 by rmk:")
+  [LAMBDA NIL                                           (* ; "Edited 27-Aug-2021 16:27 by rmk:")
 
 (* ;;; "The main moby subfn of TTYIN.  Is errorset protected in caller")
 
@@ -782,14 +784,17 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                         ((CHARCODE ^W)                       (* ; "^W delete last word")
                              (TTDELETEWORD))
                         (COND
-                           ([MEMB CHAR (OR \RESTOREBUFCODES (SETQ \RESTOREBUFCODES
-                                                             (APPEND (AND (EQ (MACHINETYPE)
-                                                                              'DORADO)
-                                                                          DORADO.RESTORE.BUF.CODES)
-                                                                    TTYIN.RESTORE.BUF.CODES]
+                           ((MEMB CHAR (OR \RESTOREBUFCODES (SETQ \RESTOREBUFCODES 
+                                                             TTYIN.RESTORE.BUF.CODES)))
 
                             (* ;; "One of the characters we interpret as %"restore last buffer%".  Recomputed after exit in case we change machine.  The dorado code is a perfectly good charset 0 code, so don't usually want to usurp it.")
-
+                                                             (* We aren't supporting Dorado, 
+                                                           whose original code maps on to the 
+                                                           acute accent (SETQ \RESTOREBUFCODES
+                                                           (APPEND (AND (EQ (MACHINETYPE)
+                                                           (QUOTE DORADO)) 
+                                                           DORADO.RESTORE.BUF.CODES) 
+                                                           TTYIN.RESTORE.BUF.CODES)))
                             (RESTOREBUF))
                            [(> CHAR 32)                      (* ; "not a control char")
                             (ADDCHAR (COND
@@ -3109,9 +3114,9 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                   (T (BACKWARD.DELETE.TO TAIL])
 
 (TTECHO.TO.FILE
-  [LAMBDA (FILE DRIBBLING)                               (* ; "Edited 24-May-91 11:11 by jds")
+  [LAMBDA (FILE DRIBBLING)                              (* ; "Edited 27-Aug-2021 16:45 by rmk:")
 
-(* ;;; "Echos input to FILE.  If DRIBBLING is true, the prompts are also echoed")
+(* ;;; "Echos input to FILE.  If DRIBBLING is true, the prompts are also echoed")
 
     (for (STREAM _ (GETSTREAM FILE 'OUTPUT))
            (LINE _ \FIRSTLINE)
@@ -3119,7 +3124,7 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
            X CH END do (COND
                               ([AND DRIBBLING (SETQ X (COND
                                                          (FIRSTIME 
-                                                             (* ; "Print the first prompt")
+                                                             (* ; "Print the first prompt")
                                                                 (SETQ FIRSTIME NIL)
                                                                 (AND \PROMPT1
                                                                      (NOT (EQMEMB 'NOPROMPT OPTIONS))
@@ -3130,20 +3135,20 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                           (SETQ X (fetch (LINE START) of LINE))
                           (until (EQ X END) do [COND
                                                           ([NOT (COMPLEXCHARP (SETQ CH (CAR X]
-                                                           (BOUTCCODE STREAM CH))
+                                                           (\OUTCHAR STREAM CH))
                                                           [(EQ (fetch (COMPLEXCHAR CPXREALCHAR)
                                                                   of CH)
                                                                (CHARCODE SPACE))
 
-                                               (* ;; "pseudo-tab kludge: instead of printing the 'real' character, ignore it and print only its padding spaces")
+                                               (* ;; "pseudo-tab kludge: instead of printing the 'real' character, ignore it and print only its padding spaces")
 
                                                            (FRPTQ (fetch (COMPLEXCHAR CPXNCHARS)
                                                                      of CH)
-                                                                  (BOUTCCODE STREAM (CHARCODE SPACE]
-                                                          (T (BOUTCCODE STREAM (fetch
-                                                                                (COMPLEXCHAR 
-                                                                                       CPXREALCHAR)
-                                                                                  of CH]
+                                                                  (\OUTCHAR STREAM (CHARCODE SPACE]
+                                                          (T (\OUTCHAR STREAM (fetch (COMPLEXCHAR
+                                                                                          CPXREALCHAR
+                                                                                          )
+                                                                                 of CH]
                                                       (SETQ X (TTNEXTCHAR X)))
                           (SETQ LINE (fetch (LINE NEXTLINE) of LINE))
                           (COND
@@ -3151,12 +3156,12 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                                                       END))
                                    (NOT \PROMPTFORWORD))
 
-                              (* ;; "Don't terpri on overflow line, since user didn't;  except always do it to dribblefile, since that's what's on the screen.  Promptforword-style input doesn't have terminating cr.")
+                              (* ;; "Don't terpri on overflow line, since user didn't;  except always do it to dribblefile, since that's what's on the screen.  Promptforword-style input doesn't have terminating cr.")
 
                               (TERPRI FILE)))
        repeatwhile (AND LINE (OR (EQ END \ENDBUFFER)
-                                     (PROGN                  (* ; 
-               "Avoid echoing the terminating empty line, except when it is an empty overflow line")
+                                     (PROGN                  (* ; 
+               "Avoid echoing the terminating empty line, except when it is an empty overflow line")
                                             (NEQ (fetch (LINE START) of LINE)
                                                  \ENDBUFFER])
 
@@ -3243,38 +3248,34 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
           (RETURN LINE])
 
 (TTLOADBUF
-  [LAMBDA (BUF)                                          (* ; "Edited  8-Feb-88 12:54 by bvm:")
-          
-          (* ;; "BUF is a list, a la READBUF, which is loaded into our character buffer, using DCHCON to convert the s-expressions therein to char codes.  If we are READING, then uses PRIN2 pnames, i.e.  includes escape chars and such stuff.  Alternatively, BUF may be a string, in which case its contents are also loaded into the buffer, a la BKSYSBUF, and the setting of \READING is irrelevant")
+  [LAMBDA (BUF)                                         (* ; "Edited 27-Aug-2021 16:47 by rmk:")
+
+    (* ;; "BUF is a list, a la READBUF, which is loaded into our character buffer, using DCHCON to convert the s-expressions therein to char codes.  If we are READING, then uses PRIN2 pnames, i.e.  includes escape chars and such stuff.  Alternatively, BUF may be a string, in which case its contents are also loaded into the buffer, a la BKSYSBUF, and the setting of \READING is irrelevant")
 
     (COND
        [(EQ (CAR (LISTP BUF))
             HISTSTR1)                                        (* ; 
                                          "read from file.  BUF is (<histstr1> (file start  . end))")
-
         (SETQ BUF (CADR BUF))
         (SETFILEPTR (CAR BUF)
                (CADR BUF))
         (bind CHAR NEXTCH (STREAM _ (GETSTREAM (CAR BUF)
                                                'INPUT))
                (END _ (CDDR BUF)) while (< (GETFILEPTR STREAM)
-                                             END)
+                                               END)
            do                                            (* ; "Read another character.  Unfortunately, we have to go by file pointer to determine end, since stream could have ns chars in it")
-
                  (COND
-                    ((NEQ (SETQ CHAR (BINCCODE STREAM))
+                    ((NEQ (SETQ CHAR (\INCCODE.EOLC STREAM))
                           (CHARCODE CR))
                      (ADDNAKEDCHAR CHAR T))
                     (T                                       (* ; "eat up lf after the cr")
-
                        (COND
                           ([OR (>= (GETFILEPTR STREAM)
                                    END)
-                               (PROGN (SETQ NEXTCH (BINCCODE STREAM))
+                               (PROGN (SETQ NEXTCH (\INCCODE.EOLC STREAM))
                                       (AND (EQ NEXTCH (CHARCODE LF))
                                            (>= (GETFILEPTR STREAM)
                                                END]          (* ; "Ignore final CR")
-
                            (RETURN)))
                        (ADDNAKEDCHAR CHAR)
                        (COND
@@ -3285,25 +3286,21 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                    ((AND (LISTP BUF)
                          (SETQ START (FMEMB HISTSTR0 BUF)))  (* ; 
                                          "HISTSTR0 is a marker used by lispx to denote end of line")
-
                     (FRPLACD (NLEFT BUF 1 START]
                 (SETQ START (DCHCON BUF (CDR \ENDBUFFER)
                                    (AND (LISTP BUF)
                                         \READING)
                                    RDTBL))                   (* ; 
               "Use our own buffer as a scratchlist for DCHCON as long as it's lying around anyway.")
-
                 [COND
                    ((LISTP BUF)                              (* ; 
                                                 "Remove the surrounding parens from the outer list")
-
                     (SETQ END (NLEFT (SETQ START (CDR START))
                                      1]
-          
-          (* ;; "now detach the result from our buffer to avoid conflict of interest.  If DCHCON found our scratchlist inadequate, START will not be a tail of \ENDBUFFER so the NLEFT below comes out NIL, which is also fine")
+
+           (* ;; "now detach the result from our buffer to avoid conflict of interest.  If DCHCON found our scratchlist inadequate, START will not be a tail of \ENDBUFFER so the NLEFT below comes out NIL, which is also fine")
 
                 (FRPLACD (NLEFT \ENDBUFFER 1 START))         (* ; "Now unread the CHCON list.")
-
                 (READFROMBUF START END])
 
 (TTNEXTLINE
@@ -3838,16 +3835,14 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
              (SETQ BUF (CDR BUF)) finally (RETURN BUF])
 
 (TTYIN.READ
-  [LAMBDA (FINALCHAR DONTREAD STREAM)                    (* ; "Edited 16-Jan-88 17:58 by bvm:")
+  [LAMBDA (FINALCHAR DONTREAD STREAM)                   (* ; "Edited 27-Aug-2021 16:43 by rmk:")
 
 (* ;;; "Process buffer for reading.  FINALCHAR is what prompted us to terminate the call to TTYIN and is not in the buffer.  If DONTREAD is true, then STREAM is the line buffer and we are acting as \FILLBUFFER -- otherwise, STREAM is our own scratch stream, with an eof fn that returns right paren;  we read the buffer and return a list of expressions")
 
     (LET (LASTC BUTLASTC)
          (while (NEQ \BUFFER \ENDBUFFER) do (SETQ BUTLASTC LASTC) 
                                                              (* ; "Fill the buffer")
-
-                                                   (BOUTCCODE STREAM (SETQ LASTC (FIRSTCHAR \BUFFER))
-                                                          )
+                                                   (\OUTCHAR STREAM (SETQ LASTC (FIRSTCHAR \BUFFER)))
                                                    (SETQ \BUFFER (TTNEXTCHAR \BUFFER)))
          (COND
             ((AND DONTREAD (SELCHARQ FINALCHAR
@@ -3859,45 +3854,37 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                                                           ESCAPE.RC))
                                                              (* ; 
                      "If it ended in a quoted right paren, then it's just like any other character")
-
                                                   T)
                                                  ((EQ (\SYNCODE \RDTBLSA (CHARCODE %]))
                                                       RIGHTBRACKET.RC)
-          
-          (* ;; "Line ended in paren.  Change to right bracket so READLINE doesn't get confused.  Only do this if ] really is right bracket!")
 
-                                                  (\SETFILEPTR STREAM (IDIFFERENCE (\GETFILEPTR
-                                                                                    STREAM)
-                                                                             (STREAMBYTESPERCHAR
-                                                                              STREAM)))
-                                                  (BOUTCCODE STREAM (CHARCODE %]))
+                                     (* ;; "Line ended in paren.  Change to right bracket so READLINE doesn't get confused.  Only do this if ] really is right bracket!")
+
+                                                  (\BACKCCODE STREAM)
+                                                  (\OUTCHAR STREAM (CHARCODE %]))
                                                   NIL)))
                                          T))
                                 ((%) %]) 
                                      NIL)
                                 T))                          (* ; 
    "Print FINALCHAR unless terminator was EOL and line already ended in a closing paren or bracket")
-
-             (BOUTCCODE STREAM FINALCHAR)))
+             (\OUTCHAR STREAM FINALCHAR)))
          (\SETEOFPTR STREAM (\GETFILEPTR STREAM))
          (\SETFILEPTR STREAM 0)
          (COND
             (DONTREAD                                        (* ; 
                                    "STREAM = \LINEBUF.OFD and caller will take care of reading buf")
-
                    (AND (EQ STREAM \LINEBUF.OFD)
                         (replace (LINEBUFFER LINEBUFSTATE) of STREAM with READING.LBS))
                    T)
             (T                                               (* ; 
                                                            "Read from buffer until it's empty")
-
                (PROG1 (bind TERM while [AND (SKIPSEPRS STREAM)
                                                     (SETQ TERM (NLSETQ (READ STREAM]
                          collect (CAR TERM))
-                      (\SETFILEPTR STREAM 0)                 (* ; 
+                   (\SETFILEPTR STREAM 0)                    (* ; 
                                       "Now clear the stream so nobody reads extra garbage after us")
-
-                      (\SETEOFPTR STREAM 0])
+                   (\SETEOFPTR STREAM 0))])
 )
 
 
@@ -5336,7 +5323,7 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
        (T (GIVE.TTY.PROCESS WINDOW])
 
 (TTYINREADP
-  [LAMBDA (FLG)                                          (* ; "Edited 14-Apr-87 00:25 by bvm:")
+  [LAMBDA (FLG)                                         (* ; "Edited 27-Aug-2021 16:49 by rmk:")
 
 (* ;;; "Intended to replace LISPXREADP.  Does the right thing when READBUF has just a <cr> in it")
 
@@ -5345,7 +5332,7 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
                          HISTSTR0)
                     FLG))
        ((NOT (LINEBUFFER-EOFP \LINEBUF.OFD))
-        (OR FLG (NEQ (PEEKBINCCODE \LINEBUF.OFD)
+        (OR FLG (NEQ (\PEEKCCODE \LINEBUF.OFD)
                      (CHARCODE EOL])
 
 (TTYINREAD
@@ -5800,8 +5787,8 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
 (RPAQQ TTYINMACROS (TYPEAHEAD? AT.END.OF.BUF AT.END.OF.LINE AT.START.OF.BUF AT.START.OF.LINE 
                               BEFOREBUF BREAK.OR.SEPRP DISPLAYTERMP EMPTY.BUFFER EMPTY.LINE EQPOS 
                               NEQPOS INPART ON.FIRST.LINE ON.LAST.LINE METACHARP NONMETACHARBITS 
-                              METACHAR COMPLEXCHARP STREAMBYTESPERCHAR SPACEP TTBOUT TTNEXTCHAR 
-                              BOUTCCODE PEEKBINCCODE BINCCODE WORDSEPRP FCHARWIDTH FIRSTCHAR))
+                              METACHAR COMPLEXCHARP SPACEP TTBOUT TTNEXTCHAR WORDSEPRP FCHARWIDTH 
+                              FIRSTCHAR))
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS TYPEAHEAD? MACRO (NIL (\SYSBUFP)))
@@ -5865,12 +5852,6 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
 
 (PUTPROPS COMPLEXCHARP MACRO (= . LISTP))
 
-(PUTPROPS STREAMBYTESPERCHAR MACRO ((STREAM)
-                                            (COND
-                                               ((\RUNCODED STREAM)
-                                                1)
-                                               (T 2))))
-
 (PUTPROPS SPACEP MACRO [(CHAR)
                                 (FMEMB CHAR (CHARCODE (SPACE TAB CR])
 
@@ -5886,13 +5867,6 @@ Copyright (c) 1982-1988, 1990-1991, 2021 by Venue & Xerox Corporation.
 
 (PUTPROPS TTNEXTCHAR MACRO (= . CDR))
 
-(PUTPROPS BOUTCCODE MACRO (OPENLAMBDA (STREAM CHAR)
-                                    (PRINTCCODE CHAR STREAM)))
-
-(PUTPROPS PEEKBINCCODE MACRO (= . PEEKCCODE))
-
-(PUTPROPS BINCCODE MACRO (= . READCCODE))
-
 (PUTPROPS WORDSEPRP DMACRO [OPENLAMBDA (X)
                                      (OR (EQ (\SYNCODE \PRIMTERMSA X)
                                              WORDSEPR.TC)
@@ -6008,9 +5982,12 @@ DONTEVAL@LOAD EVAL@COMPILE
 )
 )
 
-(RPAQ? DORADO.RESTORE.BUF.CODES '(194))
 
-(RPAQ? TTYIN.RESTORE.BUF.CODES '(516 530))
+
+(* ;; " The DORADO branch is deprecated (DORADO.RESTORE.BUF.CODES (CHARCODE (%"#B%")))")
+
+
+(RPAQ? TTYIN.RESTORE.BUF.CODES (CHARCODE ("Function,^D" "Function,^R")))
 
 (RPAQ? TTYINBUFFER )
 
@@ -6099,62 +6076,62 @@ DONTEVAL@LOAD EVAL@COMPILE
 (PUTPROPS TTYIN COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991 
 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (7706 207384 (TTYIN 7716 . 20949) (TTYIN.SETUP 20951 . 24027) (TTYIN.CLEANUP 24029 . 
-24857) (TTYIN1 24859 . 51377) (TTYIN1RESTART 51379 . 52643) (TTYIN.FINISH 52645 . 62062) (
-TTYIN.BALANCE 62064 . 63190) (ADDCHAR 63192 . 65378) (TTMAKECOMPLEXCHAR 65380 . 65854) (ADDNAKEDCHAR 
-65856 . 67366) (TTADDTAB 67368 . 68303) (ADJUSTLINE 68305 . 82216) (ADJUSTLINE.AND.RESTORE 82218 . 
-82656) (AT.END.OF.SCREEN 82658 . 82946) (AT.END.OF.TEXT 82948 . 83403) (AUTOCR? 83405 . 83879) (
-BACKSKREAD 83881 . 88466) (BACKWARD.DELETE.TO 88468 . 88650) (BREAKLINE 88652 . 90919) (BUFTAILP 90921
- . 91239) (CHECK.MARGIN 91241 . 91864) (CLEAR.LINE? 91866 . 92159) (CURRENT.WORD 92161 . 94561) (
-DELETE.TO.END 94563 . 95282) (DELETELINE 95284 . 98241) (DELETETO 98243 . 100065) (DELETETO1 100067 . 
-101410) (DO.EDIT.COMMAND 101412 . 118731) (DO.EDIT.PP 118733 . 121395) (TTDOTABS 121397 . 122767) (
-EDITCOLUMN 122769 . 123225) (EDITNUMBERP 123227 . 123458) (END.DELETE.MODE 123460 . 123977) (ENDREAD? 
-123979 . 126414) (FIND.LINE 126416 . 127952) (FIND.LINE.BREAK 127954 . 128624) (FIND.MATCHING.QUOTE 
-128626 . 129471) (FIND.NEXT.WORD 129473 . 130852) (FIND.NON.SPACE 130854 . 131127) (FIND.START.OF.WORD
- 131129 . 131492) (FORWARD.DELETE.TO 131494 . 133716) (GO.TO.ADDRESSING 133718 . 134674) (
-GO.TO.FREELINE 134676 . 135257) (GO.TO.RELATIVE 135259 . 136039) (INIT.CURSOR 136041 . 136938) (
-INSERT.NODE 136940 . 137462) (INSERTLINE 137464 . 138968) (KILL.LINES 138970 . 139508) (KILLSEGMENT 
-139510 . 140633) (L-CASECODE 140635 . 140796) (MOVE.BACK.TO 140798 . 141027) (MOVE.FORWARD.TO 141029
- . 141450) (MOVE.TO.LINE 141452 . 142367) (MOVE.TO.NEXT.LINE 142369 . 142639) (MOVE.TO.START.OF.WORD 
-142641 . 143405) (MOVE.TO.WHEREVER 143407 . 143630) (NTH.COLUMN.OF 143632 . 143963) (
-NTH.RELATIVE.COLUMN.OF 143965 . 145265) (OVERFLOW? 145267 . 146215) (OVERFLOWLINE? 146217 . 146543) (
-PREVLINE 146545 . 147725) (PREVWORD 147727 . 149868) (PROPERTAILP 149870 . 150077) (READFROMBUF 150079
- . 152668) (RENUMBER.LINES 152670 . 153063) (RESTORE.CURSOR 153065 . 153219) (RESTOREBUF 153221 . 
-155405) (RETYPE.BUFFER 155407 . 157670) (SAVE.CURSOR 157672 . 157844) (SCANBACK 157846 . 159204) (
-SCANFORWARD 159206 . 160074) (SCRATCHCONS 160076 . 160678) (SEGMENT.LENGTH 160680 . 161216) (
-SEGMENT.BIT.LENGTH 161218 . 161825) (SETLASTC 161827 . 162124) (SETTAIL? 162126 . 162942) (
-SHOW.MATCHING.PAREN 162944 . 165444) (SKIP/ZAP 165446 . 167925) (START.NEW.LINE 167927 . 168259) (
-START.OF.PARAGRAPH? 168261 . 168642) (TTADJUSTWORD 168644 . 169818) (TTBIN 169820 . 171026) (
-TTBITWIDTH 171028 . 171177) (TTCRLF 171179 . 171386) (TTCRLF.ACCOUNT 171388 . 172028) (TTDELETECHAR 
-172030 . 173174) (TTDELETELINE 173176 . 175124) (TTDELETEWORD 175126 . 175794) (TTECHO.TO.FILE 175796
- . 179344) (TTGIVEHELP 179346 . 180611) (TTGIVEHELP1 180613 . 181195) (TTGIVEHELP2 181197 . 181892) (
-TTLASTLINE 181894 . 182262) (TTLOADBUF 182264 . 185778) (TTNEXTLINE 185780 . 186100) (TTNEXTNODE 
-186102 . 186341) (TTNLEFT 186343 . 187570) (TTNTH 187572 . 188031) (TTNTHLINE 188033 . 188565) (
-TTPRIN1 188567 . 192380) (TTPRINSPACE 192382 . 192775) (TTPRIN1COMMENT 192777 . 193101) (TTPRIN2 
-193103 . 195422) (TTPROMPTCHAR 195424 . 196320) (TTRUBOUT 196322 . 197285) (TTUNREADBUF 197287 . 
-197696) (TTWAITFORINPUT 197698 . 201906) (TTYINSTRING 201908 . 202867) (TYPE.BUFFER 202869 . 204621) (
-U-CASECODE 204623 . 204782) (U/L-CASE 204784 . 207382)) (207539 217252 (TTRATOM 207549 . 207993) (
-TTREADLIST 207995 . 208362) (TTSKIPSEPR 208364 . 208738) (TTSKREAD 208740 . 213380) (TTYIN.READ 213382
- . 217250)) (217299 237343 (FIND.MATCHING.WORD 217309 . 217837) (TTCOMPLETEWORD 217839 . 232267) (
-WORD.MATCHES.BUFFER 232269 . 233829) (TTYIN.SHOW.?ALTERNATIVES 233831 . 237341)) (237377 255687 (
-DO?CMD 237387 . 243289) (TTYIN.PRINTARGS 243291 . 254149) (TTYIN.READ?=ARGS 254151 . 254932) (
-DO?CMD.ERRORHANDLER 254934 . 255685)) (255721 263794 (BEEP 255731 . 255906) (BITBLT.DELETE 255908 . 
-256555) (BITBLT.ERASE 256557 . 256742) (BITBLT.INSERT 256744 . 257055) (DO.CRLF 257057 . 257376) (
-DO.DELETE.LINES 257378 . 258422) (DO.INSERT.LINE 258424 . 260358) (DO.LF 260360 . 260526) (
-ERASE.TO.END.OF.LINE 260528 . 260853) (ERASE.TO.END.OF.PAGE 260855 . 261460) (INSERT.TEXT 261462 . 
-261966) (TTDELSECTION 261968 . 262266) (TTADJUSTWIDTH 262268 . 263132) (TTINSERTSECTION 263134 . 
-263473) (TTSETCURSOR 263475 . 263792)) (263829 268806 (TTYINBUFFERDEVICE 263839 . 265155) (
-TTYINBUFFERSTREAM 265157 . 265919) (TTYINBUFFERBIN 265921 . 266457) (TTYINBUFFERPEEK 266459 . 266937) 
-(TTYINBUFFERREADP 266939 . 267194) (TTYINBUFFEREOFP 267196 . 267448) (TTYINBUFFERBACKPTR 267450 . 
-268002) (TTYINWORDRDTBL 268004 . 268804)) (268967 294524 (DO.MOUSE 268977 . 271734) (
-DO.SHIFTED.SELECTION 271736 . 282175) (COPY.SEGMENT 282177 . 282381) (DELETE.LONG.SEGMENT 282383 . 
-282742) (DELETE.LONG.SEGMENT1 282744 . 285220) (INVERT.LONG.SEGMENT 285222 . 286251) (INVERT.SEGMENT 
-286253 . 287768) (BRACKET.CURRENT.WORD 287770 . 289304) (TTBEFOREPOS 289306 . 290036) (TTNEXTPOS 
-290038 . 290746) (TTRACKMOUSE 290748 . 294522)) (294668 299924 (SETREADFN 294678 . 295156) (
-TTYINENTRYFN 295158 . 295583) (TTYINREADP 295585 . 296050) (TTYINREAD 296052 . 297446) (TTYINFIX 
-297448 . 298647) (CHARMACRO? 298649 . 299216) (TTYINMETA 299218 . 299346) (TTYIN.LASTINPUT 299348 . 
-299922)) (299925 308194 (TTYINEDIT 299935 . 302052) (SIMPLETEXTEDIT 302054 . 305098) (
-SET.TTYINEDIT.WINDOW 305100 . 306251) (TTYIN.PPTOFILE 306253 . 308192)) (308252 308429 (
-MAKE-TTSCRATCHFILE 308262 . 308427)) (308576 309709 (TTYIN.SCRATCHFILE 308586 . 309032) (\TTYIN.RPEOF 
-309034 . 309707)) (309921 313554 (TTYINPROMPTFORWORD 309931 . 313552)))))
+  (FILEMAP (NIL (7796 207831 (TTYIN 7806 . 21039) (TTYIN.SETUP 21041 . 24117) (TTYIN.CLEANUP 24119 . 
+24947) (TTYIN1 24949 . 51833) (TTYIN1RESTART 51835 . 53099) (TTYIN.FINISH 53101 . 62518) (
+TTYIN.BALANCE 62520 . 63646) (ADDCHAR 63648 . 65834) (TTMAKECOMPLEXCHAR 65836 . 66310) (ADDNAKEDCHAR 
+66312 . 67822) (TTADDTAB 67824 . 68759) (ADJUSTLINE 68761 . 82672) (ADJUSTLINE.AND.RESTORE 82674 . 
+83112) (AT.END.OF.SCREEN 83114 . 83402) (AT.END.OF.TEXT 83404 . 83859) (AUTOCR? 83861 . 84335) (
+BACKSKREAD 84337 . 88922) (BACKWARD.DELETE.TO 88924 . 89106) (BREAKLINE 89108 . 91375) (BUFTAILP 91377
+ . 91695) (CHECK.MARGIN 91697 . 92320) (CLEAR.LINE? 92322 . 92615) (CURRENT.WORD 92617 . 95017) (
+DELETE.TO.END 95019 . 95738) (DELETELINE 95740 . 98697) (DELETETO 98699 . 100521) (DELETETO1 100523 . 
+101866) (DO.EDIT.COMMAND 101868 . 119187) (DO.EDIT.PP 119189 . 121851) (TTDOTABS 121853 . 123223) (
+EDITCOLUMN 123225 . 123681) (EDITNUMBERP 123683 . 123914) (END.DELETE.MODE 123916 . 124433) (ENDREAD? 
+124435 . 126870) (FIND.LINE 126872 . 128408) (FIND.LINE.BREAK 128410 . 129080) (FIND.MATCHING.QUOTE 
+129082 . 129927) (FIND.NEXT.WORD 129929 . 131308) (FIND.NON.SPACE 131310 . 131583) (FIND.START.OF.WORD
+ 131585 . 131948) (FORWARD.DELETE.TO 131950 . 134172) (GO.TO.ADDRESSING 134174 . 135130) (
+GO.TO.FREELINE 135132 . 135713) (GO.TO.RELATIVE 135715 . 136495) (INIT.CURSOR 136497 . 137394) (
+INSERT.NODE 137396 . 137918) (INSERTLINE 137920 . 139424) (KILL.LINES 139426 . 139964) (KILLSEGMENT 
+139966 . 141089) (L-CASECODE 141091 . 141252) (MOVE.BACK.TO 141254 . 141483) (MOVE.FORWARD.TO 141485
+ . 141906) (MOVE.TO.LINE 141908 . 142823) (MOVE.TO.NEXT.LINE 142825 . 143095) (MOVE.TO.START.OF.WORD 
+143097 . 143861) (MOVE.TO.WHEREVER 143863 . 144086) (NTH.COLUMN.OF 144088 . 144419) (
+NTH.RELATIVE.COLUMN.OF 144421 . 145721) (OVERFLOW? 145723 . 146671) (OVERFLOWLINE? 146673 . 146999) (
+PREVLINE 147001 . 148181) (PREVWORD 148183 . 150324) (PROPERTAILP 150326 . 150533) (READFROMBUF 150535
+ . 153124) (RENUMBER.LINES 153126 . 153519) (RESTORE.CURSOR 153521 . 153675) (RESTOREBUF 153677 . 
+155861) (RETYPE.BUFFER 155863 . 158126) (SAVE.CURSOR 158128 . 158300) (SCANBACK 158302 . 159660) (
+SCANFORWARD 159662 . 160530) (SCRATCHCONS 160532 . 161134) (SEGMENT.LENGTH 161136 . 161672) (
+SEGMENT.BIT.LENGTH 161674 . 162281) (SETLASTC 162283 . 162580) (SETTAIL? 162582 . 163398) (
+SHOW.MATCHING.PAREN 163400 . 165900) (SKIP/ZAP 165902 . 168381) (START.NEW.LINE 168383 . 168715) (
+START.OF.PARAGRAPH? 168717 . 169098) (TTADJUSTWORD 169100 . 170274) (TTBIN 170276 . 171482) (
+TTBITWIDTH 171484 . 171633) (TTCRLF 171635 . 171842) (TTCRLF.ACCOUNT 171844 . 172484) (TTDELETECHAR 
+172486 . 173630) (TTDELETELINE 173632 . 175580) (TTDELETEWORD 175582 . 176250) (TTECHO.TO.FILE 176252
+ . 179811) (TTGIVEHELP 179813 . 181078) (TTGIVEHELP1 181080 . 181662) (TTGIVEHELP2 181664 . 182359) (
+TTLASTLINE 182361 . 182729) (TTLOADBUF 182731 . 186225) (TTNEXTLINE 186227 . 186547) (TTNEXTNODE 
+186549 . 186788) (TTNLEFT 186790 . 188017) (TTNTH 188019 . 188478) (TTNTHLINE 188480 . 189012) (
+TTPRIN1 189014 . 192827) (TTPRINSPACE 192829 . 193222) (TTPRIN1COMMENT 193224 . 193548) (TTPRIN2 
+193550 . 195869) (TTPROMPTCHAR 195871 . 196767) (TTRUBOUT 196769 . 197732) (TTUNREADBUF 197734 . 
+198143) (TTWAITFORINPUT 198145 . 202353) (TTYINSTRING 202355 . 203314) (TYPE.BUFFER 203316 . 205068) (
+U-CASECODE 205070 . 205229) (U/L-CASE 205231 . 207829)) (207986 217345 (TTRATOM 207996 . 208440) (
+TTREADLIST 208442 . 208809) (TTSKIPSEPR 208811 . 209185) (TTSKREAD 209187 . 213827) (TTYIN.READ 213829
+ . 217343)) (217392 237436 (FIND.MATCHING.WORD 217402 . 217930) (TTCOMPLETEWORD 217932 . 232360) (
+WORD.MATCHES.BUFFER 232362 . 233922) (TTYIN.SHOW.?ALTERNATIVES 233924 . 237434)) (237470 255780 (
+DO?CMD 237480 . 243382) (TTYIN.PRINTARGS 243384 . 254242) (TTYIN.READ?=ARGS 254244 . 255025) (
+DO?CMD.ERRORHANDLER 255027 . 255778)) (255814 263887 (BEEP 255824 . 255999) (BITBLT.DELETE 256001 . 
+256648) (BITBLT.ERASE 256650 . 256835) (BITBLT.INSERT 256837 . 257148) (DO.CRLF 257150 . 257469) (
+DO.DELETE.LINES 257471 . 258515) (DO.INSERT.LINE 258517 . 260451) (DO.LF 260453 . 260619) (
+ERASE.TO.END.OF.LINE 260621 . 260946) (ERASE.TO.END.OF.PAGE 260948 . 261553) (INSERT.TEXT 261555 . 
+262059) (TTDELSECTION 262061 . 262359) (TTADJUSTWIDTH 262361 . 263225) (TTINSERTSECTION 263227 . 
+263566) (TTSETCURSOR 263568 . 263885)) (263922 268899 (TTYINBUFFERDEVICE 263932 . 265248) (
+TTYINBUFFERSTREAM 265250 . 266012) (TTYINBUFFERBIN 266014 . 266550) (TTYINBUFFERPEEK 266552 . 267030) 
+(TTYINBUFFERREADP 267032 . 267287) (TTYINBUFFEREOFP 267289 . 267541) (TTYINBUFFERBACKPTR 267543 . 
+268095) (TTYINWORDRDTBL 268097 . 268897)) (269060 294617 (DO.MOUSE 269070 . 271827) (
+DO.SHIFTED.SELECTION 271829 . 282268) (COPY.SEGMENT 282270 . 282474) (DELETE.LONG.SEGMENT 282476 . 
+282835) (DELETE.LONG.SEGMENT1 282837 . 285313) (INVERT.LONG.SEGMENT 285315 . 286344) (INVERT.SEGMENT 
+286346 . 287861) (BRACKET.CURRENT.WORD 287863 . 289397) (TTBEFOREPOS 289399 . 290129) (TTNEXTPOS 
+290131 . 290839) (TTRACKMOUSE 290841 . 294615)) (294761 300016 (SETREADFN 294771 . 295249) (
+TTYINENTRYFN 295251 . 295676) (TTYINREADP 295678 . 296142) (TTYINREAD 296144 . 297538) (TTYINFIX 
+297540 . 298739) (CHARMACRO? 298741 . 299308) (TTYINMETA 299310 . 299438) (TTYIN.LASTINPUT 299440 . 
+300014)) (300017 308286 (TTYINEDIT 300027 . 302144) (SIMPLETEXTEDIT 302146 . 305190) (
+SET.TTYINEDIT.WINDOW 305192 . 306343) (TTYIN.PPTOFILE 306345 . 308284)) (308344 308521 (
+MAKE-TTSCRATCHFILE 308354 . 308519)) (308668 309801 (TTYIN.SCRATCHFILE 308678 . 309124) (\TTYIN.RPEOF 
+309126 . 309799)) (310013 313646 (TTYINPROMPTFORWORD 310023 . 313644)))))
 STOP
diff --git a/sources/TTYIN.LCOM b/sources/TTYIN.LCOM
index 7c0e16d0..cd044f80 100644
Binary files a/sources/TTYIN.LCOM and b/sources/TTYIN.LCOM differ
