Mercurial > vim

changeset 10299:7b2f95633e28 v8.0.0046

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/7756e7465d627ff9cd01e59625484a8c302ef853 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Oct 21 20:35:37 2016 +0200 patch 8.0.0046 Problem: Using NUL instead of NULL. Solution: Change to NULL. (Dominique Pelle)
author Christian Brabandt <cb@256bit.org>
date Fri, 21 Oct 2016 22:45:04 +0200
parents 2bd1bb7d9e5a
children 1888d5ca413c
files src/ex_cmds.c src/json.c src/version.c
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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, ch
     /* :sign define {name} {args}... {last}=
      *				     |	   |
      *				  last	   p */
-    if (p == NUL)
+    if (p == NULL)
     {
 	/* Expand last argument name (before equal sign). */
 	xp->xp_pattern = last;
--- a/src/json.c
+++ b/src/json.c
@@ -861,7 +861,7 @@ json_decode_item(js_read_T *reader, typv
 	    break;
     }
 
-    if (res != NUL)
+    if (res != NULL)
     {
 	res->v_type = VAR_SPECIAL;
 	res->vval.v_number = VVAL_NONE;
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    46,
+/**/
     45,
 /**/
     44,