summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2009-02-24 03:38:04 +0000
committervimboss <devnull@localhost>2009-02-24 03:38:04 +0000
commit776420ee982a9a707450f9249cf61fa73ba970a5 (patch)
treea296e41b9d89ee033c0f916e0af27bc217f57c98
parent9b1a9cfc01606e3e324f556fb842173c1758a199 (diff)
downloadvim-776420ee982a9a707450f9249cf61fa73ba970a5.tar.gz
updated for version 7.2-127v7.2.127v7-2-127
-rw-r--r--src/message.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index 66bab9e9..ffa45a19 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2553,7 +2553,6 @@ do_more_prompt(typed_char)
{
/* Jump to the choices of the dialog. */
retval = TRUE;
- lines_left = Rows - 1;
}
else
#endif
@@ -2561,6 +2560,9 @@ do_more_prompt(typed_char)
got_int = TRUE;
quit_more = TRUE;
}
+ /* When there is some more output (wrapping line) display that
+ * without another prompt. */
+ lines_left = Rows - 1;
break;
#ifdef FEAT_CLIPBOARD
diff --git a/src/version.c b/src/version.c
index 8189b439..6877f67c 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 */
/**/
+ 127,
+/**/
126,
/**/
125,