Merge remote-tracking branch 'vim/master'

Author: splhack

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;

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;

src/version.c

@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    46,
 /**/
     45,
 /**/