updated for version 7.4.492

Problem:    In Insert mode, after inserting a newline that inserts a comment
            leader, CTRL-O moves to the right. (ZyX) Issue 57.
Solution:   Correct the condition for moving the cursor back to the NUL.
            (Christian Brabandt)

diff --git a/src/edit.c b/src/edit.c
index 8243890c5294eed051c8d6a795b7b657505b8606..ee63daa1c7bf5b6ee189cf87f9e1409ebaba889e 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -6916,8 +6916,12 @@ stop_insert(end_insert_pos, esc, nomove)
            }
            if (curwin->w_cursor.lnum != tpos.lnum)
                curwin->w_cursor = tpos;
-           else if (cc != NUL)
-               ++curwin->w_cursor.col; /* put cursor back on the NUL */
+           else
+           {
+               tpos.col++;
+               if (cc != NUL && gchar_pos(&tpos) == NUL)
+                   ++curwin->w_cursor.col;     /* put cursor back on the NUL */
+           }
 
            /* <C-S-Right> may have started Visual mode, adjust the position for
             * deleted characters. */

diff --git a/src/testdir/test4.in b/src/testdir/test4.in
index 4aa2fe5a86b54820085ce1c28c87e75a344d7c2e..b8bd9fc9cf87cca0138f61e601ffedf63cccbb49 100644 (file)
--- a/src/testdir/test4.in
+++ b/src/testdir/test4.in
@@ -17,6 +17,9 @@ othis should be auto-indented\e
 G?this is a
 othis should be in column 1\e:wq " append text without autoindent to Xxx
 G:r Xxx             " include Xxx in the current file
+:set fo+=r          " issue #57 do not move cursor on <c-o> when autoindent is set
+Go# abcdef\e2hi
+\ fd0\eo# abcdef\e2hi\ fd0\e
 :?startstart?,$w! test.out
 :qa!
 ENDTEST

diff --git a/src/testdir/test4.ok b/src/testdir/test4.ok
index dffecda4d21257d51ac49607c7764458fd3af66a..d032e4c319edf751007b6341123748cbc54d3da6 100644 (file)
--- a/src/testdir/test4.ok
+++ b/src/testdir/test4.ok
@@ -15,3 +15,6 @@ vim: set noai :
        this is a test
 this should be in column 1
 end of test file Xxx
+# abc
+def
+def

diff --git a/src/version.c b/src/version.c
index 71258da12d21e6a9e3d16dae9676ee054eb637c3..69538140c17dc60a201d864780a0cb9b58b6c032 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    492,
 /**/
     491,
 /**/