Merge remote-tracking branch 'vim/master'

Author: splhack

appveyor.yml

@@ -26,9 +26,10 @@ build_script:
 test_script:
   - cd src/testdir
     # Testing with MSVC gvim
+  - path C:\Python35-x64;%PATH%
   - nmake -f Make_dos.mak VIMPROG=..\gvim
   - nmake -f Make_dos.mak clean
     # Testing with MingW console version
   - nmake -f Make_dos.mak VIMPROG=..\vim
 
-# vim: sw=2 sts=2 et ts=2 sr
+# vim: sw=2 sts=2 et ts=8 sr

src/Makefile

@@ -2044,7 +2044,6 @@ test1 \
 	test_autoformat_join \
 	test_breakindent \
 	test_changelist \
-	test_charsearch \
 	test_close_count \
 	test_command_count \
 	test_comparators \
@@ -2063,13 +2062,13 @@ test1 \
 	test11 test12 test13 test14 test15 test17 test18 test19 \
 	test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
 	test30 test31 test32 test33 test34 test36 test37 test38 test39 \
-	test40 test41 test42 test43 test44 test45 test46 test48 test49 \
+	test40 test41 test42 test43 test44 test45 test48 test49 \
 	test50 test51 test52 test53 test54 test55 test56 test57 test58 test59 \
 	test60 test64 test65 test66 test67 test68 test69 \
 	test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
-	test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
+	test80 test82 test83 test84 test85 test86 test87 test88 test89 \
 	test90 test91 test92 test93 test94 test95 test97 test98 test99 \
-	test100 test101 test102 test103 test104 test107 test108:
+	test100 test101 test103 test104 test107 test108:
 	cd testdir; rm -f [email protected]; $(MAKE) -f Makefile [email protected] VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
 
 # Run individual NEW style test, assuming that Vim was already compiled.
@@ -2082,6 +2081,7 @@ test_arglist \
 	test_bufwintabinfo \
 	test_cdo \
 	test_channel \
+	test_charsearch \
 	test_cmdline \
 	test_cscope \
 	test_cursor_func \
@@ -2099,6 +2099,7 @@ test_arglist \
 	test_file_perm \
 	test_filter_cmd \
 	test_filter_map \
+	test_fnameescape \
 	test_fnamemodify \
 	test_glob2regpat \
 	test_gn \
@@ -2147,6 +2148,7 @@ test_arglist \
 	test_startup_utf8 \
 	test_stat \
 	test_statusline \
+	test_substitute \
 	test_syn_attr \
 	test_syntax \
 	test_tabline \

src/appveyor.bat

@@ -16,7 +16,7 @@ mingw32-make.exe -f Make_ming.mak clean
 :: with specified features without python.
 echo "Building MinGW 32bit GUI version"
 if "%FEATURE%" == "HUGE" (
-    mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34 FEATURES=%FEATURE% || exit 1
+    mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed CHANNEL=yes GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35 FEATURES=%FEATURE% || exit 1
 ) ELSE (
     mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
 )
@@ -31,7 +31,7 @@ nmake -f Make_mvc2.mak clean
 :: GUI needs to be last, so that testing works
 echo "Building MSVC 64bit GUI Version"
 if "%FEATURE%" == "HUGE" (
-    nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=34 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python34-x64 FEATURES=%FEATURE% || exit 1
+    nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 FEATURES=%FEATURE% || exit 1
 ) ELSE (
     nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes MBYTE=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
 )

src/ex_cmds2.c

@@ -1222,8 +1222,8 @@ check_due_timer(void)
 		}
 		else
 		{
-		    free_timer(timer);
 		    remove_timer(timer);
+		    free_timer(timer);
 		}
 		/* the callback may do anything, start all over */
 		break;

src/option.c

@@ -1747,7 +1747,7 @@ static struct vimoption options[] =
 #else
 			    (char_u *)NULL, PV_NONE,
 #endif
-			    {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
     {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
 #ifdef FEAT_WINDOWS
 			    (char_u *)&p_ls, PV_NONE,

src/testdir/Make_all.mak

@@ -42,7 +42,6 @@ SCRIPTS_ALL = \
 	test43.out \
 	test44.out \
 	test45.out \
-	test46.out \
 	test48.out \
 	test51.out \
 	test53.out \
@@ -64,7 +63,6 @@ SCRIPTS_ALL = \
 	test77.out \
 	test79.out \
 	test80.out \
-	test81.out \
 	test82.out \
 	test84.out \
 	test88.out \
@@ -77,7 +75,6 @@ SCRIPTS_ALL = \
 	test98.out \
 	test99.out \
 	test101.out \
-	test102.out \
 	test103.out \
 	test104.out \
 	test107.out \
@@ -86,7 +83,6 @@ SCRIPTS_ALL = \
 	test_autoformat_join.out \
 	test_breakindent.out \
 	test_changelist.out \
-    	test_charsearch.out \
 	test_close_count.out \
 	test_command_count.out \
 	test_comparators.out \
@@ -157,11 +153,13 @@ NEW_TESTS = test_arglist.res \
 	    test_bufwintabinfo.res \
 	    test_cdo.res \
 	    test_channel.res \
+	    test_charsearch.res \
 	    test_cmdline.res \
 	    test_cscope.res \
 	    test_diffmode.res \
 	    test_digraph.res \
 	    test_farsi.res \
+	    test_fnameescape.res \
 	    test_gn.res \
 	    test_gui.res \
 	    test_hardcopy.res \
@@ -185,6 +183,7 @@ NEW_TESTS = test_arglist.res \
 	    test_startup.res \
 	    test_startup_utf8.res \
 	    test_stat.res \
+	    test_substitute.res \
 	    test_syntax.res \
 	    test_textobjects.res \
 	    test_undo.res \