From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 21 Oct 2016 18:35:37 +0000 (+0200)
Subject: patch 8.0.0046
X-Git-Tag: v8.0.0046
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7756e7465d627ff9cd01e59625484a8c302ef853;p=vim

patch 8.0.0046
Problem:    Using NUL instead of NULL.
Solution:   Change to NULL. (Dominique Pelle)
---

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 5b6a44a18..cb58f24ad 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6908,7 +6908,7 @@ fix_help_buffer(void)
 				    continue;
 				e1 = vim_strrchr(t1, '.');
 				e2 = vim_strrchr(gettail(f2), '.');
-				if (e1 == NUL || e2 == NUL)
+				if (e1 == NULL || e2 == NULL)
 				    continue;
 				if (fnamecmp(e1, ".txt") != 0
 				    && fnamecmp(e1, fname + 4) != 0)
@@ -8205,7 +8205,7 @@ set_context_in_sign_cmd(expand_T *xp, char_u *arg)
     /* :sign define {name} {args}... {last}=
      *				     |	   |
      *				  last	   p */
-    if (p == NUL)
+    if (p == NULL)
     {
 	/* Expand last argument name (before equal sign). */
 	xp->xp_pattern = last;
diff --git a/src/json.c b/src/json.c
index 0132df67d..36d47aa99 100644
--- a/src/json.c
+++ b/src/json.c
@@ -861,7 +861,7 @@ json_decode_item(js_read_T *reader, typval_T *res, int options)
 	    break;
     }
 
-    if (res != NUL)
+    if (res != NULL)
     {
 	res->v_type = VAR_SPECIAL;
 	res->vval.v_number = VVAL_NONE;
diff --git a/src/version.c b/src/version.c
index b15752024..d25b91fde 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    46,
 /**/
     45,
 /**/