From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 9 Aug 2013 18:38:26 +0000 (+0200)
Subject: updated for version 7.4b.021
X-Git-Tag: v7.4b.021
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b09129684b15de58bd2eea8328a8d91896f3e7d9;p=vim

updated for version 7.4b.021
Problem:    Pressing "u" after an external command results in multiple
            press-enter messages. (glts)
Solution:   Don't call hit_return_msg() when we have K_IGNORE. (Christian
            Brabandt)
---

diff --git a/src/message.c b/src/message.c
index 86db5a882..5f00c01c0 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1004,7 +1004,7 @@ wait_return(redraw)
 			quit_more = FALSE;
 			got_int = FALSE;
 		    }
-		    else
+		    else if (c != K_IGNORE)
 		    {
 			c = K_IGNORE;
 			hit_return_msg();
diff --git a/src/version.c b/src/version.c
index 3add57dd9..59476e523 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/