# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1404420848 -7200
# Node ID 5deaa4e9812d4b4ae59d8a3e70bf19983e07e6da
# Parent  1d3b648de738fc5a3369bc7ee15f96a640f1b53a
updated for version 7.4.354
Problem:    Compiler warning.
Solution:   Change NUL to NULL. (Ken Takata)

diff --git a/src/screen.c b/src/screen.c
--- a/src/screen.c
+++ b/src/screen.c
@@ -3704,7 +3704,7 @@ win_line(wp, lnum, startrow, endrow, noc
 		    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
--- 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,