summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-08-09 20:38:26 +0200
committerBram Moolenaar <Bram@vim.org>2013-08-09 20:38:26 +0200
commitb09129684b15de58bd2eea8328a8d91896f3e7d9 (patch)
treeb4ffcef6fa9ff2821c00d65806a4fcb3a39aacfa
parentf17968b54a00380d8e955bc13eb0a2ffd30ff8ea (diff)
updated for version 7.4b.021v7.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)
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index 86db5a882f..5f00c01c08 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 3add57dd98..59476e5233 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 21,
+/**/
20,
/**/
19,