3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.058
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.058
3ef2ca
Problem:    Warnings on 64 bit Windows.
3ef2ca
Solution:   Add type casts. (Mike Williams)
3ef2ca
Files:      src/ops.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.057/src/ops.c	2013-10-06 17:46:48.000000000 +0200
3ef2ca
--- src/ops.c	2013-11-02 23:56:15.000000000 +0100
3ef2ca
***************
3ef2ca
*** 5009,5022 ****
3ef2ca
  		    if (second_indent > 0)  /* the "leader" for FO_Q_SECOND */
3ef2ca
  		{
3ef2ca
  		    char_u *p = ml_get_curline();
3ef2ca
! 		    int indent = skipwhite(p) - p;
3ef2ca
  
3ef2ca
  		    if (indent > 0)
3ef2ca
  		    {
3ef2ca
  			(void)del_bytes(indent, FALSE, FALSE);
3ef2ca
  			mark_col_adjust(curwin->w_cursor.lnum,
3ef2ca
  					       (colnr_T)0, 0L, (long)-indent);
3ef2ca
! 		      }
3ef2ca
  		}
3ef2ca
  		curwin->w_cursor.lnum--;
3ef2ca
  		if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
3ef2ca
--- 5009,5022 ----
3ef2ca
  		    if (second_indent > 0)  /* the "leader" for FO_Q_SECOND */
3ef2ca
  		{
3ef2ca
  		    char_u *p = ml_get_curline();
3ef2ca
! 		    int indent = (int)(skipwhite(p) - p);
3ef2ca
  
3ef2ca
  		    if (indent > 0)
3ef2ca
  		    {
3ef2ca
  			(void)del_bytes(indent, FALSE, FALSE);
3ef2ca
  			mark_col_adjust(curwin->w_cursor.lnum,
3ef2ca
  					       (colnr_T)0, 0L, (long)-indent);
3ef2ca
! 		    }
3ef2ca
  		}
3ef2ca
  		curwin->w_cursor.lnum--;
3ef2ca
  		if (do_join(2, TRUE, FALSE, FALSE) == FAIL)
3ef2ca
*** ../vim-7.4.057/src/version.c	2013-11-02 23:29:17.000000000 +0100
3ef2ca
--- src/version.c	2013-11-02 23:55:01.000000000 +0100
3ef2ca
***************
3ef2ca
*** 740,741 ****
3ef2ca
--- 740,743 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     58,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Citizens are not allowed to attend a movie house or theater nor ride in a
3ef2ca
public streetcar within at least four hours after eating garlic.
3ef2ca
		[real standing law in Indiana, United States of America]
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    ///