]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.354 v7.4.354
authorBram Moolenaar <Bram@vim.org>
Thu, 3 Jul 2014 20:54:08 +0000 (22:54 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 3 Jul 2014 20:54:08 +0000 (22:54 +0200)
Problem:    Compiler warning.
Solution:   Change NUL to NULL. (Ken Takata)

src/screen.c
src/version.c

index 5dec4abdd11207d62582d796365dc83392d28968..3bd4125b84ec662ae877a86773c1903eba3e8a79 100644 (file)
@@ -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));
index 74b4fadb72c9f25419824c3d767b31a0d4a4aa6f..5be575a78153aa62e699f4d5a1774f89ad6ad777 100644 (file)
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    354,
 /**/
     353,
 /**/