lkundrak / rpms / vim

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