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