Karsten Hopp 6d2da6
To: vim-dev@vim.org
Karsten Hopp 6d2da6
Subject: Patch 7.2.147
Karsten Hopp 6d2da6
Fcc: outbox
Karsten Hopp 6d2da6
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 6d2da6
Mime-Version: 1.0
Karsten Hopp 6d2da6
Content-Type: text/plain; charset=ISO-8859-1
Karsten Hopp 6d2da6
Content-Transfer-Encoding: 8bit
Karsten Hopp 6d2da6
------------
Karsten Hopp 6d2da6
Karsten Hopp 6d2da6
Patch 7.2.147
Karsten Hopp 6d2da6
Problem:    When compiled as small version and 'number' is on the cursor is
Karsten Hopp 6d2da6
	    displayed in the wrong position after a tab. (James Vega)
Karsten Hopp 6d2da6
Solution:   Don't increment vcol when still displaying the line number.
Karsten Hopp 6d2da6
Files:	    src/screen.c
Karsten Hopp 6d2da6
Karsten Hopp 6d2da6
Karsten Hopp 6d2da6
*** ../vim-7.2.146/src/screen.c	Wed Mar 11 17:57:05 2009
Karsten Hopp 6d2da6
--- src/screen.c	Wed Mar 18 16:18:00 2009
Karsten Hopp 6d2da6
***************
Karsten Hopp 6d2da6
*** 4665,4671 ****
Karsten Hopp 6d2da6
  	    --n_skip;
Karsten Hopp 6d2da6
  
Karsten Hopp 6d2da6
  	/* Only advance the "vcol" when after the 'number' column. */
Karsten Hopp 6d2da6
! 	if (draw_state >= WL_SBR
Karsten Hopp 6d2da6
  #ifdef FEAT_DIFF
Karsten Hopp 6d2da6
  		&& filler_todo <= 0
Karsten Hopp 6d2da6
  #endif
Karsten Hopp 6d2da6
--- 4665,4671 ----
Karsten Hopp 6d2da6
  	    --n_skip;
Karsten Hopp 6d2da6
  
Karsten Hopp 6d2da6
  	/* Only advance the "vcol" when after the 'number' column. */
Karsten Hopp 6d2da6
! 	if (draw_state > WL_NR
Karsten Hopp 6d2da6
  #ifdef FEAT_DIFF
Karsten Hopp 6d2da6
  		&& filler_todo <= 0
Karsten Hopp 6d2da6
  #endif
Karsten Hopp 6d2da6
*** ../vim-7.2.146/src/version.c	Wed Mar 18 15:40:03 2009
Karsten Hopp 6d2da6
--- src/version.c	Wed Mar 18 16:26:00 2009
Karsten Hopp 6d2da6
***************
Karsten Hopp 6d2da6
*** 678,679 ****
Karsten Hopp 6d2da6
--- 678,681 ----
Karsten Hopp 6d2da6
  {   /* Add new patch number below this line */
Karsten Hopp 6d2da6
+ /**/
Karsten Hopp 6d2da6
+     147,
Karsten Hopp 6d2da6
  /**/
Karsten Hopp 6d2da6
Karsten Hopp 6d2da6
-- 
Karsten Hopp 6d2da6
You can tune a file system, but you can't tuna fish
Karsten Hopp 6d2da6
							-- man tunefs
Karsten Hopp 6d2da6
Karsten Hopp 6d2da6
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 6d2da6
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 6d2da6
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 6d2da6
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///