diff --git a/sources/EDITINTERFACE b/sources/EDITINTERFACE
index 251561fa..9c2c1c9f 100644
--- a/sources/EDITINTERFACE
+++ b/sources/EDITINTERFACE
@@ -1,7 +1,7 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 4-Dec-2021 09:08:18" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>EDITINTERFACE.;20 46022  
+(FILECREATED " 4-Dec-2021 10:40:27" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>EDITINTERFACE.;21 46036  
 
       changes to%:  (FNS EDITDATE?)
 
@@ -758,7 +758,7 @@ Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation.
               (RETURN EXPR)))])
 
 (EDITDATE?
-  [LAMBDA (COMMENT RESTOK)                                   (* ; "Edited  4-Dec-2021 09:07 by rmk")
+  [LAMBDA (COMMENT RESTOK)                                   (* ; "Edited  4-Dec-2021 10:39 by rmk")
 
 (* ;;; "This determines whether this is a dated or initialed comment that is potentially reusable in the current context.  Unless RESTOK, this only recognizes modern-format configurations of the form %"Edited <date> by <initials>%", and returns a parsed pair (DATE INITIALS).")
 
@@ -789,8 +789,8 @@ Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation.
 
                  (* ;; "Could be %"<INITIALS>: abc%" to be upgraded with a date")
 
-                 (SETQ RESTPOS (STRPOS " " STRING))
-                 (SETQ I (SUBSTRING STRING 1 (SUB1 RESTPOS))))
+                 (CL:WHEN (SETQ RESTPOS (STRPOS " " STRING))
+                     (SETQ I (SUBSTRING STRING 1 (SUB1 RESTPOS)))))
              (CL:WHEN (AND I (ILESSP (NCHARS I)
                                     12))                     (* ; 
                                                             "Sanity check: Initials should be short.")
@@ -906,6 +906,6 @@ Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation.
 18758) (EDITLOADFNS? 18760 . 22560) (EDITMODE 22562 . 24572) (EDITP 24574 . 25085) (EDITV 25087 . 
 25726) (DC 25728 . 26409) (DF 26411 . 27453) (DP 27455 . 28539) (DV 28541 . 29113) (EDITPROP 29115 . 
 29334) (EF 29336 . 29665) (EP 29667 . 29850) (EV 29852 . 30031) (EDITE 30033 . 30911) (EDITL 30913 . 
-31139)) (31491 45167 (NEW/EDITDATE 31501 . 31723) (FIXEDITDATE 31725 . 39112) (EDITDATE? 39114 . 41913
-) (EDITDATE 41915 . 43170) (SETINITIALS 43172 . 45165)))))
+31139)) (31491 45181 (NEW/EDITDATE 31501 . 31723) (FIXEDITDATE 31725 . 39112) (EDITDATE? 39114 . 41927
+) (EDITDATE 41929 . 43184) (SETINITIALS 43186 . 45179)))))
 STOP
diff --git a/sources/EDITINTERFACE.LCOM b/sources/EDITINTERFACE.LCOM
index 03cccc9c..9f69beea 100644
Binary files a/sources/EDITINTERFACE.LCOM and b/sources/EDITINTERFACE.LCOM differ
diff --git a/sources/SEDIT-TOPLEVEL b/sources/SEDIT-TOPLEVEL
index 92c0fe8a..10a96af7 100644
--- a/sources/SEDIT-TOPLEVEL
+++ b/sources/SEDIT-TOPLEVEL
@@ -1,10 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE (DEFPACKAGE "SEDIT" (USE "LISP" "XCL")) READTABLE "XCL" BASE 10)
 
-(IL:FILECREATED " 2-Dec-2021 23:05:22" IL:|{DSK}<home>larry>medley>sources>SEDIT-TOPLEVEL.;2| 36031  
+(IL:FILECREATED " 8-Dec-2021 11:15:19" IL:|{DSK}<home>medley>medley>sources>SEDIT-TOPLEVEL.;2| 36871  
 
-      :CHANGES-TO (IL:FNS MARKASCHANGEDFN)
+      IL:|changes| IL:|to:|  (IL:FNS MARKASCHANGEDFN)
 
-      :PREVIOUS-DATE " 1-Dec-2021 17:36:47" IL:|{DSK}<home>larry>medley>sources>SEDIT-TOPLEVEL.;1|)
+      IL:|previous| IL:|date:| " 2-Dec-2021 23:05:22" 
+IL:|{DSK}<home>medley>medley>sources>SEDIT-TOPLEVEL.;1|)
 
 
 ; Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation.
@@ -25,7 +26,7 @@
            (IL:COMS 
 
                   (IL:* IL:|;;| 
-         "THESE CAN ALL BE NUKED WITH THE NEW EDIT INTERFACE AND A DETACHED TTY/EDITOR (WOZ 1/25/91)")
+       "THESE CAN ALL BE NUKED WITH THE NEW EDIT INTERFACE AND A DETACHED TTY/EDITOR (WOZ 1/25/91)")
 
                   (IL:PROP (IL:|Definition-for-EDITL| IL:|Definition-for-EDITE| 
                                   IL:|Definition-for-EDITDATE|)
@@ -51,8 +52,8 @@
 (IL:PUTPROPS IL:SEDIT-TOPLEVEL IL:FILETYPE :COMPILE-FILE)
 
 (IL:PUTPROPS IL:SEDIT-TOPLEVEL IL:MAKEFILE-ENVIRONMENT (:READTABLE "XCL" :PACKAGE
-                                                              (DEFPACKAGE "SEDIT" (:USE "LISP" "XCL")
-                                                                     )))
+                                                                      (DEFPACKAGE "SEDIT"
+                                                                             (:USE "LISP" "XCL"))))
 (IL:DECLARE\: IL:DOEVAL@COMPILE IL:DONTCOPY
 
 (IL:LOCALVARS . T)
@@ -207,9 +208,11 @@
 
 (MARKASCHANGEDFN
   (IL:LAMBDA (NAME TYPE REASON)                              (IL:* IL:\; 
-                                                             "Edited  2-Dec-2021 22:57 by larry")
+                                                           "Edited  8-Dec-2021 11:08 by medley")
                                                              (IL:* IL:\; 
-                                                             "Edited  3-Apr-91 15:42 by jds")
+                                                           "Edited  2-Dec-2021 22:57 by larry")
+                                                             (IL:* IL:\; 
+                                                           "Edited  3-Apr-91 15:42 by jds")
 
 (IL:* IL:|;;;| "When a managed object is changed, we must check if we have an open edit on it.  If so, calling SEdit again, with the fresh definition, will  force the update.  This is fairly tricky, though.  Markaschanged is called as a result of editing a managed definition, so this markaschangedfn could be running in the sedit process under the completion-fn half way through completion.  IDEALLY in this case we could say \"i know it changed, i just changed it!\" and ignore this call.  BUT FOR NOW (1/14/91) since the manager can change the definition on completion (editdates, for one), we have to notify SEdit.  Since calling editdef will restart the sedit process, the completion-fn will not finish, so do the verify-structure here.")
 
@@ -231,7 +234,7 @@
 
               (IL:* IL:|;;| "found a matching context elsewhere")
 
-              (IL:RESETFORM (IL:EDITMODE SEDIT)
+              (IL:RESETFORM (IL:EDITMODE 'SEDIT)
                      (IL:EDITDEF NAME TYPE NIL NIL '(:DONTWAIT))))))))
 
 (new-function-body
@@ -258,38 +261,46 @@
 (IL:* IL:|;;;| "set up the OPTIONS provided in the call to SEDIT for this context.  Most of these options do not require immediate action.  Rather, they control how some command or interaction will work later, so we just store the option list in the context.  Most of these options are really edit-interface options, not sedit options.  We stash them so that when the *edit-fn* is called under M-O, it will be handed the same options that this edit was started with")
 
    (IL:REPLACE (EDIT-CONTEXT EDIT-OPTIONS) IL:OF CONTEXT IL:WITH (IF (LISTP OPTIONS)
-                                                                     OPTIONS
-                                                                     (LIST OPTIONS))))
+                                                                                 OPTIONS
+                                                                                 (LIST OPTIONS))))
 
 (DEFUN SET-PROPS (CONTEXT PROPS)
 
 (IL:* IL:|;;;| "go through the PROPS list supplied in the call to SEDIT and store the info in the context.  The :NAME and :TYPE props are already handled, because get-context uses this information to find an appropriate context.  Grab the current values of the variables that determine reading and printing, and save them in a profile in the context, so that later changes to the globals don't affect existing contexts. ")
 
    (IL:REPLACE (EDIT-CONTEXT COMPLETION-FN) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS 
-                                                                             :COMPLETION-FN)
-                                                                      #'NULL))
-   (IL:REPLACE (EDIT-CONTEXT ROOT-CHANGED-FN) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS 
-                                                                               :ROOT-CHANGED-FN)
-                                                                        #'NULL))
-   (IL:REPLACE (EDIT-CONTEXT ENVIRONMENT) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS :ENVIRONMENT)
-                                                                    LISP-EDIT-ENVIRONMENT))
-   (IL:REPLACE (EDIT-CONTEXT PROFILE) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS :PROFILE)
-                                                                (SAVE-PROFILE (COPY-PROFILE 
-                                                                                     "READ-PRINT"))))
-   (IL:REPLACE (EDIT-CONTEXT EVAL-IN-PROCESS) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS 
-                                                                               :EVAL-IN-PROCESS)
-                                                                        (EVAL-IN-PROCESS)))
-   (IL:REPLACE (EDIT-CONTEXT EVAL-FN) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS :EVAL-FN)
-                                                                (XCL::PROFILE-ENTRY-VALUE
-                                                                 '*EVAL-FUNCTION*)))
+                                                                                       :COMPLETION-FN
+                                                                                         )
+                                                                                  #'NULL))
+   (IL:REPLACE (EDIT-CONTEXT ROOT-CHANGED-FN) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET
+                                                                                     PROPS 
+                                                                                     :ROOT-CHANGED-FN
+                                                                                     )
+                                                                                    #'NULL))
+   (IL:REPLACE (EDIT-CONTEXT ENVIRONMENT) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS 
+                                                                                       :ENVIRONMENT)
+                                                                                LISP-EDIT-ENVIRONMENT
+                                                                                ))
+   (IL:REPLACE (EDIT-CONTEXT PROFILE) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS 
+                                                                                   :PROFILE)
+                                                                            (SAVE-PROFILE
+                                                                             (COPY-PROFILE 
+                                                                                    "READ-PRINT"))))
+   (IL:REPLACE (EDIT-CONTEXT EVAL-IN-PROCESS) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET
+                                                                                     PROPS 
+                                                                                     :EVAL-IN-PROCESS
+                                                                                     )
+                                                                                    (EVAL-IN-PROCESS)
+                                                                                    ))
+   (IL:REPLACE (EDIT-CONTEXT EVAL-FN) IL:OF CONTEXT IL:WITH (OR (IL:LISTGET PROPS 
+                                                                                   :EVAL-FN)
+                                                                            (XCL::PROFILE-ENTRY-VALUE
+                                                                             '*EVAL-FUNCTION*)))
    (WHEN (IL:LISTGET PROPS :SELECT-STRUCTURE)
-       (IL:REPLACE (EDIT-CONTEXT FIND-CANDIDATE) IL:OF CONTEXT IL:WITH (CONS (IL:LISTGET PROPS 
-                                                                                    :SELECT-STRUCTURE
-                                                                                    )
-                                                                             (OR (IL:LISTGET PROPS 
-                                                                                     :SELECT-INSTANCE
-                                                                                        )
-                                                                                 1)))))
+       (IL:REPLACE (EDIT-CONTEXT FIND-CANDIDATE) IL:OF CONTEXT
+          IL:WITH (CONS (IL:LISTGET PROPS :SELECT-STRUCTURE)
+                            (OR (IL:LISTGET PROPS :SELECT-INSTANCE)
+                                1)))))
 
 (DEFUN START-PROCESS (CONTEXT)
 
@@ -538,16 +549,16 @@
 (IL:DEFPRINT 'GAP 'PRINT-GAP)
 (IL:PUTPROPS IL:SEDIT-TOPLEVEL IL:COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1988 1990 1991))
 (IL:DECLARE\: IL:DONTCOPY
-  (IL:FILEMAP (NIL (3108 7326 (SEDIT 3121 . 5107) (RESET 5109 . 5310) (GET-WINDOW-REGION 5312 . 6189) (
-SAVE-WINDOW-REGION 6191 . 7018) (GET-WINDOW 7020 . 7324)) (7327 14295 (GET-CONTEXT 7340 . 9360) (
-DISINTEGRATE-CONTEXT 9362 . 10088) (AWAKE-COMMAND-PROCESS 10090 . 11683) (AWAKE-ME 11685 . 12068) (
-MARKASCHANGEDFN 12070 . 14091) (NEW-FUNCTION-BODY 14093 . 14293)) (14297 15280 (
-QUERY-THROW-AWAY-CHANGES 14297 . 15280)) (15282 16057 (SET-OPTIONS 15282 . 16057)) (16059 18874 (
-SET-PROPS 16059 . 18874)) (18876 19547 (START-PROCESS 18876 . 19547)) (19863 32840 (SEDITE 19876 . 
-25643) (SEDITL 25645 . 26790) (FN-CHANGED 26792 . 27087) (PROP-CHANGED 27089 . 27226) (PROPLST-CHANGED
- 27228 . 27356) (VAR-CHANGED 27358 . 27470) (ALIST-COMPLETION 27472 . 28283) (COMPLETION 28285 . 29665
-) (PROPS-COMPLETION 29667 . 30492) (TTYFN 30494 . 32332) (LOCATE-NODE-FROM-EDITCHAIN 32334 . 32838)) (
-32986 33355 (SMART-TTYFN 32986 . 33355)) (33478 35163 (PRETTY-PRINT 33491 . 34534) (MAP-FONT 34536 . 
-35161)) (35345 35448 (MAKE-BROKEN-ATOM 35345 . 35448)) (35450 35608 (PRINT-BROKEN-ATOM 35450 . 35608))
- (35610 35694 (MAKE-GAP 35610 . 35694)) (35696 35824 (PRINT-GAP 35696 . 35824)))))
+  (IL:FILEMAP (NIL (3145 7363 (SEDIT 3158 . 5144) (RESET 5146 . 5347) (GET-WINDOW-REGION 5349 . 6226) (
+SAVE-WINDOW-REGION 6228 . 7055) (GET-WINDOW 7057 . 7361)) (7364 14508 (GET-CONTEXT 7377 . 9397) (
+DISINTEGRATE-CONTEXT 9399 . 10125) (AWAKE-COMMAND-PROCESS 10127 . 11720) (AWAKE-ME 11722 . 12105) (
+MARKASCHANGEDFN 12107 . 14304) (NEW-FUNCTION-BODY 14306 . 14506)) (14510 15493 (
+QUERY-THROW-AWAY-CHANGES 14510 . 15493)) (15495 16294 (SET-OPTIONS 15495 . 16294)) (16296 19714 (
+SET-PROPS 16296 . 19714)) (19716 20387 (START-PROCESS 19716 . 20387)) (20703 33680 (SEDITE 20716 . 
+26483) (SEDITL 26485 . 27630) (FN-CHANGED 27632 . 27927) (PROP-CHANGED 27929 . 28066) (PROPLST-CHANGED
+ 28068 . 28196) (VAR-CHANGED 28198 . 28310) (ALIST-COMPLETION 28312 . 29123) (COMPLETION 29125 . 30505
+) (PROPS-COMPLETION 30507 . 31332) (TTYFN 31334 . 33172) (LOCATE-NODE-FROM-EDITCHAIN 33174 . 33678)) (
+33826 34195 (SMART-TTYFN 33826 . 34195)) (34318 36003 (PRETTY-PRINT 34331 . 35374) (MAP-FONT 35376 . 
+36001)) (36185 36288 (MAKE-BROKEN-ATOM 36185 . 36288)) (36290 36448 (PRINT-BROKEN-ATOM 36290 . 36448))
+ (36450 36534 (MAKE-GAP 36450 . 36534)) (36536 36664 (PRINT-GAP 36536 . 36664)))))
 IL:STOP
diff --git a/sources/SEDIT-TOPLEVEL.DFASL b/sources/SEDIT-TOPLEVEL.DFASL
index 6ad815fc..c49369b9 100644
Binary files a/sources/SEDIT-TOPLEVEL.DFASL and b/sources/SEDIT-TOPLEVEL.DFASL differ
