diff --git a/lispusers/WHEELSCROLL b/lispusers/WHEELSCROLL
index 0a9dfe9e..6fbdb626 100644
--- a/lispusers/WHEELSCROLL
+++ b/lispusers/WHEELSCROLL
@@ -1,11 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "23-Oct-2021 16:33:29" {DSK}<home>larry>medley>lispusers>WHEELSCROLL.;2 11221  
+(FILECREATED "29-Nov-2021 22:06:33" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>WHEELSCROLL.;21 11690  
 
-      changes to%:  (VARS WHEELSCROLLCOMS)
-                    (FNS ENABLEWHEELSCROLL WHEELSCROLL)
+      changes to%:  (FNS INSTALL-WHEELSCROLL)
 
-      previous date%: "11-Jun-2021 12:50:16" {DSK}<home>larry>medley>lispusers>WHEELSCROLL.;1)
+      previous date%: "29-Nov-2021 21:58:55" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>lispusers>WHEELSCROLL.;20)
 
 
 (PRETTYCOMPRINT WHEELSCROLLCOMS)
@@ -28,6 +29,7 @@
                (AFTERMAKESYSFORMS (AND WHEELSCROLLENABLED (ENABLEWHEELSCROLL T]
         (INITVARS (WHEELSCROLLENABLED NIL)
                (WHEELSCROLLDELTA 20)
+               (HWHEELSCROLLDELTA NIL)
                (WHEELSCROLLSETTLETIME 50)
                (\WHEELSCROLLINPROGRESS NIL))
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (INSTALL-WHEELSCROLL)
@@ -161,18 +163,22 @@
         (RESETVAR \WHEELSCROLLINPROGRESS T (SCROLLW WINDOW DX DY)))])
 
 (INSTALL-WHEELSCROLL
-  [LAMBDA NIL                                           (* ; "Edited 28-May-2021 11:46 by rmk:")
-                                                            (* ; "Edited 17-Feb-2021 11:53 by rmk:")
+  [LAMBDA NIL                                               (* ; "Edited 29-Nov-2021 21:56 by rmk:")
+                                                            (* ; "Edited 28-May-2021 11:46 by rmk:")
+                                                            (* ; "Edited 17-Feb-2021 11:53 by rmk:")
 
-    (* ;; "We want the UP, DOWN...constants to be compiled awsy")
+    (* ;; "We want the UP, DOWN...constants to be compiled awsy")
 
-    (SETQ WHEELSCROLLINTERRUPTS `((,UP (WHEELSCROLL 'VERTICAL WHEELSCROLLDELTA)
-                                       T)
-                                  (,DOWN (WHEELSCROLL 'VERTICAL (IMINUS WHEELSCROLLDELTA))
+    (SETQ WHEELSCROLLINTERRUPTS `((,\WSUP (WHEELSCROLL 'VERTICAL WHEELSCROLLDELTA)
                                          T)
-                                  (,LEFT (WHEELSCROLL 'HORIZONTAL (IMINUS WHEELSCROLLDELTA)
-                                                T))
-                                  (,RIGHT (WHEELSCROLL 'HORIZONTAL WHEELSCROLLDELTA T])
+                                  (,\WSDOWN (WHEELSCROLL 'VERTICAL (IMINUS WHEELSCROLLDELTA))
+                                         T)
+                                  (,\WSLEFT (WHEELSCROLL 'HORIZONTAL (IMINUS (OR HWHEELSCROLLDELTA 
+                                                                                 WHEELSCROLLDELTA))
+                                                   T))
+                                  (,\WSRIGHT (WHEELSCROLL 'HORIZONTAL (OR HWHEELSCROLLDELTA 
+                                                                          WHEELSCROLLDELTA)
+                                                    WHEELSCROLLDELTA T])
 
 (LISPINTERRUPTS.WHEELSCROLL
   [LAMBDA NIL                                           (* ; "Edited 17-Feb-2021 11:09 by rmk:")
@@ -224,6 +230,8 @@
 
 (RPAQ? WHEELSCROLLDELTA 20)
 
+(RPAQ? HWHEELSCROLLDELTA NIL)
+
 (RPAQ? WHEELSCROLLSETTLETIME 50)
 
 (RPAQ? \WHEELSCROLLINPROGRESS NIL)
@@ -234,6 +242,6 @@
 (ENABLEWHEELSCROLL T)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1604 10208 (ENABLEWHEELSCROLL 1614 . 5871) (WHEELSCROLL 5873 . 8474) (WHEELSCROLL.DOIT 
-8476 . 9112) (INSTALL-WHEELSCROLL 9114 . 9929) (LISPINTERRUPTS.WHEELSCROLL 9931 . 10206)))))
+  (FILEMAP (NIL (1636 10642 (ENABLEWHEELSCROLL 1646 . 5903) (WHEELSCROLL 5905 . 8506) (WHEELSCROLL.DOIT 
+8508 . 9144) (INSTALL-WHEELSCROLL 9146 . 10363) (LISPINTERRUPTS.WHEELSCROLL 10365 . 10640)))))
 STOP
diff --git a/lispusers/WHEELSCROLL.LCOM b/lispusers/WHEELSCROLL.LCOM
index 9bc9b896..e2b0d958 100644
Binary files a/lispusers/WHEELSCROLL.LCOM and b/lispusers/WHEELSCROLL.LCOM differ
diff --git a/lispusers/WHEELSCROLL.TXT b/lispusers/WHEELSCROLL.TXT
index adf3983a..752293c4 100644
--- a/lispusers/WHEELSCROLL.TXT
+++ b/lispusers/WHEELSCROLL.TXT
@@ -15,6 +15,9 @@ The scrolling speed is controlled by the variable
 WHEELSCROLLDELTA (initially 20)
 	The number of points to scroll for each click of the wheel.  Higher values give faster scrolling.  A negative value reverses the scrolling direction.  
 
+HWHEELSCROLLDELTA (initial NIL)
+	If non-NIL, then this is the delta used for horizontal scrolling.
+
 Implementation:
 
 Lisp receives a key transition on PAD1 or PAD2 for vertical scrolling when the wheel rotates and no other keys are down.  (ENABLEWHEELSCROLL T) modifies the keyaction table so that it maps these transitions to characters 156 and 157. Those characters are defined as interrupts that invoke the vertical scrolling action.  For horizontal scrolling sideways pushes of a wheel (if it has that) produce transitions on PAD4 and PAD5, which map to interrupt-characters 158 and 159. (156-159 are the highest  right-panel characters of character-set 0 that correspond to left-panel control characters, so typically have no other conflicting meaning.)
diff --git a/sources/COMPARE b/sources/COMPARE
index f31ee4ba..25fa92cb 100644
--- a/sources/COMPARE
+++ b/sources/COMPARE
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 5-Nov-2021 20:53:09" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;2 12484  
+(FILECREATED "29-Nov-2021 14:05:45" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;3 12592  
 
-      changes to%:  (FNS COMPAREPRINTN)
+      changes to%:  (FNS COMPARE1)
 
-      previous date%: "16-May-90 14:59:25" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;1)
+      previous date%: " 5-Nov-2021 20:53:09" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>COMPARE.;2)
 
 
 (* ; "
@@ -33,9 +33,10 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.
     (COMPARE1 X Y])
 
 (COMPARE1
-  [LAMBDA (X Y)                                              (* lmm "29-AUG-78 18:35")
-          
-          (* ;; "returns T if X and Y are similar;  if LOOSEMATCH then sets DIFFERENCES to changes")
+  [LAMBDA (X Y)                                             (* ; "Edited 29-Nov-2021 13:49 by rmk:")
+                                                             (* lmm "29-AUG-78 18:35")
+
+    (* ;; "returns T if X and Y are similar;  if LOOSEMATCH then sets DIFFERENCES to changes")
 
     (AND [OR (EQ X Y)
              (COND
@@ -49,7 +50,7 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.
                          (PROG NIL
                            LP  (RETURN (COND
                                           ((NLISTP X)
-                                           (OR (EQUAL X Y)
+                                           (OR (EQUALALL X Y)
                                                (COMPAREFAIL X Y)))
                                           ((NLISTP Y)
                                            (COMPAREFAIL X Y))
@@ -60,7 +61,7 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.
                                              (SETQ Y (CDR Y))
                                              (GO LP]
                     (T (COMPAREFAIL X Y]
-                (T (OR (EQUAL X Y)
+                (T (OR (EQUALALL X Y)
                        (COMPAREFAIL X Y]
          (OR LOOSEMATCH T])
 
@@ -305,7 +306,7 @@ Copyright (c) 1987, 1990 by Venue & Xerox Corporation.
 )
 (PUTPROPS COMPARE COPYRIGHT ("Venue & Xerox Corporation" 1987 1990))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (847 12109 (COMPARELST 857 . 1119) (COMPARE1 1121 . 2530) (COMPAREPRINT 2532 . 3489) (
-COMPAREPRINT1 3491 . 7755) (COMPARELISTS 7757 . 9044) (COMPAREPRINTN 9046 . 9890) (COMPARENCHARS 9892
- . 10450) (COMPAREFAIL 10452 . 11579) (COMPAREMAX 11581 . 11818) (COUNTDOWN 11820 . 12107)))))
+  (FILEMAP (NIL (844 12217 (COMPARELST 854 . 1116) (COMPARE1 1118 . 2638) (COMPAREPRINT 2640 . 3597) (
+COMPAREPRINT1 3599 . 7863) (COMPARELISTS 7865 . 9152) (COMPAREPRINTN 9154 . 9998) (COMPARENCHARS 10000
+ . 10558) (COMPAREFAIL 10560 . 11687) (COMPAREMAX 11689 . 11926) (COUNTDOWN 11928 . 12215)))))
 STOP
diff --git a/sources/COMPARE.LCOM b/sources/COMPARE.LCOM
index eb07d99f..dd09f136 100644
Binary files a/sources/COMPARE.LCOM and b/sources/COMPARE.LCOM differ
diff --git a/sources/SEDIT-EXPORTS b/sources/SEDIT-EXPORTS
index f1e5c4f3..72521baa 100644
--- a/sources/SEDIT-EXPORTS
+++ b/sources/SEDIT-EXPORTS
@@ -1,13 +1,15 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE (DEFPACKAGE SEDIT (USE LISP XCL)))
-(IL:FILECREATED "17-May-90 11:01:36" IL:|{DSK}<usr>local>lde>lispcore>sources>SEDIT-EXPORTS.;2| 2834   
+(DEFINE-FILE-INFO PACKAGE (DEFPACKAGE SEDIT (USE LISP XCL)) READTABLE "XCL" BASE 10)
+
+(IL:FILECREATED " 1-Dec-2021 17:38:50" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>SEDIT-EXPORTS.;2| 2883   
 
       IL:|changes| IL:|to:|  (IL:VARS IL:SEDIT-EXPORTSCOMS)
 
-      IL:|previous| IL:|date:| " 5-Feb-88 11:38:07" 
-IL:|{DSK}<usr>local>lde>lispcore>sources>SEDIT-EXPORTS.;1|)
+      IL:|previous| IL:|date:| "17-May-90 11:01:36" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>SEDIT-EXPORTS.;1|)
 
 
-; Copyright (c) 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights reserved.
+; Copyright (c) 1987-1988, 1990 by Venue & Xerox Corporation.
 
 (IL:PRETTYCOMPRINT IL:SEDIT-EXPORTSCOMS)
 
@@ -18,7 +20,7 @@ IL:|{DSK}<usr>local>lde>lispcore>sources>SEDIT-EXPORTS.;1|)
            
            (IL:* IL:|;;| "REGION MANAGER")
 
-           (IL:P (EXPORT '(GET-WINDOW-REGION SAVE-WINDOW-REGION))
+           (IL:P (EXPORT '(GET-WINDOW-REGION SAVE-WINDOW-REGION GET-WINDOW))
                  (EXPORT '(KEEP-WINDOW-REGION)))
            
            (IL:* IL:|;;| "PROGRAMMERS INTERFACE")
@@ -41,8 +43,8 @@ IL:|{DSK}<usr>local>lde>lispcore>sources>SEDIT-EXPORTS.;1|)
 (IL:PUTPROPS IL:SEDIT-EXPORTS IL:FILETYPE :COMPILE-FILE)
 
 (IL:PUTPROPS IL:SEDIT-EXPORTS IL:MAKEFILE-ENVIRONMENT (:READTABLE "XCL" :PACKAGE
-                                                                     (DEFPACKAGE IL:SEDIT
-                                                                            (:USE IL:LISP IL:XCL))))
+                                                             (DEFPACKAGE IL:SEDIT (:USE IL:LISP 
+                                                                                        IL:XCL))))
 (IL:DECLARE\: IL:DONTCOPY IL:DOEVAL@COMPILE 
 
 (IL:FILESLOAD IL:SEDIT-DECLS)
@@ -53,7 +55,7 @@ IL:|{DSK}<usr>local>lde>lispcore>sources>SEDIT-EXPORTS.;1|)
 (IL:* IL:|;;| "REGION MANAGER")
 
 
-(EXPORT '(GET-WINDOW-REGION SAVE-WINDOW-REGION))
+(EXPORT '(GET-WINDOW-REGION SAVE-WINDOW-REGION GET-WINDOW))
 
 (EXPORT '(KEEP-WINDOW-REGION))
 
diff --git a/sources/SEDIT-EXPORTS.DFASL b/sources/SEDIT-EXPORTS.DFASL
index ea3637fa..06b67e49 100644
Binary files a/sources/SEDIT-EXPORTS.DFASL and b/sources/SEDIT-EXPORTS.DFASL differ
diff --git a/sources/SEDIT-TOPLEVEL b/sources/SEDIT-TOPLEVEL
index 04fd688e..d197e8c9 100644
--- a/sources/SEDIT-TOPLEVEL
+++ b/sources/SEDIT-TOPLEVEL
@@ -1,14 +1,13 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE (DEFPACKAGE "SEDIT" (USE "LISP" "XCL")))
-(IL:FILECREATED "10-Jul-91 19:11:12" IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;5| 36139  
+(DEFINE-FILE-INFO PACKAGE (DEFPACKAGE "SEDIT" (USE "LISP" "XCL")) READTABLE "XCL" BASE 10)
 
-      IL:|changes| IL:|to:|  (IL:VARS IL:SEDIT-TOPLEVELCOMS)
-                             (IL:FNS SEDITE)
+(IL:FILECREATED " 1-Dec-2021 17:36:47" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;6| 35734  
 
-      IL:|previous| IL:|date:| " 3-Apr-91 15:43:40" 
-IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
+      IL:|previous| IL:|date:| " 1-Dec-2021 17:36:14" 
+IL:|{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>SEDIT-TOPLEVEL.;5|)
 
 
-; Copyright (c) 1986, 1987, 1988, 1990, 1991 by Venue & Xerox Corporation.  All rights reserved.
+; Copyright (c) 1986-1988, 1990-1991 by Venue & Xerox Corporation.
 
 (IL:PRETTYCOMPRINT IL:SEDIT-TOPLEVELCOMS)
 
@@ -19,14 +18,14 @@ IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
            (IL:DECLARE\: IL:DONTCOPY IL:DOEVAL@COMPILE (IL:FILES IL:SEDIT-DECLS))
            (IL:INITVARS CONTEXTS REGIONS)
            (IL:VARS (IL:*DISPLAY-EDITOR* 'SEDIT))
-           (IL:FNS SEDIT RESET GET-WINDOW-REGION SAVE-WINDOW-REGION)
+           (IL:FNS SEDIT RESET GET-WINDOW-REGION SAVE-WINDOW-REGION GET-WINDOW)
            (IL:FNS GET-CONTEXT DISINTEGRATE-CONTEXT AWAKE-COMMAND-PROCESS AWAKE-ME MARKASCHANGEDFN 
                   NEW-FUNCTION-BODY)
            (IL:FUNCTIONS QUERY-THROW-AWAY-CHANGES SET-OPTIONS SET-PROPS START-PROCESS)
            (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|)
@@ -52,8 +51,8 @@ IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
 (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)
@@ -85,7 +84,7 @@ IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
 
               (IL:* IL:|;;| "this is a new context, needs to be setup from scratch")
 
-              (START-PROCESS CONTEXT NAME)
+              (START-PROCESS CONTEXT     )
               CONTEXT)
              ((AND (IL:OPENWP WINDOW)
                    (IL:PROCESSP (IL:WINDOWPROP WINDOW 'IL:PROCESS)))
@@ -134,6 +133,14 @@ IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
                    (NOT KEEP-WINDOW-REGION)))
         (IL:|push| REGIONS (OR REGION (IL:WINDOWREGION (IL:|fetch| DISPLAY-WINDOW
                                                               IL:|of| CONTEXT)))))))
+
+(GET-WINDOW
+  (IL:LAMBDA (CONTEXT)                               (IL:* IL:\; "Edited 25-Nov-2021 23:13 by rmk:")
+
+    (IL:* IL:|;;| 
+    "Returns the current window of CONTEXT, for clients that don't have SEDIT declarations")
+
+    (IL:|fetch| DISPLAY-WINDOW IL:|of| CONTEXT)))
 )
 (IL:DEFINEQ
 
@@ -247,46 +254,38 @@ IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
 (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)
 
@@ -535,12 +534,16 @@ IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>SEDIT-TOPLEVEL.;4|)
 (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 (3202 7114 (SEDIT 3215 . 5201) (RESET 5203 . 5404) (GET-WINDOW-REGION 5406 . 6283) (
-SAVE-WINDOW-REGION 6285 . 7112)) (7115 13776 (GET-CONTEXT 7128 . 9148) (DISINTEGRATE-CONTEXT 9150 . 
-9876) (AWAKE-COMMAND-PROCESS 9878 . 11471) (AWAKE-ME 11473 . 11856) (MARKASCHANGEDFN 11858 . 13572) (
-NEW-FUNCTION-BODY 13574 . 13774)) (19971 32948 (SEDITE 19984 . 25751) (SEDITL 25753 . 26898) (
-FN-CHANGED 26900 . 27195) (PROP-CHANGED 27197 . 27334) (PROPLST-CHANGED 27336 . 27464) (VAR-CHANGED 
-27466 . 27578) (ALIST-COMPLETION 27580 . 28391) (COMPLETION 28393 . 29773) (PROPS-COMPLETION 29775 . 
-30600) (TTYFN 30602 . 32440) (LOCATE-NODE-FROM-EDITCHAIN 32442 . 32946)) (33586 35271 (PRETTY-PRINT 
-33599 . 34642) (MAP-FONT 34644 . 35269)))))
+  (IL:FILEMAP (NIL (3118 7336 (SEDIT 3131 . 5117) (RESET 5119 . 5320) (GET-WINDOW-REGION 5322 . 6199) (
+SAVE-WINDOW-REGION 6201 . 7028) (GET-WINDOW 7030 . 7334)) (7337 13998 (GET-CONTEXT 7350 . 9370) (
+DISINTEGRATE-CONTEXT 9372 . 10098) (AWAKE-COMMAND-PROCESS 10100 . 11693) (AWAKE-ME 11695 . 12078) (
+MARKASCHANGEDFN 12080 . 13794) (NEW-FUNCTION-BODY 13796 . 13996)) (14000 14983 (
+QUERY-THROW-AWAY-CHANGES 14000 . 14983)) (14985 15760 (SET-OPTIONS 14985 . 15760)) (15762 18577 (
+SET-PROPS 15762 . 18577)) (18579 19250 (START-PROCESS 18579 . 19250)) (19566 32543 (SEDITE 19579 . 
+25346) (SEDITL 25348 . 26493) (FN-CHANGED 26495 . 26790) (PROP-CHANGED 26792 . 26929) (PROPLST-CHANGED
+ 26931 . 27059) (VAR-CHANGED 27061 . 27173) (ALIST-COMPLETION 27175 . 27986) (COMPLETION 27988 . 29368
+) (PROPS-COMPLETION 29370 . 30195) (TTYFN 30197 . 32035) (LOCATE-NODE-FROM-EDITCHAIN 32037 . 32541)) (
+32689 33058 (SMART-TTYFN 32689 . 33058)) (33181 34866 (PRETTY-PRINT 33194 . 34237) (MAP-FONT 34239 . 
+34864)) (35048 35151 (MAKE-BROKEN-ATOM 35048 . 35151)) (35153 35311 (PRINT-BROKEN-ATOM 35153 . 35311))
+ (35313 35397 (MAKE-GAP 35313 . 35397)) (35399 35527 (PRINT-GAP 35399 . 35527)))))
 IL:STOP
diff --git a/sources/SEDIT-TOPLEVEL.DFASL b/sources/SEDIT-TOPLEVEL.DFASL
index 5e29545f..92831962 100644
Binary files a/sources/SEDIT-TOPLEVEL.DFASL and b/sources/SEDIT-TOPLEVEL.DFASL differ
