patch 9.1.0604: popup_filter during Press Enter prompt seems to hang

Problem:  popup_filter during Press Enter prompt seems to hang
Solution: Return early, when need_wait_return is set
          (Ernie Rael)

fixes: #15300
closes: #15301

Signed-off-by: Ernie Rael <errael@raelity.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/popupwin.c b/src/popupwin.c
index 9d60aa22aef89faa5328df0131bc1e9759ae33e5..0ff57fb4b131b8901ad8a53c089e1b6b5789b58a 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2651,6 +2651,8 @@ f_popup_filter_yesno(typval_T *argvars, typval_T *rettv)
        return;
 
     c = *key;
+    if (c == CAR && need_wait_return)
+       return;
     if (c == K_SPECIAL && key[1] != NUL)
        c = TO_SPECIAL(key[1], key[2]);
 

diff --git a/src/version.c b/src/version.c
index 4ca8e3f88ab743884e25cd65cebafae97943104d..e00d6c82951ad5315c82eba9a47f7a65ba4106ca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    604,
 /**/
     603,
 /**/