updated for version 7.2-324

diff --git a/src/eval.c b/src/eval.c
index 0ce6ff14cd54d1c3e95f5f739a9e213122f5df4a..6bd2aa72e5087e35cd2c02e89a7cc53e765f179f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -15542,7 +15542,8 @@ f_setpos(argvars, rettv)
     {
        if (list2fpos(&argvars[1], &pos, &fnum) == OK)
        {
-           --pos.col;
+           if (--pos.col < 0)
+               pos.col = 0;
            if (name[0] == '.' && name[1] == NUL)
            {
                /* set cursor */

diff --git a/src/misc2.c b/src/misc2.c
index e157aae9e50435686c9dcb8784446a1a7b980925..949d7e21a89b57079e955fedf377cca5405fc711 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -528,6 +528,8 @@ check_cursor_col()
 #endif
        }
     }
+    else if (curwin->w_cursor.col < 0)
+       curwin->w_cursor.col = 0;
 
 #ifdef FEAT_VIRTUALEDIT
     /* If virtual editing is on, we can leave the cursor on the old position,

diff --git a/src/version.c b/src/version.c
index 36ff3b6f5d4e6b8263b23b42d844e7f9565a561e..ed0058d352d361bf8c425e70c292302a7cd2d33e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    324,
 /**/
     323,
 /**/