commit b8b57460f014febeedd50d834ab66972317ce3ad
author Bram Moolenaar <Bram@vim.org> Thu Jul 03 22:54:08 2014 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Jul 03 22:54:08 2014 +0200
tree b469ed358476d34b13fd892306b1691677d3ddf4
parent 86b17e914fec6efd3f042090ef9960c35672519c

updated for version 7.4.354
Problem:    Compiler warning.
Solution:   Change NUL to NULL. (Ken Takata)

src/screen.c

diff --git a/src/screen.c b/src/screen.c
index 5dec4ab..3bd4125 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -3704,7 +3704,7 @@
 		    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));

src/version.c

diff --git a/src/version.c b/src/version.c
index 74b4fad..5be575a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    354,
+/**/
     353,
 /**/
     352,