summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-23 19:39:20 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-23 19:39:20 +0100
commit7d41410a455ba62128655beb91c35d3fba299287 (patch)
tree65c38da73c619ec0d4a400ccd63c9d864c31af19
parent2c6553498e790604f50016d8435403523a2576d6 (diff)
downloadvim-git-7d41410a455ba62128655beb91c35d3fba299287.tar.gz
patch 8.2.2548: May get stuck in the cmdline window using :normalv8.2.2548
Problem: May get stuck in the cmdline window using :normal. Solution: Have nv_esc() return K_IGNORE.
-rw-r--r--src/normal.c10
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/normal.c b/src/normal.c
index d2f41593a..4299a90df 100644
--- 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 7eb0d057a..3d52e4967 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2548,
+/**/
2547,
/**/
2546,