From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 6 Jan 2014 05:19:11 +0000 (+0100)
Subject: updated for version 7.4.133
X-Git-Tag: v7.4.133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f4c8406a2c58320a94de77f49b35eda7058f328;p=vim

updated for version 7.4.133
Problem:    Clang warns for using NUL.
Solution:   Change NUL to NULL. (Dominique Pelle)
---

diff --git a/src/eval.c b/src/eval.c
index 1637e6d09..8a62fa8fa 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -14141,8 +14141,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
diff --git a/src/misc2.c b/src/misc2.c
index 650620318..a9d7a82b0 100644
--- a/src/misc2.c
+++ b/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)
diff --git a/src/version.c b/src/version.c
index cf4f1ce18..1ca8f9f30 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    133,
 /**/
     132,
 /**/