summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-02-24 03:38:04 +0000
committerBram Moolenaar <Bram@vim.org>2009-02-24 03:38:04 +0000
commit51306d2d8fb9ff4f0d3bb1826bde81b287bf95d4 (patch)
treea296e41b9d89ee033c0f916e0af27bc217f57c98
parentde0dfed7013f5c40b3ef9fb448edb7fa6ab65bb4 (diff)
updated for version 7.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 66bab9e923..ffa45a1999 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 8189b43905..6877f67cd0 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,