aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/ex_getln.c12
-rw-r--r--src/nvim/version.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index a19cb36d12..3ce8263457 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -627,11 +627,13 @@ getcmdline (
}
if (c == cedit_key || c == K_CMDWIN) {
- /*
- * Open a window to edit the command line (and history).
- */
- c = ex_window();
- some_key_typed = TRUE;
+ if (ex_normal_busy == 0 && got_int == FALSE) {
+ /*
+ * Open a window to edit the command line (and history).
+ */
+ c = ex_window();
+ some_key_typed = TRUE;
+ }
} else
c = do_digraph(c);
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 030e1ba514..e75139eab1 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -296,7 +296,7 @@ static int included_patches[] = {
444,
//443,
442,
- //441,
+ 441,
440,
439,
//438,