3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.478
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.478
3ef2ca
Problem:    Using byte length instead of character length for 'showbreak'.
3ef2ca
Solution:   Compute the character length. (Marco Hinz)
3ef2ca
Files:	    src/charset.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.477/src/charset.c	2014-10-10 15:34:29.657092994 +0200
3ef2ca
--- src/charset.c	2014-10-15 21:24:05.578082450 +0200
3ef2ca
***************
3ef2ca
*** 1184,1191 ****
3ef2ca
  	{
3ef2ca
  	    col -= W_WIDTH(wp);
3ef2ca
  	    numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp));
3ef2ca
! 	    if (*p_sbr != NUL && col >= (colnr_T)STRLEN(p_sbr))
3ef2ca
! 		col -= (colnr_T)STRLEN(p_sbr);
3ef2ca
  	    if (numberextra > 0)
3ef2ca
  		col = col % numberextra;
3ef2ca
  	}
3ef2ca
--- 1184,1195 ----
3ef2ca
  	{
3ef2ca
  	    col -= W_WIDTH(wp);
3ef2ca
  	    numberextra = W_WIDTH(wp) - (numberextra - win_col_off2(wp));
3ef2ca
! 	    if (*p_sbr != NUL)
3ef2ca
! 	    {
3ef2ca
! 		colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr);
3ef2ca
! 		if (col >= sbrlen)
3ef2ca
! 		    col -= sbrlen;
3ef2ca
! 	    }
3ef2ca
  	    if (numberextra > 0)
3ef2ca
  		col = col % numberextra;
3ef2ca
  	}
3ef2ca
*** ../vim-7.4.477/src/version.c	2014-10-15 12:56:44.006015955 +0200
3ef2ca
--- src/version.c	2014-10-15 21:19:10.414081805 +0200
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     478,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
There is a fine line between courage and foolishness.
3ef2ca
Unfortunately, it's not a fence.
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    ///