Merge remote-tracking branch 'vim/master' into kaoriya

Author: splhack

.hgtags

@@ -2854,3 +2854,5 @@ b14554844756422a39c72e62b8c2391c2d5a2e17 v7-4-126
 1e28c0fad344549665c60c62374e6f511e5aec76 v7-4-129
 cf722c09236098ae585840d62eca68dbf8065247 v7-4-130
 4b23119cb58473ab70cf1a1204d4d3fad83881ec v7-4-131
+1b09d6792520cbe1c94c20f6c833ad57316e75bb v7-4-132
+6a28a9cf51537b81da7e9ec3f70fea55e393b345 v7-4-133

src/eval.c

@@ -14157,8 +14157,8 @@ f_matcharg(argvars, rettv)
 	    }
 	    else
 	    {
-		list_append_string(rettv->vval.v_list, NUL, -1);
-		list_append_string(rettv->vval.v_list, NUL, -1);
+		list_append_string(rettv->vval.v_list, NULL, -1);
+		list_append_string(rettv->vval.v_list, NULL, -1);
 	    }
 	}
 #endif

src/misc2.c

@@ -4695,8 +4695,8 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
 	else
 	{
 	    char_u *p =  gettail(search_ctx->ffsc_fix_path);
-	    char_u *wc_path = NUL;
-	    char_u *temp = NUL;
+	    char_u *wc_path = NULL;
+	    char_u *temp = NULL;
 	    int    len = 0;
 
 	    if (p > search_ctx->ffsc_fix_path)

src/os_win32.c

@@ -3831,8 +3831,8 @@ mch_set_winsize_now(void)
     static BOOL
 vim_create_process(
     char		*cmd,
-    DWORD		flags,
     BOOL		inherit_handles,
+    DWORD		flags,
     STARTUPINFO		*si,
     PROCESS_INFORMATION *pi)
 {

src/version.c

@@ -756,6 +756,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
+/**/
+    132,
 /**/
     131,
 /**/