jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.099

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