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 261ece85c577b1de5ef5fd7152d6144533685cc5..5f589eb0b8742e518f5502d1db39f771f6c39ecf 100644 (file)
--- 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 1b0597e648ddf3db3fa2a115e3376f5dbd87342b..329591239782dc429367e9bd7ecee06ac60ce3bc 100644 (file)
--- 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 8f50ac5a58edec516a276c4b45cf6098a018f388..12cf4841a5f81c71e914e4e834fb86b1d63f282f 100644 (file)
--- 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,
 /**/