diff options
| -rw-r--r-- | src/message.c | 20 | ||||
| -rw-r--r-- | src/testdir/test_startup.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 9 deletions
diff --git a/src/message.c b/src/message.c index f2fe23b582..cb713d7210 100644 --- a/src/message.c +++ b/src/message.c @@ -2751,19 +2751,21 @@ msg_puts_printf(char_u *str, int maxlen) if (*p != NUL && !(silent_mode && p_verbose == 0)) { - int c = -1; + char_u *tofree = NULL; if (maxlen > 0 && STRLEN(p) > (size_t)maxlen) { - c = p[maxlen]; - p[maxlen] = 0; + tofree = vim_strnsave(p, (size_t)maxlen); + p = tofree; + } + if (p != NULL) + { + if (info_message) + mch_msg((char *)p); + else + mch_errmsg((char *)p); + vim_free(tofree); } - if (info_message) - mch_msg((char *)p); - else - mch_errmsg((char *)p); - if (c != -1) - p[maxlen] = c; } msg_didout = TRUE; // assume that line is not empty diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 3cb5a2deb6..c65b18cc26 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -1301,4 +1301,18 @@ func Test_write_in_vimrc() call delete('Xvimrc') endfunc +func Test_echo_true_in_cmd() + let lines =<< trim END + echo v:true + call writefile(['done'], 'Xresult') + END + call writefile(lines, 'Xscript') + if RunVim([], [], '--cmd "source Xscript" --c q') + call assert_equal(['done'], readfile('Xresult')) + endif + call delete('Xscript') + call delete('Xresult') + +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 21f5b53734..caba20ae36 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3006, +/**/ 3005, /**/ 3004, |