To: vim_dev@googlegroups.com
Subject: Patch 7.4.1634
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.1634
Problem:    Vertical movement after CTRL-A ends up in the wrong column.
            (Urtica Dioica)
Solution:   Set curswant when appropriate. (Hirohito Higashi)
Files:      src/ops.c, src/testdir/test_increment.vim


*** ../vim-7.4.1633/src/ops.c	2016-03-05 17:25:34.791256346 +0100
--- src/ops.c	2016-03-21 23:05:47.253523375 +0100
***************
*** 5783,5788 ****
--- 5783,5790 ----
  theend:
      if (visual)
  	curwin->w_cursor = save_cursor;
+     else if (did_change)
+ 	curwin->w_set_curswant = TRUE;
  
      return did_change;
  }
*** ../vim-7.4.1633/src/testdir/test_increment.vim	2016-02-04 21:53:27.827354893 +0100
--- src/testdir/test_increment.vim	2016-03-21 23:05:26.337741697 +0100
***************
*** 727,730 ****
--- 727,739 ----
    call assert_equal("002", getline(1))
  endfunc
  
+ " Test a regression of patch 7.4.1087 fixed.
+ func Test_normal_increment_02()
+   call setline(1, ["hello 10", "world"])
+   exec "norm! ggl\<C-A>jx"
+   call assert_equal(["hello 11", "worl"], getline(1, '$'))
+   call assert_equal([0, 2, 4, 0], getpos('.'))
+ endfunc
+ 
+ 
  " vim: tabstop=2 shiftwidth=2 expandtab
*** ../vim-7.4.1633/src/version.c	2016-03-21 22:39:58.625730124 +0100
--- src/version.c	2016-03-21 23:05:04.189972882 +0100
***************
*** 750,751 ****
--- 750,753 ----
  {   /* Add new patch number below this line */
+ /**/
+     1634,
  /**/


-- 
From "know your smileys":
 <|-) Chinese
 <|-( Chinese and doesn't like these kind of jokes

 /// 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    ///