From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 3 Jul 2014 20:54:08 +0000 (+0200)
Subject: updated for version 7.4.354
X-Git-Tag: v7.4.354
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8b57460f014febeedd50d834ab66972317ce3ad;p=vim

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
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
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    354,
 /**/
     353,
 /**/