diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-10-21 20:35:37 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-10-21 20:35:37 +0200 |
| commit | 7756e7465d627ff9cd01e59625484a8c302ef853 (patch) | |
| tree | 15d6f8773025a03bbf9fa90047321dda0643767b | |
| parent | bb09ceb95477ecc271854b3fdd8d2776eca66adf (diff) | |
patch 8.0.0046v8.0.0046
Problem: Using NUL instead of NULL.
Solution: Change to NULL. (Dominique Pelle)
| -rw-r--r-- | src/ex_cmds.c | 4 | ||||
| -rw-r--r-- | src/json.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 5b6a44a18c..cb58f24ade 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 0132df67d0..36d47aa99d 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 b15752024a..d25b91fde7 100644 --- 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, |