summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_getln.c13
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 6ca707e432..8ebcc889c3 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -759,11 +759,14 @@ getcmdline(firstc, count, indent)
#ifdef FEAT_CMDWIN
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;
+ }
}
# ifdef FEAT_DIGRAPHS
else
diff --git a/src/version.c b/src/version.c
index 2a86184d9c..5d512a3cda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 441,
+/**/
440,
/**/
439,