summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-07-03 22:54:08 +0200
committerBram Moolenaar <Bram@vim.org>2014-07-03 22:54:08 +0200
commitb8b57460f014febeedd50d834ab66972317ce3ad (patch)
treeb469ed358476d34b13fd892306b1691677d3ddf4
parent86b17e914fec6efd3f042090ef9960c35672519c (diff)
downloadvim-git-b8b57460f014febeedd50d834ab66972317ce3ad.tar.gz
updated for version 7.4.354v7.4.354
Problem: Compiler warning. Solution: Change NUL to NULL. (Ken Takata)
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index 5dec4abdd..3bd4125b8 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3704,7 +3704,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
if (diff_hlf != (hlf_T)0)
char_attr = hl_attr(diff_hlf);
#endif
- p_extra = NUL;
+ p_extra = NULL;
c_extra = ' ';
n_extra = get_breakindent_win(wp,
ml_get_buf(wp->w_buffer, lnum, FALSE));
diff --git a/src/version.c b/src/version.c
index 74b4fadb7..5be575a78 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 354,
+/**/
353,
/**/
352,