Skip to content

Commit f1d0ecd

Browse files
splhacksplhack
committed
Merge remote-tracking branch 'vim/master'
2 parents e387a4c + 35be453 commit f1d0ecd

File tree

8 files changed

+72
-45
lines changed

8 files changed

+72
-45
lines changed

‎src/Make_mvc.mak‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,20 +211,24 @@ OBJDIR = $(OBJDIR)d
211211
! ifdef CPU
212212
ASSEMBLY_ARCHITECTURE=$(CPU)
213213
# Using I386 for $ASSEMBLY_ARCHITECTURE doesn't work for VC7.
214-
! if ("$(ASSEMBLY_ARCHITECTURE)" == "i386") || ("$(ASSEMBLY_ARCHITECTURE)" == "I386")
215-
ASSEMBLY_ARCHITECTURE = x86
216-
! endif
217-
! else
218-
CPU = $(PROCESSOR_ARCHITECTURE)
219-
ASSEMBLY_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
220-
! if ("$(CPU)" == "x86") || ("$(CPU)" == "X86")
214+
! if "$(CPU)" == "I386"
221215
CPU = i386
222216
! endif
217+
! else # !CPU
218+
CPU = i386
219+
! ifdef PLATFORM
220+
! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
221+
CPU = AMD64
222+
! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
223+
! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
224+
! endif
225+
! endif # !PLATFORM
223226
! endif
224227
!else # !PROCESSOR_ARCHITECTURE
225228
# We're on Windows 95
226229
CPU = i386
227230
!endif # !PROCESSOR_ARCHITECTURE
231+
ASSEMBLY_ARCHITECTURE=$(CPU)
228232
OBJDIR = $(OBJDIR)$(CPU)
229233

230234
# Build a retail version by default
@@ -415,7 +419,7 @@ CPUARG =
415419
!endif
416420
!else
417421
# VC8/9/10 only allows specifying SSE architecture but only for 32bit
418-
!if "$(ASSEMBLY_ARCHITECTURE)" == "x86" && "$(CPUNR)" == "pentium4"
422+
!if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && "$(CPUNR)" == "pentium4"
419423
CPUARG = /arch:SSE2
420424
!endif
421425
!endif

‎src/auto/configure‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5064,7 +5064,7 @@ $as_echo "$vi_cv_version_plain_lua" >&6; }
50645064
if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then
50655065
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5
50665066
$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; }
5067-
if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then
5067+
if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then
50685068
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
50695069
$as_echo "yes" >&6; }
50705070
LUA_INC=/luajit-$vi_cv_version_luajit
@@ -5073,15 +5073,15 @@ $as_echo "yes" >&6; }
50735073
if test "X$LUA_INC" = "X"; then
50745074
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
50755075
$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
5076-
if test -f $vi_cv_path_lua_pfx/include/lua.h; then
5076+
if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then
50775077
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
50785078
$as_echo "yes" >&6; }
50795079
else
50805080
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
50815081
$as_echo "no" >&6; }
50825082
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
50835083
$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
5084-
if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
5084+
if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then
50855085
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
50865086
$as_echo "yes" >&6; }
50875087
LUA_INC=/lua$vi_cv_version_lua
@@ -5332,7 +5332,7 @@ $as_echo "$vi_cv_path_mzscheme_pfx" >&6; }
53325332
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
53335333
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
53345334
$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; }
5335-
if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
5335+
if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then
53365336
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
53375337
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
53385338
$as_echo "yes" >&6; }
@@ -5341,7 +5341,7 @@ $as_echo "yes" >&6; }
53415341
$as_echo "no" >&6; }
53425342
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5
53435343
$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; }
5344-
if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
5344+
if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then
53455345
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
53465346
$as_echo "yes" >&6; }
53475347
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
@@ -5350,7 +5350,7 @@ $as_echo "yes" >&6; }
53505350
$as_echo "no" >&6; }
53515351
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
53525352
$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; }
5353-
if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
5353+
if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then
53545354
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
53555355
$as_echo "yes" >&6; }
53565356
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
@@ -5419,16 +5419,16 @@ $as_echo "no" >&6; }
54195419

54205420
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5
54215421
$as_echo_n "checking for racket collects directory... " >&6; }
5422-
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
5422+
if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then
54235423
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
54245424
else
5425-
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
5425+
if test -d "$vi_cv_path_mzscheme_pfx/lib/racket/collects"; then
54265426
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
54275427
else
5428-
if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
5428+
if test -d "$vi_cv_path_mzscheme_pfx/share/racket/collects"; then
54295429
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
54305430
else
5431-
if test -d $vi_cv_path_mzscheme_pfx/collects; then
5431+
if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
54325432
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
54335433
fi
54345434
fi
@@ -6912,7 +6912,7 @@ fi
69126912
if test "X$vi_cv_path_tcl" != "X"; then
69136913
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5
69146914
$as_echo_n "checking Tcl version... " >&6; }
6915-
if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then
6915+
if echo 'exit [expr [info tclversion] < 8.0]' | "$vi_cv_path_tcl" - ; then
69166916
tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
69176917
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5
69186918
$as_echo "$tclver - OK" >&6; };
@@ -6949,10 +6949,10 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
69496949
tclcnf="/System/Library/Frameworks/Tcl.framework"
69506950
fi
69516951
for try in $tclcnf; do
6952-
if test -f $try/tclConfig.sh; then
6952+
if test -f "$try/tclConfig.sh"; then
69536953
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
69546954
$as_echo "$try/tclConfig.sh" >&6; }
6955-
. $try/tclConfig.sh
6955+
. "$try/tclConfig.sh"
69566956
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
69576957
TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
69586958
break
@@ -6969,10 +6969,10 @@ $as_echo_n "checking for Tcl library by myself... " >&6; }
69696969
for ver in "" $tclver ; do
69706970
for try in $tcllib ; do
69716971
trylib=tcl$ver$ext
6972-
if test -f $try/lib$trylib ; then
6972+
if test -f "$try/lib$trylib" ; then
69736973
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5
69746974
$as_echo "$try/lib$trylib" >&6; }
6975-
TCL_LIBS="-L$try -ltcl$ver -ldl -lm"
6975+
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
69766976
if test "`(uname) 2>/dev/null`" = SunOS &&
69776977
uname -r | grep '^5' >/dev/null; then
69786978
TCL_LIBS="$TCL_LIBS -R $try"

‎src/configure.in‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -565,19 +565,19 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
565565
fi
566566
if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then
567567
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit)
568-
if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then
568+
if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then
569569
AC_MSG_RESULT(yes)
570570
LUA_INC=/luajit-$vi_cv_version_luajit
571571
fi
572572
fi
573573
if test "X$LUA_INC" = "X"; then
574574
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
575-
if test -f $vi_cv_path_lua_pfx/include/lua.h; then
575+
if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then
576576
AC_MSG_RESULT(yes)
577577
else
578578
AC_MSG_RESULT(no)
579579
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
580-
if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
580+
if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then
581581
AC_MSG_RESULT(yes)
582582
LUA_INC=/lua$vi_cv_version_lua
583583
else
@@ -753,19 +753,19 @@ if test "$enable_mzschemeinterp" = "yes"; then
753753
SCHEME_INC=
754754
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
755755
AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include)
756-
if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
756+
if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then
757757
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
758758
AC_MSG_RESULT(yes)
759759
else
760760
AC_MSG_RESULT(no)
761761
AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt)
762-
if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
762+
if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then
763763
AC_MSG_RESULT(yes)
764764
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
765765
else
766766
AC_MSG_RESULT(no)
767767
AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket)
768-
if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
768+
if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then
769769
AC_MSG_RESULT(yes)
770770
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
771771
else
@@ -828,16 +828,16 @@ if test "$enable_mzschemeinterp" = "yes"; then
828828
fi
829829

830830
AC_MSG_CHECKING(for racket collects directory)
831-
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
831+
if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then
832832
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
833833
else
834-
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
834+
if test -d "$vi_cv_path_mzscheme_pfx/lib/racket/collects"; then
835835
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
836836
else
837-
if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
837+
if test -d "$vi_cv_path_mzscheme_pfx/share/racket/collects"; then
838838
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
839839
else
840-
if test -d $vi_cv_path_mzscheme_pfx/collects; then
840+
if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
841841
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
842842
fi
843843
fi
@@ -1698,7 +1698,7 @@ if test "$enable_tclinterp" = "yes"; then
16981698
fi
16991699
if test "X$vi_cv_path_tcl" != "X"; then
17001700
AC_MSG_CHECKING(Tcl version)
1701-
if echo 'exit [[expr [info tclversion] < 8.0]]' | $vi_cv_path_tcl - ; then
1701+
if echo 'exit [[expr [info tclversion] < 8.0]]' | "$vi_cv_path_tcl" - ; then
17021702
tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -`
17031703
AC_MSG_RESULT($tclver - OK);
17041704
tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
@@ -1732,9 +1732,9 @@ if test "$enable_tclinterp" = "yes"; then
17321732
tclcnf="/System/Library/Frameworks/Tcl.framework"
17331733
fi
17341734
for try in $tclcnf; do
1735-
if test -f $try/tclConfig.sh; then
1735+
if test -f "$try/tclConfig.sh"; then
17361736
AC_MSG_RESULT($try/tclConfig.sh)
1737-
. $try/tclConfig.sh
1737+
. "$try/tclConfig.sh"
17381738
dnl use eval, because tcl 8.2 includes ${TCL_DBGX}
17391739
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
17401740
dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the
@@ -1752,9 +1752,9 @@ if test "$enable_tclinterp" = "yes"; then
17521752
for ver in "" $tclver ; do
17531753
for try in $tcllib ; do
17541754
trylib=tcl$ver$ext
1755-
if test -f $try/lib$trylib ; then
1755+
if test -f "$try/lib$trylib" ; then
17561756
AC_MSG_RESULT($try/lib$trylib)
1757-
TCL_LIBS="-L$try -ltcl$ver -ldl -lm"
1757+
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
17581758
if test "`(uname) 2>/dev/null`" = SunOS &&
17591759
uname -r | grep '^5' >/dev/null; then
17601760
TCL_LIBS="$TCL_LIBS -R $try"

‎src/fileio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/* Is there any system that doesn't have access()? */
2828
#define USE_MCH_ACCESS
2929

30-
#if defined(sun) && defined(S_ISCHR)
30+
#if (defined(sun) || defined(__FreeBSD__)) && defined(S_ISCHR)
3131
# define OPEN_CHR_FILES
3232
static int is_dev_fd_file(char_u *fname);
3333
#endif

‎src/option.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3352,8 +3352,8 @@ set_init_1()
33523352
if (opt_idx >= 0)
33533353
{
33543354
#if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM)
3355-
if ((long)options[opt_idx].def_val[VI_DEFAULT] > (long)n
3356-
|| (long)options[opt_idx].def_val[VI_DEFAULT] == 0L)
3355+
if ((long)(long_i)options[opt_idx].def_val[VI_DEFAULT] > (long)n
3356+
|| (long)(long_i)options[opt_idx].def_val[VI_DEFAULT] == 0L)
33573357
#endif
33583358
options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n;
33593359
}

‎src/testdir/test86.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ EOF
370370
:sleep 1
371371
:py t.running = False
372372
:py t.join()
373-
:py l[0] = t.t > 8 # check if the background thread is working
373+
:py l[0] = t.t > 7 # check if the background thread is working
374374
:py del time
375375
:py del threading
376376
:py del t

‎src/testdir/test87.in‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ EOF
367367
:sleep 1
368368
:py3 t.running = False
369369
:py3 t.join()
370-
:py3 l[0] = t.t > 8 # check if the background thread is working
370+
:py3 l[0] = t.t > 7 # check if the background thread is working
371371
:py3 del time
372372
:py3 del threading
373373
:py3 del t
@@ -910,8 +910,19 @@ fnamemodify = vim.Function('fnamemodify')
910910
cb.append(str(fnamemodify('.', ':p:h:t')))
911911
cb.append(vim.eval('@%'))
912912
os.chdir('..')
913-
cb.append(str(fnamemodify('.', ':p:h:t')))
914-
cb.append(vim.eval('@%').replace(os.path.sep, '/'))
913+
path = fnamemodify('.', ':p:h:t')
914+
if path != b'src':
915+
# Running tests from a shadow directory, so move up another level
916+
# This will result in @% looking like shadow/testdir/test87.in, hence the
917+
# slicing to remove the leading path and path separator
918+
os.chdir('..')
919+
cb.append(str(fnamemodify('.', ':p:h:t')))
920+
cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/'))
921+
os.chdir(path)
922+
else:
923+
cb.append(str(fnamemodify('.', ':p:h:t')))
924+
cb.append(vim.eval('@%').replace(os.path.sep, '/'))
925+
del path
915926
os.chdir('testdir')
916927
cb.append(str(fnamemodify('.', ':p:h:t')))
917928
cb.append(vim.eval('@%'))

‎src/version.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,18 @@ static char *(features[]) =
756756

757757
static int included_patches[] =
758758
{ /* Add new patch number below this line */
759+
/**/
760+
969,
761+
/**/
762+
968,
763+
/**/
764+
967,
765+
/**/
766+
966,
767+
/**/
768+
965,
769+
/**/
770+
964,
759771
/**/
760772
963,
761773
/**/

0 commit comments

Comments
 (0)