Merge #8584 from janlazo/vim-8.0.0467

This commit is contained in:
Justin M. Keyes 2018-06-19 10:46:47 +02:00 committed by GitHub
commit 9500448220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions

View File

@ -19528,6 +19528,13 @@ void ex_execute(exarg_T *eap)
} }
if (ret != FAIL && ga.ga_data != NULL) { 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();
}
if (eap->cmdidx == CMD_echomsg) { if (eap->cmdidx == CMD_echomsg) {
MSG_ATTR(ga.ga_data, echo_attr); MSG_ATTR(ga.ga_data, echo_attr);
ui_flush(); ui_flush();

View File

@ -430,4 +430,14 @@ func Test_getcmdtype()
cunmap <F6> cunmap <F6>
endfunc 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& set cpo&