From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 7 Apr 2017 14:17:39 +0000 (+0200)
Subject: patch 8.0.0547: extra line break in verbosefile
X-Git-Tag: v8.0.0547
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52604f2454e5369f861d3ce34764f74a0999c773;p=thirdparty%2Fvim.git

patch 8.0.0547: extra line break in verbosefile

Problem:    Extra line break in verbosefile when using ":echomsg". (Ingo
            Karkat)
Solution:   Don't call msg_start(). (closes #1618)
---

diff --git a/src/eval.c b/src/eval.c
index 261ece85c5..5f589eb0b8 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8328,7 +8328,6 @@ ex_execute(exarg_T *eap)
 	     * follows is displayed on a new line when scrolling back at the
 	     * more prompt. */
 	    msg_sb_eol();
-	    msg_start();
 	}
 
 	if (eap->cmdidx == CMD_echomsg)
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 1b0597e648..3295912397 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -412,4 +412,14 @@ func Test_getcmdtype()
   cunmap <F6>
 endfunc
 
+func Test_verbosefile()
+  set verbosefile=Xlog
+  echomsg 'foo'
+  echomsg 'bar'
+  set verbosefile=
+  let log = readfile('Xlog')
+  call assert_match("foo\nbar", join(log, "\n"))
+  call delete('Xlog')
+endfunc
+
 set cpo&
diff --git a/src/version.c b/src/version.c
index 8f50ac5a58..12cf4841a5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    547,
 /**/
     546,
 /**/