|
 |
d6ba96 |
To: vim_dev@googlegroups.com
|
|
|
d6ba96 |
Subject: Patch 7.4.407
|
|
|
d6ba96 |
Fcc: outbox
|
|
|
d6ba96 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
d6ba96 |
Mime-Version: 1.0
|
|
|
d6ba96 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d6ba96 |
Content-Transfer-Encoding: 8bit
|
|
|
d6ba96 |
------------
|
|
|
d6ba96 |
|
|
|
d6ba96 |
Patch 7.4.407
|
|
|
d6ba96 |
Problem: Inserting text for Visual block mode, with cursor movement,
|
|
|
d6ba96 |
repeats the wrong text. (Aleksandar Ivanov)
|
|
|
d6ba96 |
Solution: Reset the update_Insstart_orig flag. (Christian Brabandt)
|
|
|
d6ba96 |
Files: src/edit.c, src/testdir/test39.in, src/testdir/test39.ok
|
|
|
d6ba96 |
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.406/src/edit.c 2014-07-30 16:00:45.543553496 +0200
|
|
|
d6ba96 |
--- src/edit.c 2014-08-16 18:10:10.914050861 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 6768,6780 ****
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
if (arrow_used)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
if (u_save_cursor() == OK)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
arrow_used = FALSE;
|
|
|
d6ba96 |
ins_need_undo = FALSE;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
! Insstart = curwin->w_cursor; /* new insertion starts here */
|
|
|
d6ba96 |
! Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
|
|
|
d6ba96 |
ai_col = 0;
|
|
|
d6ba96 |
#ifdef FEAT_VREPLACE
|
|
|
d6ba96 |
if (State & VREPLACE_FLAG)
|
|
|
d6ba96 |
--- 6768,6786 ----
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
if (arrow_used)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
+ Insstart = curwin->w_cursor; /* new insertion starts here */
|
|
|
d6ba96 |
+ if (Insstart.col > Insstart_orig.col && !ins_need_undo)
|
|
|
d6ba96 |
+ /* Don't update the original insert position when moved to the
|
|
|
d6ba96 |
+ * right, except when nothing was inserted yet. */
|
|
|
d6ba96 |
+ update_Insstart_orig = FALSE;
|
|
|
d6ba96 |
+ Insstart_textlen = (colnr_T)linetabsize(ml_get_curline());
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
if (u_save_cursor() == OK)
|
|
|
d6ba96 |
{
|
|
|
d6ba96 |
arrow_used = FALSE;
|
|
|
d6ba96 |
ins_need_undo = FALSE;
|
|
|
d6ba96 |
}
|
|
|
d6ba96 |
!
|
|
|
d6ba96 |
ai_col = 0;
|
|
|
d6ba96 |
#ifdef FEAT_VREPLACE
|
|
|
d6ba96 |
if (State & VREPLACE_FLAG)
|
|
|
d6ba96 |
*** ../vim-7.4.406/src/testdir/test39.in 2014-03-19 18:57:27.730175565 +0100
|
|
|
d6ba96 |
--- src/testdir/test39.in 2014-08-16 17:52:23.078089588 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 23,28 ****
|
|
|
d6ba96 |
--- 23,31 ----
|
|
|
d6ba96 |
/^aaaa/
|
|
|
d6ba96 |
:exe ":norm! l\<C-V>jjjlllI\<Right>\<Right> \<Esc>"
|
|
|
d6ba96 |
:/^aa/,/^$/w >> test.out
|
|
|
d6ba96 |
+ /xaaa$/
|
|
|
d6ba96 |
+ :exe ":norm! \<C-V>jjjI<>\<Left>p\<Esc>"
|
|
|
d6ba96 |
+ :/xaaa$/,/^$/w >> test.out
|
|
|
d6ba96 |
:" Test for Visual block was created with the last <C-v>$
|
|
|
d6ba96 |
/^A23$/
|
|
|
d6ba96 |
:exe ":norm! l\<C-V>j$Aab\<Esc>"
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 77,82 ****
|
|
|
d6ba96 |
--- 80,90 ----
|
|
|
d6ba96 |
cccccc
|
|
|
d6ba96 |
dddddd
|
|
|
d6ba96 |
|
|
|
d6ba96 |
+ xaaa
|
|
|
d6ba96 |
+ bbbb
|
|
|
d6ba96 |
+ cccc
|
|
|
d6ba96 |
+ dddd
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
A23
|
|
|
d6ba96 |
4567
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.406/src/testdir/test39.ok 2014-03-19 18:57:27.730175565 +0100
|
|
|
d6ba96 |
--- src/testdir/test39.ok 2014-08-16 17:50:57.330092698 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 8,13 ****
|
|
|
d6ba96 |
--- 8,18 ----
|
|
|
d6ba96 |
ccc ccc
|
|
|
d6ba96 |
ddd ddd
|
|
|
d6ba96 |
|
|
|
d6ba96 |
+ xaaa
|
|
|
d6ba96 |
+ bbbb
|
|
|
d6ba96 |
+ cccc
|
|
|
d6ba96 |
+ dddd
|
|
|
d6ba96 |
+
|
|
|
d6ba96 |
A23ab
|
|
|
d6ba96 |
4567ab
|
|
|
d6ba96 |
|
|
|
d6ba96 |
*** ../vim-7.4.406/src/version.c 2014-08-16 17:34:31.186128463 +0200
|
|
|
d6ba96 |
--- src/version.c 2014-08-16 17:38:30.546119782 +0200
|
|
|
d6ba96 |
***************
|
|
|
d6ba96 |
*** 743,744 ****
|
|
|
d6ba96 |
--- 743,746 ----
|
|
|
d6ba96 |
{ /* Add new patch number below this line */
|
|
|
d6ba96 |
+ /**/
|
|
|
d6ba96 |
+ 407,
|
|
|
d6ba96 |
/**/
|
|
|
d6ba96 |
|
|
|
d6ba96 |
--
|
|
|
d6ba96 |
'Well, here's something to occupy you and keep your mind off things.'
|
|
|
d6ba96 |
'It won't work, I have an exceptionally large mind.'
|
|
|
d6ba96 |
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
|
|
|
d6ba96 |
|
|
|
d6ba96 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
d6ba96 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
d6ba96 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
d6ba96 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|