Merge pull request #204 from fox0430/fix#201

Fix #201
fox0430 · Apr 3, 2019 · 929f087 · 929f087
2 parents 6034d9c + 02e5b3d
commit 929f087
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/moepkg/commandview.nim b/src/moepkg/commandview.nim
@@ -137,7 +137,8 @@ proc getCommand*(status: var EditorStatus, prompt: string): seq[seq[Rune]] =
 
     var key = getKey(status.commandWindow)
 
-    if isEnterKey(key) or isEscKey(key): break
+    if isEnterKey(key): break
+    elif isEscKey(key): return @[ru""]
     elif isResizeKey(key):
       status.resize(terminalHeight(), terminalWidth())
       status.update

diff --git a/src/moepkg/exmode.nim b/src/moepkg/exmode.nim
@@ -314,7 +314,9 @@ proc replaceBuffer(status: var EditorStatus, command: seq[Rune]) =
   status.changeMode(status.prevMode)
 
 proc exModeCommand(status: var EditorStatus, command: seq[seq[Rune]]) =
-  if isJumpCommand(status, command):
+  if command[0].len == 0:
+    status.changeMode(status.prevMode)
+  elif isJumpCommand(status, command):
     var line = ($command[0]).parseInt-1
     if line < 0: line = 0
     if line >= status.buffer.len: line = status.buffer.high