Mercurial > vim
changeset 6579:a287b0e9e87b v7.4.616
updated for version 7.4.616
Problem: Cannot insert a tab in front of a block.
Solution: Correctly compute aop->start. (Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 03 Feb 2015 18:36:44 +0100 |
| parents | 86561ade8f81 |
| children | bdd980d5d13f |
| files | src/ops.c src/testdir/test39.in src/testdir/test39.ok src/version.c |
| diffstat | 4 files changed, 29 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -2544,6 +2544,7 @@ op_insert(oap, count1) char_u *firstline, *ins_text; struct block_def bd; int i; + pos_T t1; /* edit() changes this - record it for OP_APPEND */ bd.is_MAX = (curwin->w_curswant == MAXCOL); @@ -2617,8 +2618,16 @@ op_insert(oap, count1) } } + t1 = oap->start; edit(NUL, FALSE, (linenr_T)count1); + /* When a tab was inserted, and the characters in front of the tab + * have been converted to a tab as well, the column of the cursor + * might have actually been reduced, so need to adjust here. */ + if (t1.lnum == curbuf->b_op_start_orig.lnum + && lt(curbuf->b_op_start_orig, t1)) + oap->start = curbuf->b_op_start_orig; + /* If user has moved off this line, we don't know what to do, so do * nothing. * Also don't repeat the insert when Insert mode ended with CTRL-C. */ @@ -2644,10 +2653,11 @@ op_insert(oap, count1) #endif ) { + int t = getviscol2(curbuf->b_op_start_orig.col, + curbuf->b_op_start_orig.coladd); oap->start.col = curbuf->b_op_start_orig.col; - pre_textlen -= getviscol2(oap->start.col, oap->start.coladd) - - oap->start_vcol; - oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd); + pre_textlen -= t - oap->start_vcol; + oap->start_vcol = t; } else if (oap->op_type == OP_APPEND && oap->end.col @@ -2660,12 +2670,13 @@ op_insert(oap, count1) #endif ) { + int t = getviscol2(curbuf->b_op_start_orig.col, + curbuf->b_op_start_orig.coladd); oap->start.col = curbuf->b_op_start_orig.col; /* reset pre_textlen to the value of OP_INSERT */ pre_textlen += bd.textlen; - pre_textlen -= getviscol2(oap->start.col, oap->start.coladd) - - oap->start_vcol; - oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd); + pre_textlen -= t - oap->start_vcol; + oap->start_vcol = t; oap->op_type = OP_INSERT; } }
--- a/src/testdir/test39.in +++ b/src/testdir/test39.in @@ -2,6 +2,10 @@ Test Visual block mode commands And test "U" in Visual mode, also on German sharp S. +#define BO_ALL 0x0001 +#define BO_BS 0x0002 +#define BO_CRSR 0x0004 + STARTTEST :so small.vim :so mbyte.vim @@ -70,6 +74,12 @@ G3o987652k02l2jr :exe ":norm! 2k\<C-V>$gj\<Esc>" :let cpos=getpos("'>") :$put ='col:'.cpos[2].' off:'.cpos[3] +:" +:" block_insert when replacing spaces in front of the block with tabs +:set ts=8 sts=4 sw=4 +:4,7y +Gp +:exe ":norm! f0\<C-V>2jI\<tab>\<esc>" :/^the/,$w >> test.out :qa! ENDTEST
index 5c517e2223d5c830ca8297b7c8ec71d180777d82..349d67fe775b797974d039d14e918edecdee245f GIT binary patch literal 662 zc$|e&+iHVA5bdi2{fB`*2Xt3+qZBj>DM*E=&^{H{OOn=T3l+3K+h6IpN!pEAx)0~< zoO5P&7dC0TPmyMMvEA)oUdsa{B)ro?#6wkUDA&-;i{3>1%iWSI6&l?uCqGFL2|x&e zNC0V?A`(EBWrzd-w{LfCpCJ}~ggEUJ#F-4(j3)w2YdRwWhjCQO)!9tM4B&LX7PWF; z<;I|9gPJQ1XB_mYG8>m^%EvCpry!2vF!bUW^D2W0b^(=AdTek4(b`ip-h&H<VT`Db zZ?Dn42R9&!BVdg6^Sk;Y#X0}!{mPq09%?XdS}>b0Mt6((_0+n+|MFKd`HN{?E={b9 nVyOe%&>y1bqZ2&azOQL|tLwU<%1$VM)6rq7v)Y6k#WUd>U9zd>