lkundrak / rpms / vim

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