Skip to content

Commit fbe364d

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents bc5505e + a6c0760 commit fbe364d

File tree

228 files changed

+2221
-1311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

228 files changed

+2221
-1311
lines changed

‎.travis.yml‎

Lines changed: 62 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,71 @@ compiler:
99
- clang
1010

1111
env:
12-
- MACOSX_DEPLOYMENT_TARGET=10.8
13-
VERSIONER_PERL_VERSION=5.16
14-
VERSIONER_PYTHON_VERSION=2.7
15-
vi_cv_path_python=/usr/bin/python
16-
vi_cv_path_python3=/usr/local/bin/python3
17-
vi_cv_path_plain_lua=/usr/local/bin/lua
18-
vi_cv_dll_name_perl=/System/Library/Perl/5.16/darwin-thread-multi-2level/CORE/libperl.dylib
19-
vi_cv_dll_name_python=/System/Library/Frameworks/Python.framework/Versions/2.7/Python
20-
vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.6/Python
21-
VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
22-
"CONFOPT='--with-features=huge --enable-multibyte --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-perlinterp=dynamic --enable-pythoninterp=dynamic --enable-python3interp=dynamic --enable-rubyinterp=dynamic --enable-luainterp=dynamic --with-lua-prefix=/usr/local --enable-gui=macvim'"
12+
- BUILD=yes TEST=scripttests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
13+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
14+
- BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
15+
- BUILD=yes TEST=test COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow CHECK_AUTOCONF=no
16+
- BUILD=yes TEST=test COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
17+
- BUILD=yes TEST=test COVERAGE=no FEATURES=tiny CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
18+
# Mac OSX build
19+
- BUILD=yes TEST=test COVERAGE=no FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
20+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
21+
# ASAN build
22+
- BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
23+
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
24+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
2325

2426
sudo: false
2527

28+
# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env),
29+
# exclude some builds on mac os x and linux
30+
# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env
31+
matrix:
32+
exclude:
33+
- os: osx
34+
env: BUILD=yes TEST=test COVERAGE=no FEATURES=normal CONFOPT= SHADOWOPT="-C src/shadow" SRCDIR=./src/shadow CHECK_AUTOCONF=no
35+
- os: osx
36+
env: BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
37+
- os: osx
38+
env: BUILD=yes TEST=test COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
39+
- os: osx
40+
env: BUILD=yes TEST=scripttests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
41+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
42+
- os: osx
43+
env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
44+
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
45+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
46+
- os: linux
47+
compiler: gcc
48+
env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
49+
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
50+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
51+
- os: linux
52+
compiler: clang
53+
env: BUILD=no TEST=unittests COVERAGE=yes CFLAGS=--coverage LDFLAGS=--coverage FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=yes
54+
- os: linux
55+
compiler: clang
56+
env: BUILD=yes TEST=test COVERAGE=no FEATURES=small CONFOPT= SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
57+
- os: linux
58+
env: BUILD=yes TEST=test COVERAGE=no FEATURES=huge SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no
59+
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
60+
61+
branches:
62+
except:
63+
- /^v[0-9]/
64+
65+
addons:
66+
apt:
67+
packages:
68+
- autoconf
69+
- lcov
70+
- libperl-dev
71+
- python-dev
72+
- python3-dev
73+
- liblua5.1-0-dev
74+
- lua5.1
75+
- cscope
76+
2677
before_install:
2778
- brew update || brew update
2879
- brew install python3

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ MINOR = 0
120120
#
121121
# MS-Windows:
122122
# - Run make on Unix to update the ".mo" files.
123-
# - Get libintl-8.dll and libiconv-2.dll. E.g. from
123+
# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
124124
# https://mlocati.github.io/gettext-iconv-windows/ .
125+
# Use the "shared-32.zip file and extract the archive to get the files.
125126
# Put them in the top directory, "make dosrt" uses them.
126127
# - > make dossrc
127128
# > make dosrt
@@ -468,6 +469,7 @@ dosrt_files: dist prepare no_title.vim
468469
done
469470
cp libintl-8.dll dist/vim/$(VIMRTDIR)/
470471
cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
472+
cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
471473

472474

473475
# Used before uploading. Don't delete the AAPDIR/sign files!

‎nsis/gvim.nsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ SectionEnd
385385
File ${VIMRT}\libintl-8.dll
386386
File ${VIMRT}\libiconv-2.dll
387387
File /nonfatal ${VIMRT}\libwinpthread-1.dll
388+
File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
388389
SectionEnd
389390
!endif
390391

‎runtime/autoload/javascriptcomplete.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim completion script
22
" Language: Java Script
33
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
4-
" Last Change: 2006 Apr 30
4+
" Last Change: 2017 Mar 04
55

66
function! javascriptcomplete#CompleteJS(findstart, base)
77
if a:findstart
@@ -563,7 +563,7 @@ function! javascriptcomplete#CompleteJS(findstart, base)
563563
for i in arguments
564564
let g:ia = i
565565
let f_elements = matchlist(i, 'function\s\+\(\k\+\)\s*(\(.\{-}\))')
566-
if len(f_elements) == 3
566+
if len(f_elements) >= 3
567567
let b:js_menuinfo[f_elements[1].'('] = f_elements[2]
568568
endif
569569
endfor

‎runtime/compiler/bdf.vim‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
2-
" Compiler: BDF to PCF Conversion
3-
" Maintainer: Nikolai Weibull <[email protected]>
4-
" Latest Revision: 2006-04-19
2+
" Compiler: BDF to PCF Conversion
3+
" Previous Maintainer: Nikolai Weibull <[email protected]>
4+
" Latest Revision: 2006-04-19
55

66
if exists("current_compiler")
77
finish

‎runtime/compiler/gcc.vim‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
2-
" Compiler: GNU C Compiler
3-
" Maintainer: Nikolai Weibull <[email protected]>
4-
" Latest Revision: 2010-10-14
2+
" Compiler: GNU C Compiler
3+
" Previous Maintainer: Nikolai Weibull <[email protected]>
4+
" Latest Revision: 2010-10-14
55
" added line suggested by Anton Lindqvist 2016 Mar 31
66

77
if exists("current_compiler")

‎runtime/compiler/rst.vim‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
2-
" Compiler: reStructuredText Documentation Format
3-
" Maintainer: Nikolai Weibull <[email protected]>
4-
" Latest Revision: 2006-04-19
2+
" Compiler: reStructuredText Documentation Format
3+
" Previous Maintainer: Nikolai Weibull <[email protected]>
4+
" Latest Revision: 2006-04-19
55

66
if exists("current_compiler")
77
finish

0 commit comments

Comments
 (0)