# HG changeset patch
# User vimboss
# Date 1235342607 0
# Node ID 1a040c25c44485c85e838a7530051f6d4f9793a2
# Parent  3af28ecf9e56315a8617b2c58da078b6df989f2c
updated for version 7.2-123

diff --git a/src/getchar.c b/src/getchar.c
--- 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
--- 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,