summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-22 22:43:27 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-22 22:43:27 +0000
commitfa47a9218dc4d0913200b4f8225cbfde1f2fe13b (patch)
tree0b2ac413d4cb9e09568ec13d655bb044aab6bbcb
parent87e817c58618c461c2bb7aa6ca927bb8f4a82ee2 (diff)
downloadvim-git-7.2.123.tar.gz
updated for version 7.2-123v7.2.123
-rw-r--r--src/getchar.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 081368d02..0947f35fe 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3816,7 +3816,11 @@ showmap(mp, local)
int len = 1;
if (msg_didout || msg_silent != 0)
+ {
msg_putchar('\n');
+ if (got_int) /* 'q' typed at MORE prompt */
+ return;
+ }
if ((mp->m_mode & (INSERT + CMDLINE)) == INSERT + CMDLINE)
msg_putchar('!'); /* :map! */
else if (mp->m_mode & INSERT)
diff --git a/src/version.c b/src/version.c
index d324ae378..5d775b4cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 123,
+/**/
122,
/**/
121,