From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 23 Mar 2012 14:18:24 +0000 (+0100)
Subject: updated for version 7.3.477
X-Git-Tag: v7.3.477
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12b0290d42efe9b6cf93f2903f12d76a100c60cb;p=thirdparty%2Fvim.git

updated for version 7.3.477
Problem:    Using ":echo" to output enough lines to scroll, then using "j" and
            "k" at the more prompt, displays the command on top of the output.
            (Marcin Szamotulski)
Solution:   Put the output below the command. (Christian Brabandt)
---

diff --git a/src/eval.c b/src/eval.c
index 1056422655..13e520b6db 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -20492,7 +20492,12 @@ ex_echo(eap)
 		/* Call msg_start() after eval1(), evaluating the expression
 		 * may cause a message to appear. */
 		if (eap->cmdidx == CMD_echo)
+		{
+		    /* Put the output below the command, makes scrolling back
+		     * at more prompt work. */
+		    msg_didout = TRUE;
 		    msg_start();
+		}
 	    }
 	    else if (eap->cmdidx == CMD_echo)
 		msg_puts_attr((char_u *)" ", echo_attr);
diff --git a/src/version.c b/src/version.c
index f6250cdab6..170784c983 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    477,
 /**/
     476,
 /**/