3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.517
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.517
3ef2ca
Problem:    With a wrapping line the cursor may not end up in the right place.
3ef2ca
	    (Nazri Ramliy)
3ef2ca
Solution:   Adjust n_extra for a Tab that wraps. (Christian Brabandt)
3ef2ca
Files:	    src/screen.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.516/src/screen.c	2014-10-10 15:28:41.985092234 +0200
3ef2ca
--- src/screen.c	2014-11-19 12:53:37.351818719 +0100
3ef2ca
***************
3ef2ca
*** 4456,4461 ****
3ef2ca
--- 4456,4465 ----
3ef2ca
  		    /* TODO: is passing p for start of the line OK? */
3ef2ca
  		    n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol,
3ef2ca
  								    NULL) - 1;
3ef2ca
+ 		    if (c == TAB && n_extra + col > W_WIDTH(wp))
3ef2ca
+ 			n_extra = (int)wp->w_buffer->b_p_ts
3ef2ca
+ 				       - vcol % (int)wp->w_buffer->b_p_ts - 1;
3ef2ca
+ 
3ef2ca
  		    c_extra = ' ';
3ef2ca
  		    if (vim_iswhite(c))
3ef2ca
  		    {
3ef2ca
*** ../vim-7.4.516/src/version.c	2014-11-12 20:09:02.879529412 +0100
3ef2ca
--- src/version.c	2014-11-19 12:56:19.421955598 +0100
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     517,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Permission is granted to read this message out aloud on Kings Cross Road,
3ef2ca
London, under the condition that the orator is properly dressed.
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    ///