Reshuffle the escape key processing again

Author: vkbo

novelwriter/gui/doceditor.py

@@ -581,10 +581,6 @@ def updateDocMargins(self) -> None:
         lM = max(self._vpMargin, fH)
         self.setViewportMargins(tM, uM, tM, lM)
 
-    def isVimEscapable(self) -> bool:
-        """Check if Escape keypress should be processed for Vim mode."""
-        return CONFIG.vimMode and self._vim.mode != nwVimMode.NORMAL
-
     ##
     #  Getters
     ##

novelwriter/guimain.py

@@ -1276,7 +1276,7 @@ def _keyPressEscape(self) -> None:
         """Process an escape keypress in the main window."""
         if self.docEditor.searchVisible():
             self.docEditor.closeSearch()
-        elif self.docEditor.isVimEscapable():
+        elif CONFIG.vimMode:
             self.docEditor.setVimMode(nwVimMode.NORMAL)
         elif SHARED.focusMode:
             SHARED.setFocusMode(False)