| To: vim_dev@googlegroups.com |
| Subject: Patch 7.4.559 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.4.559 |
| Problem: Appending a block in the middle of a tab does not work correctly |
| when virtualedit is set. |
| Solution: Decrement spaces and count, don't reset them. (James McCoy) |
| Files: src/ops.c, src/testdir/test39.in, src/testdir/test39.ok |
| |
| |
| |
| |
| |
| *** 612,631 **** |
| #ifdef FEAT_MBYTE |
| if (has_mbyte && spaces > 0) |
| { |
| /* Avoid starting halfway a multi-byte character. */ |
| if (b_insert) |
| { |
| ! int off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| ! spaces -= off; |
| ! count -= off; |
| } |
| else |
| { |
| ! int off = (*mb_off_next)(oldp, oldp + offset); |
| offset += off; |
| - spaces = 0; |
| - count = 0; |
| } |
| } |
| #endif |
| |
| --- 612,631 ---- |
| #ifdef FEAT_MBYTE |
| if (has_mbyte && spaces > 0) |
| { |
| + int off; |
| + |
| /* Avoid starting halfway a multi-byte character. */ |
| if (b_insert) |
| { |
| ! off = (*mb_head_off)(oldp, oldp + offset + spaces); |
| } |
| else |
| { |
| ! off = (*mb_off_next)(oldp, oldp + offset); |
| offset += off; |
| } |
| + spaces -= off; |
| + count -= off; |
| } |
| #endif |
| |
| |
| |
| |
| *** 26,31 **** |
| --- 26,35 ---- |
| x line2 |
| x line3 |
| |
| + x x line1 |
| + x x line2 |
| + x x line3 |
| + |
| the YOUTUSSEUU end |
| - yOUSSTUSSEXu - |
| THE YOUTUSSEUU END |
| |
| |
| |
| *** 743,744 **** |
| --- 743,746 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 559, |
| /**/ |
| |
| -- |
| hundred-and-one symptoms of being an internet addict: |
| 15. Your heart races faster and beats irregularly each time you see a new WWW |
| site address in print or on TV, even though you've never had heart |
| problems before. |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |