summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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,