073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.473
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.473
073263
Problem:    Cursor movement is incorrect when there is a number
073263
	    column/sign/fold column and 'sbr' is displayed.
073263
Solution:   Adjust the column for 'sbr'. (Christian Brabandt)
073263
Files:	    src/charset.c
073263
073263
073263
*** ../vim-7.4.472/src/charset.c	2014-08-24 21:19:22.224571318 +0200
073263
--- src/charset.c	2014-10-10 15:24:26.257091676 +0200
073263
***************
073263
*** 1184,1189 ****
073263
--- 1184,1191 ----
073263
  	{
073263
  	    col -= W_WIDTH(wp);
073263
  	    numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp));
073263
+ 	    if (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr))
073263
+ 		col -= (colnr_T)STRLEN(p_sbr);
073263
  	    if (numberextra > 0)
073263
  		col = col % numberextra;
073263
  	}
073263
*** ../vim-7.4.472/src/version.c	2014-10-10 15:28:41.985092234 +0200
073263
--- src/version.c	2014-10-10 15:32:19.029092709 +0200
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     473,
073263
  /**/
073263
073263
-- 
073263
Vi is clearly superior to emacs, since "vi" has only two characters
073263
(and two keystrokes), while "emacs" has five.  (Randy C. Ford)
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///