|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.210
|
|
|
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.210
|
|
|
3ef2ca |
Problem: Visual block mode plus virtual edit doesn't work well with tabs.
|
|
|
3ef2ca |
(Liang Li)
|
|
|
3ef2ca |
Solution: Take coladd into account. (Christian Brabandt)
|
|
|
3ef2ca |
Files: src/ops.c, src/testdir/test39.in, src/testdir/test39.ok
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.209/src/ops.c 2014-02-22 23:03:48.716901208 +0100
|
|
|
3ef2ca |
--- src/ops.c 2014-03-19 18:33:54.118153904 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 2646,2652 ****
|
|
|
3ef2ca |
if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
if (oap->op_type == OP_INSERT
|
|
|
3ef2ca |
! && oap->start.col != curbuf->b_op_start_orig.col)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
oap->start.col = curbuf->b_op_start_orig.col;
|
|
|
3ef2ca |
pre_textlen -= getviscol2(oap->start.col, oap->start.coladd)
|
|
|
3ef2ca |
--- 2646,2660 ----
|
|
|
3ef2ca |
if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
if (oap->op_type == OP_INSERT
|
|
|
3ef2ca |
! && oap->start.col
|
|
|
3ef2ca |
! #ifdef FEAT_VIRTUALEDIT
|
|
|
3ef2ca |
! + oap->start.coladd
|
|
|
3ef2ca |
! #endif
|
|
|
3ef2ca |
! != curbuf->b_op_start_orig.col
|
|
|
3ef2ca |
! #ifdef FEAT_VIRTUALEDIT
|
|
|
3ef2ca |
! + curbuf->b_op_start_orig.coladd
|
|
|
3ef2ca |
! #endif
|
|
|
3ef2ca |
! )
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
oap->start.col = curbuf->b_op_start_orig.col;
|
|
|
3ef2ca |
pre_textlen -= getviscol2(oap->start.col, oap->start.coladd)
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 2654,2660 ****
|
|
|
3ef2ca |
oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd);
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
else if (oap->op_type == OP_APPEND
|
|
|
3ef2ca |
! && oap->end.col >= curbuf->b_op_start_orig.col)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
oap->start.col = curbuf->b_op_start_orig.col;
|
|
|
3ef2ca |
/* reset pre_textlen to the value of OP_INSERT */
|
|
|
3ef2ca |
--- 2662,2676 ----
|
|
|
3ef2ca |
oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd);
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
else if (oap->op_type == OP_APPEND
|
|
|
3ef2ca |
! && oap->end.col
|
|
|
3ef2ca |
! #ifdef FEAT_VIRTUALEDIT
|
|
|
3ef2ca |
! + oap->end.coladd
|
|
|
3ef2ca |
! #endif
|
|
|
3ef2ca |
! >= curbuf->b_op_start_orig.col
|
|
|
3ef2ca |
! #ifdef FEAT_VIRTUALEDIT
|
|
|
3ef2ca |
! + curbuf->b_op_start_orig.coladd
|
|
|
3ef2ca |
! #endif
|
|
|
3ef2ca |
! )
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
oap->start.col = curbuf->b_op_start_orig.col;
|
|
|
3ef2ca |
/* reset pre_textlen to the value of OP_INSERT */
|
|
|
3ef2ca |
*** ../vim-7.4.209/src/testdir/test39.in 2014-01-14 13:18:53.000000000 +0100
|
|
|
3ef2ca |
--- src/testdir/test39.in 2014-03-19 18:35:31.382155394 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 35,40 ****
|
|
|
3ef2ca |
--- 35,46 ----
|
|
|
3ef2ca |
/^C23$/
|
|
|
3ef2ca |
:exe ":norm! l\<C-V>j$hhAab\<Esc>"
|
|
|
3ef2ca |
:.,/^$/w >> test.out
|
|
|
3ef2ca |
+ :" Test for Visual block insert when virtualedit=all
|
|
|
3ef2ca |
+ :set ve=all
|
|
|
3ef2ca |
+ :/\t\tline
|
|
|
3ef2ca |
+ :exe ":norm! 07l\<C-V>jjIx\<Esc>"
|
|
|
3ef2ca |
+ :set ve=
|
|
|
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 |
*** 62,67 ****
|
|
|
3ef2ca |
--- 68,77 ----
|
|
|
3ef2ca |
:qa!
|
|
|
3ef2ca |
ENDTEST
|
|
|
3ef2ca |
|
|
|
3ef2ca |
+ line1
|
|
|
3ef2ca |
+ line2
|
|
|
3ef2ca |
+ line3
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
aaaaaa
|
|
|
3ef2ca |
bbbbbb
|
|
|
3ef2ca |
cccccc
|
|
|
3ef2ca |
*** ../vim-7.4.209/src/testdir/test39.ok 2014-01-14 13:18:53.000000000 +0100
|
|
|
3ef2ca |
--- src/testdir/test39.ok 2014-03-19 18:34:18.206154273 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 17,22 ****
|
|
|
3ef2ca |
--- 17,26 ----
|
|
|
3ef2ca |
C23ab
|
|
|
3ef2ca |
456ab7
|
|
|
3ef2ca |
|
|
|
3ef2ca |
+ x line1
|
|
|
3ef2ca |
+ x line2
|
|
|
3ef2ca |
+ x line3
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
the YOUTUSSEUU end
|
|
|
3ef2ca |
- yOUSSTUSSEXu -
|
|
|
3ef2ca |
THE YOUTUSSEUU END
|
|
|
3ef2ca |
*** ../vim-7.4.209/src/version.c 2014-03-19 17:41:20.390105580 +0100
|
|
|
3ef2ca |
--- src/version.c 2014-03-19 18:27:19.746147861 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 740,741 ****
|
|
|
3ef2ca |
--- 740,743 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 210,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
SUPERIMPOSE "England AD 787". After a few more seconds we hear hoofbeats in
|
|
|
3ef2ca |
the distance. They come slowly closer. Then out of the mist comes KING
|
|
|
3ef2ca |
ARTHUR followed by a SERVANT who is banging two half coconuts together.
|
|
|
3ef2ca |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
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 ///
|