|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.559
|
|
|
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.559
|
|
|
3ef2ca |
Problem: Appending a block in the middle of a tab does not work correctly
|
|
|
3ef2ca |
when virtualedit is set.
|
|
|
3ef2ca |
Solution: Decrement spaces and count, don't reset them. (James McCoy)
|
|
|
3ef2ca |
Files: src/ops.c, src/testdir/test39.in, src/testdir/test39.ok
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.558/src/ops.c 2014-11-19 17:35:35.081446695 +0100
|
|
|
3ef2ca |
--- src/ops.c 2014-12-17 18:28:39.034973177 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 612,631 ****
|
|
|
3ef2ca |
#ifdef FEAT_MBYTE
|
|
|
3ef2ca |
if (has_mbyte && spaces > 0)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
/* Avoid starting halfway a multi-byte character. */
|
|
|
3ef2ca |
if (b_insert)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
! int off = (*mb_head_off)(oldp, oldp + offset + spaces);
|
|
|
3ef2ca |
! spaces -= off;
|
|
|
3ef2ca |
! count -= off;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
else
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
! int off = (*mb_off_next)(oldp, oldp + offset);
|
|
|
3ef2ca |
offset += off;
|
|
|
3ef2ca |
- spaces = 0;
|
|
|
3ef2ca |
- count = 0;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--- 612,631 ----
|
|
|
3ef2ca |
#ifdef FEAT_MBYTE
|
|
|
3ef2ca |
if (has_mbyte && spaces > 0)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
+ int off;
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
/* Avoid starting halfway a multi-byte character. */
|
|
|
3ef2ca |
if (b_insert)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
! off = (*mb_head_off)(oldp, oldp + offset + spaces);
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
else
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
! off = (*mb_off_next)(oldp, oldp + offset);
|
|
|
3ef2ca |
offset += off;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
+ spaces -= off;
|
|
|
3ef2ca |
+ count -= off;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
#endif
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.558/src/testdir/test39.ok 2014-08-16 18:13:00.082044726 +0200
|
|
|
3ef2ca |
--- src/testdir/test39.ok 2014-12-17 18:18:33.090470463 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 26,31 ****
|
|
|
3ef2ca |
--- 26,35 ----
|
|
|
3ef2ca |
x line2
|
|
|
3ef2ca |
x line3
|
|
|
3ef2ca |
|
|
|
3ef2ca |
+ x x line1
|
|
|
3ef2ca |
+ x x line2
|
|
|
3ef2ca |
+ x x line3
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
the YOUTUSSEUU end
|
|
|
3ef2ca |
- yOUSSTUSSEXu -
|
|
|
3ef2ca |
THE YOUTUSSEUU END
|
|
|
3ef2ca |
*** ../vim-7.4.558/src/version.c 2014-12-17 17:59:26.916631344 +0100
|
|
|
3ef2ca |
--- src/version.c 2014-12-17 18:32:23.276199179 +0100
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 559,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
hundred-and-one symptoms of being an internet addict:
|
|
|
3ef2ca |
15. Your heart races faster and beats irregularly each time you see a new WWW
|
|
|
3ef2ca |
site address in print or on TV, even though you've never had heart
|
|
|
3ef2ca |
problems before.
|
|
|
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 ///
|