updated for version 7.4.441

Problem:    Endless loop and other problems when 'cedit' is set to CTRL-C.
Solution:   Do not call ex_window() when ex_normal_busy or got_int was set.
            (Yasuhiro Matsumoto)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 6ca707e43265f1c896709f8108314901ed375352..8ebcc889c3ec2ca5aa78e89b641f27cf0b8a85bf 100644 (file)
--- 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 2a86184d9ccd53c47f4bfdbd3e6418755af58485..5d512a3cda76de9a8cedd5957ba199173deee6d7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    441,
 /**/
     440,
 /**/