a bit of refactoring

fcore/normal-mode/normal-search-mode.sml

@@ -18,7 +18,7 @@ struct
         NORMAL_SEARCH_MODE
           {searchString = searchString, tempSearchList = tempSearchList}
     in
-      AppWith.mode (app, mode, [])
+      NormalModeWith.mode (app, mode, [])
     end
 
   (* todo: switch to normal mode, save tempSearchList and searchString,
@@ -28,7 +28,7 @@ struct
   fun update (app, {searchString, tempSearchList}, msg, time) =
     case msg of
       CHAR_EVENT chr => parseChr (app, searchString, chr)
-    | KEY_ESC => Finish.clearMode app
+    | KEY_ESC => NormalFinish.clearMode app
     | KEY_ENTER => finishSearch (app, searchString, tempSearchList)
     | RESIZE_EVENT (width, height) => app
     | WITH_SEARCH_LIST searchList => app