summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-04-07 16:17:39 +0200
committerBram Moolenaar <Bram@vim.org>2017-04-07 16:17:39 +0200
commit52604f2454e5369f861d3ce34764f74a0999c773 (patch)
tree8a0f8e1c5ab99f88e72b123e56adf2b1bb35d973
parent3bab93998d01a01b7f2a071fa3b8054bb0094625 (diff)
patch 8.0.0547: extra line break in verbosefilev8.0.0547
Problem: Extra line break in verbosefile when using ":echomsg". (Ingo Karkat) Solution: Don't call msg_start(). (closes #1618)
-rw-r--r--src/eval.c1
-rw-r--r--src/testdir/test_cmdline.vim10
-rw-r--r--src/version.c2
3 files changed, 12 insertions, 1 deletions
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
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 547,
+/**/
546,
/**/
545,