From 5d8594f63640e62cd5f3535f1a0e22fbbe8f54aa Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Mon, 18 Jun 2018 08:34:11 -0400
Subject: vim-patch:8.0.0467: using g< after :for does not show the right
 output

Problem:    Using g< after :for does not show the right output. (Marcin
            Szamotulski)
Solution:   Call msg_sb_eol() in :echomsg.
https://github.com/vim/vim/commit/57002ad70c4c32f3afefec24994a974cf3eef3ad
---
 src/nvim/eval.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d8d785395c..b8cc8fef6e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -19528,6 +19528,14 @@ void ex_execute(exarg_T *eap)
   }
 
   if (ret != FAIL && ga.ga_data != NULL) {
+    if (eap->cmdidx == CMD_echomsg || eap->cmdidx == CMD_echoerr) {
+      // Mark the already saved text as finishing the line, so that what
+      // follows is displayed on a new line when scrolling back at the
+      // more prompt.
+      msg_sb_eol();
+      msg_start();
+    }
+
     if (eap->cmdidx == CMD_echomsg) {
       MSG_ATTR(ga.ga_data, echo_attr);
       ui_flush();
-- 
cgit 


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: 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(-)

(limited to 'src')

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&
-- 
cgit