3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.578
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.578
3ef2ca
Problem:    Using getcurpos() after "$" in an empty line returns a negative
3ef2ca
	    number.
3ef2ca
Solution:   Don't add one when this would overflow. (Hirohito Higashi)
3ef2ca
Files:	    src/eval.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.577/src/eval.c	2015-01-14 17:14:57.351424263 +0100
3ef2ca
--- src/eval.c	2015-01-14 18:55:46.945664363 +0100
3ef2ca
***************
3ef2ca
*** 11941,11947 ****
3ef2ca
  #endif
3ef2ca
  							      (varnumber_T)0);
3ef2ca
  	if (getcurpos)
3ef2ca
! 	    list_append_number(l, (varnumber_T)curwin->w_curswant + 1);
3ef2ca
      }
3ef2ca
      else
3ef2ca
  	rettv->vval.v_number = FALSE;
3ef2ca
--- 11941,11948 ----
3ef2ca
  #endif
3ef2ca
  							      (varnumber_T)0);
3ef2ca
  	if (getcurpos)
3ef2ca
! 	    list_append_number(l, curwin->w_curswant == MAXCOL ?
3ef2ca
! 		    (varnumber_T)MAXCOL : (varnumber_T)curwin->w_curswant + 1);
3ef2ca
      }
3ef2ca
      else
3ef2ca
  	rettv->vval.v_number = FALSE;
3ef2ca
*** ../vim-7.4.577/src/version.c	2015-01-14 18:40:23.087769463 +0100
3ef2ca
--- src/version.c	2015-01-14 18:54:47.734312885 +0100
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     578,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
From "know your smileys":
3ef2ca
 ~#:-(	I just washed my hair, and I can't do nuthin' with it.
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    ///