diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-12-07 18:01:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 18:01:15 -0800 |
| commit | 76d1e9360ae657ae10b3f6d7f99e8c6284d9c5c2 (patch) | |
| tree | 4bbcc9c1c5fe706c94440583419779b7ae11b777 /src | |
| parent | 30ed245d008045a505a87ab21d22ada45dd1f4b5 (diff) | |
| parent | 6a4bdeb572bef8592561a3947305b6daf6857b1b (diff) | |
| download | rneovim-76d1e9360ae657ae10b3f6d7f99e8c6284d9c5c2.tar.gz rneovim-76d1e9360ae657ae10b3f6d7f99e8c6284d9c5c2.tar.bz2 rneovim-76d1e9360ae657ae10b3f6d7f99e8c6284d9c5c2.zip | |
Merge #11528 from janlazo/vim-8.1.2402
vim-patch:8.1.{2402,2408}
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/message.c | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/shared.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test49.vim | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 03cbe8ec18..067f1c3283 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1378,7 +1378,7 @@ static void msg_home_replace_attr(char_u *fname, int attr) /* * Output 'len' characters in 'str' (including NULs) with translation - * if 'len' is -1, output upto a NUL character. + * if 'len' is -1, output up to a NUL character. * Use attributes 'attr'. * Return the number of characters it takes on the screen. */ @@ -1501,7 +1501,7 @@ void msg_make(char_u *arg) } } -/// Output the string 'str' upto a NUL character. +/// Output the string 'str' up to a NUL character. /// Return the number of characters it takes on the screen. /// /// If K_SPECIAL is encountered, then it is taken in conjunction with the diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim index b0b59db686..3875ffc056 100644 --- a/src/nvim/testdir/shared.vim +++ b/src/nvim/testdir/shared.vim @@ -314,6 +314,9 @@ func RunVimPiped(before, after, arguments, pipecmd) let args .= ' -S Xafter.vim' endif + " Optionally run Vim under valgrind + " let cmd = 'valgrind --tool=memcheck --leak-check=yes --num-callers=25 --log-file=valgrind ' . cmd + exe "silent !" . a:pipecmd . cmd . args . ' ' . a:arguments if len(a:before) > 0 diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim index 837e55ebca..fc79f57d2e 100644 --- a/src/nvim/testdir/test49.vim +++ b/src/nvim/testdir/test49.vim @@ -178,7 +178,7 @@ endif " next Xpath value. No new Xnext value is prepared. The argument " should be 2^(n-1) for the nth Xloop command inside the loop. " If the loop has only one Xloop command, the argument can be -" ommitted (default: 1). +" omitted (default: 1). " " - Use XloopNEXT before ":continue" and ":endwhile". This computes a new " Xnext value for the next execution of the loop by multiplying the old |