updated for version 7.1-322

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 57e2c4e43dc2940d051f3b1c9e41fd28e6092ba7..126b98b92d6c0fbcae74646454da74b4871064a4 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3515,6 +3515,10 @@ line({expr})     The result is a Number, which is the line number of the file
                            returned)
                    w0      first line visible in current window
                    w$      last line visible in current window
+                   v       In Visual mode: the start of the Visual area (the
+                           cursor is the end).  When not in Visual mode
+                           returns the cursor position.  Differs from |'<| in
+                           that it's updated right away.
                Note that a mark in another file can be used.  The line number
                then applies to another buffer.
                To get the column number use |col()|.  To get both use

diff --git a/src/eval.c b/src/eval.c
index 1ad9cec1ef87435da80d263c76b5445b1bb11a3a..54ca054ca1e628ad56efb794c136dfca25b25bdc 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -16907,9 +16907,17 @@ var2fpos(varp, dollar_lnum, fnum)
     name = get_tv_string_chk(varp);
     if (name == NULL)
        return NULL;
-    if (name[0] == '.')                /* cursor */
+    if (name[0] == '.')                                /* cursor */
        return &curwin->w_cursor;
-    if (name[0] == '\'')       /* mark */
+#ifdef FEAT_VISUAL
+    if (name[0] == 'v' && name[1] == NUL)      /* Visual start */
+    {
+       if (VIsual_active)
+           return &VIsual;
+       return &curwin->w_cursor;
+    }
+#endif
+    if (name[0] == '\'')                       /* mark */
     {
        pp = getmark_fnum(name[1], FALSE, fnum);
        if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0)

diff --git a/src/version.c b/src/version.c
index dc2d995d220b6c53cca54fc91f51078f56a23c1a..c8d4958cde0ff7460f0f08895e58f57f53cf1227 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    322,
 /**/
     321,
 /**/