From b14c325a5b0f966f65d625997c4393221e261010 Mon Sep 17 00:00:00 2001
From: Ernie Rael <errael@raelity.com>
Date: Fri, 19 Jul 2024 16:37:09 +0200
Subject: [PATCH] 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>
---
 src/popupwin.c | 2 ++
 src/version.c  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/popupwin.c b/src/popupwin.c
index 9d60aa22ae..0ff57fb4b1 100644
--- 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 4ca8e3f88a..e00d6c8295 100644
--- 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,
 /**/