8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.099
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.099
8b9a1c
Problem:    Append in blockwise Visual mode with "$" is wrong.
8b9a1c
Solution:   After "$" don't use the code that checks if the cursor was moved.
8b9a1c
	    (Hirohito Higashi, Ken Takata)
8b9a1c
Files:	    src/ops.c, src/testdir/test39.in, src/testdir/test39.ok
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.098/src/ops.c	2013-11-21 13:24:36.000000000 +0100
8b9a1c
--- src/ops.c	2013-11-21 14:33:57.000000000 +0100
8b9a1c
***************
8b9a1c
*** 2643,2649 ****
8b9a1c
  
8b9a1c
  	/* The user may have moved the cursor before inserting something, try
8b9a1c
  	 * to adjust the block for that. */
8b9a1c
! 	if (oap->start.lnum == curbuf->b_op_start.lnum)
8b9a1c
  	{
8b9a1c
  	    if (oap->op_type == OP_INSERT
8b9a1c
  		    && oap->start.col != curbuf->b_op_start.col)
8b9a1c
--- 2643,2649 ----
8b9a1c
  
8b9a1c
  	/* The user may have moved the cursor before inserting something, try
8b9a1c
  	 * to adjust the block for that. */
8b9a1c
! 	if (oap->start.lnum == curbuf->b_op_start.lnum && !bd.is_MAX)
8b9a1c
  	{
8b9a1c
  	    if (oap->op_type == OP_INSERT
8b9a1c
  		    && oap->start.col != curbuf->b_op_start.col)
8b9a1c
*** ../vim-7.4.098/src/testdir/test39.in	2013-11-11 01:29:16.000000000 +0100
8b9a1c
--- src/testdir/test39.in	2013-11-21 14:25:55.000000000 +0100
8b9a1c
***************
8b9a1c
*** 23,28 ****
8b9a1c
--- 23,40 ----
8b9a1c
  /^aaaa/
8b9a1c
  :exe ":norm! l\<C-V>jjjlllI\<Right>\<Right>  \<Esc>"
8b9a1c
  :/^aa/,/^$/w >> test.out
8b9a1c
+ :" Test for Visual block was created with the last <C-v>$
8b9a1c
+ /^A23$/
8b9a1c
+ :exe ":norm! l\<C-V>j$Aab\<Esc>"
8b9a1c
+ :.,/^$/w >> test.out
8b9a1c
+ :" Test for Visual block was created with the middle <C-v>$ (1)
8b9a1c
+ /^B23$/
8b9a1c
+ :exe ":norm! l\<C-V>j$hAab\<Esc>"
8b9a1c
+ :.,/^$/w >> test.out
8b9a1c
+ :" Test for Visual block was created with the middle <C-v>$ (2)
8b9a1c
+ /^C23$/
8b9a1c
+ :exe ":norm! l\<C-V>j$hhAab\<Esc>"
8b9a1c
+ :.,/^$/w >> test.out
8b9a1c
  :" gUe must uppercase a whole word, also when ß changes to SS
8b9a1c
  Gothe youtußeuu end?Ypk0wgUe
8b9a1c
  :" gUfx must uppercase until x, inclusive.
8b9a1c
***************
8b9a1c
*** 49,54 ****
8b9a1c
--- 61,75 ----
8b9a1c
  cccccc
8b9a1c
  dddddd
8b9a1c
  
8b9a1c
+ A23
8b9a1c
+ 4567
8b9a1c
+ 
8b9a1c
+ B23
8b9a1c
+ 4567
8b9a1c
+ 
8b9a1c
+ C23
8b9a1c
+ 4567
8b9a1c
+ 
8b9a1c
  abcdefghijklm
8b9a1c
  abcdefghijklm
8b9a1c
  abcdefghijklm
8b9a1c
*** ../vim-7.4.098/src/testdir/test39.ok	2013-11-11 01:29:16.000000000 +0100
8b9a1c
--- src/testdir/test39.ok	2013-11-21 14:25:10.000000000 +0100
8b9a1c
***************
8b9a1c
*** 8,13 ****
8b9a1c
--- 8,22 ----
8b9a1c
  ccc  ccc
8b9a1c
  ddd  ddd
8b9a1c
  
8b9a1c
+ A23ab
8b9a1c
+ 4567ab
8b9a1c
+ 
8b9a1c
+ B23 ab
8b9a1c
+ 4567ab
8b9a1c
+ 
8b9a1c
+ C23ab
8b9a1c
+ 456ab7
8b9a1c
+ 
8b9a1c
  the YOUTUSSEUU end
8b9a1c
  - yOUSSTUSSEXu -
8b9a1c
  THE YOUTUSSEUU END
8b9a1c
*** ../vim-7.4.098/src/version.c	2013-11-21 14:21:25.000000000 +0100
8b9a1c
--- src/version.c	2013-11-21 14:34:28.000000000 +0100
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     99,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
If the Universe is constantly expanding, why can't I ever find a parking space?
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///