3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.354
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.354
3ef2ca
Problem:    Compiler warning.
3ef2ca
Solution:   Change NUL to NULL. (Ken Takata)
3ef2ca
Files:	    src/screen.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.353/src/screen.c	2014-07-02 19:59:35.454375136 +0200
3ef2ca
--- src/screen.c	2014-07-03 14:08:03.579375847 +0200
3ef2ca
***************
3ef2ca
*** 3704,3710 ****
3ef2ca
  		    if (diff_hlf != (hlf_T)0)
3ef2ca
  			char_attr = hl_attr(diff_hlf);
3ef2ca
  #endif
3ef2ca
! 		    p_extra = NUL;
3ef2ca
  		    c_extra = ' ';
3ef2ca
  		    n_extra = get_breakindent_win(wp,
3ef2ca
  				       ml_get_buf(wp->w_buffer, lnum, FALSE));
3ef2ca
--- 3704,3710 ----
3ef2ca
  		    if (diff_hlf != (hlf_T)0)
3ef2ca
  			char_attr = hl_attr(diff_hlf);
3ef2ca
  #endif
3ef2ca
! 		    p_extra = NULL;
3ef2ca
  		    c_extra = ' ';
3ef2ca
  		    n_extra = get_breakindent_win(wp,
3ef2ca
  				       ml_get_buf(wp->w_buffer, lnum, FALSE));
3ef2ca
*** ../vim-7.4.353/src/version.c	2014-07-02 19:59:35.454375136 +0200
3ef2ca
--- src/version.c	2014-07-03 14:08:38.875376388 +0200
3ef2ca
***************
3ef2ca
*** 736,737 ****
3ef2ca
--- 736,739 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     354,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
   [SIR LAUNCELOT runs back up the stairs, grabs a rope
3ef2ca
   of the wall and swings out over the heads of the CROWD in a
3ef2ca
   swashbuckling manner towards a large window.  He stops just short
3ef2ca
   of the window and is left swing pathetically back and forth.]
3ef2ca
LAUNCELOT: Excuse me ... could somebody give me a push ...
3ef2ca
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///