# HG changeset patch # User Bram Moolenaar # Date 1575667804 -3600 # Node ID eff8d8f72a82bbe37db0b9f808556762be389b1a # Parent ac753285efc23e70bbde704ac24d12162130005b patch 8.1.2402: typos and other small things Commit: https://github.com/vim/vim/commit/f48ee3c28488f7c361732316f905ac420b3d8087 Author: Bram Moolenaar Date: Fri Dec 6 22:18:20 2019 +0100 patch 8.1.2402: typos and other small things Problem: Typos and other small things. Solution: Small fixes. diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ nbproject/* # Mac OSX src/xxd/xxd.dSYM +.DS_Store # All platforms *.rej diff --git a/src/Makefile b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -413,9 +413,11 @@ CClink = $(CC) # MZSCHEME # Uncomment this when you want to include the MzScheme interface. +# You may have to build racket from source to make this work. # NOTE: does not work well together with valgrind. #CONF_OPT_MZSCHEME = --enable-mzschemeinterp # PLT/mrscheme/drscheme Home dir; the PLTHOME environment variable also works +#CONF_OPT_PLTHOME = --with-plthome=/usr/local #CONF_OPT_PLTHOME = --with-plthome=/usr/local/plt #CONF_OPT_PLTHOME = --with-plthome=/usr/local/drscheme #CONF_OPT_PLTHOME = --with-plthome=/home/me/mz @@ -612,7 +614,7 @@ CClink = $(CC) # Use this with GCC to check for mistakes, unused arguments, etc. # Note: If you use -Wextra and get warnings in GTK code about function # parameters, you can add -Wno-cast-function-type -#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 +#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -Wno-cast-function-type -Wno-deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 # Add -Wpedantic to find // comments and other C99 constructs. # Better disable Perl and Python to avoid a lot of warnings. #CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 diff --git a/src/message.c b/src/message.c --- a/src/message.c +++ b/src/message.c @@ -1455,7 +1455,7 @@ msg_home_replace_attr(char_u *fname, int /* * 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. */ @@ -1599,7 +1599,7 @@ msg_make(char_u *arg) #endif /* - * 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/testdir/shared.vim b/src/testdir/shared.vim --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -315,6 +315,9 @@ func RunVimPiped(before, after, argument 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/testdir/test49.vim b/src/testdir/test49.vim --- a/src/testdir/test49.vim +++ b/src/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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2402, +/**/ 2401, /**/ 2400,