patch 8.2.2548: May get stuck in the cmdline window using :normal

Problem:    May get stuck in the cmdline window using :normal.
Solution:   Have nv_esc() return K_IGNORE.

diff --git a/src/normal.c b/src/normal.c
index d2f41593a01b95094ded90c78a9d48474959bc8f..4299a90df449b4a999547fd4b9e4fa58079980fb 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -6944,6 +6944,16 @@ nv_esc(cmdarg_T *cap)
        }
 #endif
     }
+#ifdef FEAT_CMDWIN
+    else if (cmdwin_type != 0 && ex_normal_busy)
+    {
+       // When :normal runs out of characters while in the command line window
+       // vgetorpeek() will return ESC.  Exit the cmdline window to break the
+       // loop.
+       cmdwin_result = K_IGNORE;
+       return;
+    }
+#endif
 
     if (VIsual_active)
     {

diff --git a/src/version.c b/src/version.c
index 7eb0d057af4818e592520f55812d427604076137..3d52e4967c8d7b28f94a3596f4071a2b9d6b785b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2548,
 /**/
     2547,
 /**/