From 56f99550444949e12eca4a31ee60be91b2ab3a6e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Apr 2018 20:06:05 +0200 Subject: [PATCH 1/5] patch 8.0.1700: coverage statistics still don't work on coveralls Problem: Coverate statistics still don't work on coveralls. Solution: Exclude the xxd directory again. --- .travis.yml | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 264052d570..60e7604621 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,7 +108,7 @@ script: - if [ -n "$err" ]; then exit 1; fi after_success: - - if [ "$COVERAGE" = "yes" ]; then ~/.local/bin/coveralls -b ${SRCDIR} -x .xs -i ${SRCDIR}/xxd -e ${SRCDIR}/if_perl.c --encodings utf-8 latin-1 EUC-KR; fi + - if [ "$COVERAGE" = "yes" ]; then ~/.local/bin/coveralls -b ${SRCDIR} -x .xs -e ${SRCDIR}/xxd -e ${SRCDIR}/if_perl.c --encodings utf-8 latin-1 EUC-KR; fi - if [ "$COVERAGE" = "yes" ]; then cd ${SRCDIR} && bash <(curl -s https://codecov.io/bash) ; fi # vim:set sts=2 sw=2 tw=0 et: diff --git a/src/version.c b/src/version.c index 5f352cf48c..5386fc5da2 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1700, /**/ 1699, /**/ From cccd62d435097814ea93e384920443fb2419e663 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Apr 2018 20:23:48 +0200 Subject: [PATCH 2/5] patch 8.0.1701: can disable COLOR_EMOJI with MSVC but not MinGW Problem: Can disable COLOR_EMOJI with MSVC but not MinGW. Solution: Add COLOR_EMOJI flag. Also add some empty lines for readability. --- src/Make_cyg_ming.mak | 42 ++++++++++++++++++++++++++++++++---------- src/version.c | 2 ++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index cefc430b29..81dd9378f6 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -28,52 +28,71 @@ # Updated 2014 Oct 13. #>>>>> choose options: -# set to yes for a debug build -DEBUG=no -# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization -OPTIMIZE=MAXSPEED -# set to yes to make gvim, no for vim -GUI=yes -# set to no if you do not want to use DirectWrite (DirectX) -# MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. -DIRECTX=yes # FEATURES=[TINY | SMALL | NORMAL | BIG | HUGE] # Set to TINY to make minimal version (few features). FEATURES=HUGE + +# set to yes for a debug build +DEBUG=no + +# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization +OPTIMIZE=MAXSPEED + +# set to yes to make gvim, no for vim +GUI=yes + +# set to no if you do not want to use DirectWrite (DirectX) +# MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. +DIRECTX=yes + +# Disable Color emoji support +# (default is yes if DIRECTX=yes, requires WinSDK 8.1 or later.) +#COLOR_EMOJI=no + # Set to one of i386, i486, i586, i686 as the minimum target processor. # For amd64/x64 architecture set ARCH=x86-64 . # If not set, it will be automatically detected. (Normally i686 or x86-64.) #ARCH=i686 # Set to yes to cross-compile from unix; no=native Windows (and Cygwin). CROSS=no + # Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'. # Use "yes" when the path does not need to be define. #ICONV="." ICONV=yes GETTEXT=yes + # Set to yes to include multibyte support. MBYTE=yes + # Set to yes to include IME support. IME=yes DYNAMIC_IME=yes + # Set to yes to enable writing a postscript file with :hardcopy. POSTSCRIPT=no + # Set to yes to enable OLE support. OLE=no + # Set the default $(WINVER) to make it work with WinXP. ifndef WINVER WINVER = 0x0501 endif + # Set to yes to enable Cscope support. CSCOPE=yes + # Set to yes to enable Netbeans support (requires CHANNEL). NETBEANS=$(GUI) + # Set to yes to enable inter process communication. ifeq (HUGE, $(FEATURES)) CHANNEL=yes else CHANNEL=$(GUI) endif + # Set to yes to enable terminal support. ifeq (HUGE, $(FEATURES)) TERMINAL=yes @@ -588,7 +607,10 @@ endif ifeq ($(DIRECTX),yes) # Only allow DirectWrite for a GUI build. ifeq (yes, $(GUI)) -DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX -DFEAT_DIRECTX_COLOR_EMOJI +DEFINES += -DFEAT_DIRECTX -DDYNAMIC_DIRECTX +ifneq ($(COLOR_EMOJI),no) +DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI +endif endif endif diff --git a/src/version.c b/src/version.c index 5386fc5da2..2b0105b0b5 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1701, /**/ 1700, /**/ From ee5b94a8ecbaeafa11c7c7c8cf7bef765fbea912 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Apr 2018 20:35:05 +0200 Subject: [PATCH 3/5] patch 8.0.1702: leaking memory when autocommands make quickfix list invalid Problem: Leaking memory when autocommands make a quickfix list invalid. Solution: Call FreeWild(). (Yegappan Lakshmanan) --- src/quickfix.c | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/quickfix.c b/src/quickfix.c index 8c1df17938..c370761bf2 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -4556,7 +4556,10 @@ ex_vimgrep(exarg_T *eap) /* Check whether the quickfix list is still valid. When loading a * buffer above, autocommands might have changed the quickfix list. */ if (!vgr_qflist_valid(wp, qi, save_qfid, *eap->cmdlinep)) + { + FreeWild(fcount, fnames); goto theend; + } save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; if (buf == NULL) diff --git a/src/version.c b/src/version.c index 2b0105b0b5..035f68c31d 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1702, /**/ 1701, /**/ From 527dec3f94c72096bf6baf4bb71f1a21dc7df89c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Apr 2018 20:36:43 +0200 Subject: [PATCH 4/5] patch 8.0.1703: in the tutor 'showcmd' is not set Problem: In the tutor 'showcmd' is not set. Solution: Set 'showcmd' in the vimtutor script. (Ken Takata, closes #2792) --- src/version.c | 2 ++ src/vimtutor | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/version.c b/src/version.c index 035f68c31d..fdaa1dc6cc 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1703, /**/ 1702, /**/ diff --git a/src/vimtutor b/src/vimtutor index e53201df58..1e8769b257 100755 --- a/src/vimtutor +++ b/src/vimtutor @@ -70,5 +70,5 @@ fi # The script tutor.vim tells Vim which file to copy $VIM -f -u NONE -c 'so $VIMRUNTIME/tutor/tutor.vim' -# Start vim without any .vimrc, set 'nocompatible' -$VIM -f -u NONE -c "set nocp" $TUTORCOPY +# Start vim without any .vimrc, set 'nocompatible' and 'showcmd' +$VIM -f -u NONE -c "set nocp showcmd" $TUTORCOPY From b8e22a053b68774dfd86fd829d9dba2333f09c05 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Apr 2018 21:37:34 +0200 Subject: [PATCH 5/5] patch 8.0.1704: 'backupskip' default doesn't work for Mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: 'backupskip' default doesn't work for Mac. Solution: Use "/private/tmp". (Rainer Müller, closes #2793) --- runtime/doc/options.txt | 4 +++- src/option.c | 4 ++++ src/testdir/test_options.vim | 16 ++++++++++++++++ src/version.c | 2 ++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 93efaec16d..cc19e253de 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1087,7 +1087,9 @@ A jump table for the options with a short description can be found at |Q_op|. < Use 'backupdir' to put the backup in a different directory. *'backupskip'* *'bsk'* -'backupskip' 'bsk' string (default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*") +'backupskip' 'bsk' string (default: "$TMPDIR/*,$TMP/*,$TEMP/*" + Unix: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*" + Mac: "/private/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*") global {not in Vi} {not available when compiled without the |+wildignore| diff --git a/src/option.c b/src/option.c index 48432bb322..5ef346c8d4 100644 --- a/src/option.c +++ b/src/option.c @@ -3367,7 +3367,11 @@ set_init_1(int clean_arg) mustfree = FALSE; # ifdef UNIX if (*names[n] == NUL) +# ifdef MACOS_X + p = (char_u *)"/private/tmp"; +# else p = (char_u *)"/tmp"; +# endif else # endif p = vim_getenv((char_u *)names[n], &mustfree); diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim index 5d2033a5df..0f2908fcb3 100644 --- a/src/testdir/test_options.vim +++ b/src/testdir/test_options.vim @@ -332,3 +332,19 @@ func Test_set_indentexpr() call assert_equal('', &indentexpr) bwipe! endfunc + +func Test_backupskip() + if has("mac") + call assert_match('/private/tmp/\*', &bsk) + elseif has("unix") + call assert_match('/tmp/\*', &bsk) + endif + + let bskvalue = substitute(&bsk, '\\', '/', 'g') + for var in ['$TEMPDIR', '$TMP', '$TEMP'] + if exists(var) + let varvalue = substitute(expand(var), '\\', '/', 'g') + call assert_match(varvalue . '.\*', bskvalue) + endif + endfor +endfunc diff --git a/src/version.c b/src/version.c index fdaa1dc6cc..8d7049d5fd 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1704, /**/ 1703, /**/