# HG changeset patch # User Christian Brabandt # Date 1477082704 -7200 # Node ID 7b2f95633e2857280fbaed2f437a4a09e6373a35 # Parent 2bd1bb7d9e5a301e086f5ca43bdfddfdea8bc324 commit https://github.com/vim/vim/commit/7756e7465d627ff9cd01e59625484a8c302ef853 Author: Bram Moolenaar 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) diff --git a/src/ex_cmds.c b/src/ex_cmds.c --- 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; diff --git a/src/json.c b/src/json.c --- 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; diff --git a/src/version.c b/src/version.c --- 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,