From 84970bafd4bd6041db5560d10eba468217887bf3 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Mon, 18 Jun 2018 08:37:52 -0400
Subject: [PATCH] vim-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 vim/vim#1618)
https://github.com/vim/vim/commit/52604f2454e5369f861d3ce34764f74a0999c773
---
 src/nvim/eval.c                   |  1 -
 src/nvim/testdir/test_cmdline.vim | 10 ++++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index b8cc8fef6e..a7773e7c5e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -19533,7 +19533,6 @@ void 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/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index a998bd90f1..5a43838218 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -430,4 +430,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&