updated for version 7.1-031
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index cfc3769..a18b048 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.1. Last change: 2007 Jun 09
+*eval.txt* For Vim version 7.1. Last change: 2007 Jul 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2020,6 +2020,10 @@
number of characters in the cursor line plus one)
'x position of mark x (if the mark is not set, 0 is
returned)
+ Additionally {expr} can be [lnum, col]: a |List| with the line
+ and column number. Most useful when the column is "$", to get
+ the las column of a specific line. When "lnum" or "col" is
+ out of range then col() returns zero.
To get the line number use |line()|. To get both use
|getpos()|.
For the screen column position use |virtcol()|.
@@ -5024,14 +5028,12 @@
position, the returned Number will be the column at the end of
the <Tab>. For example, for a <Tab> in column 1, with 'ts'
set to 8, it returns 8.
- For the use of {expr} see |col()|. Additionally you can use
- [lnum, col]: a |List| with the line and column number. When
- "lnum" or "col" is out of range then virtcol() returns zero.
- When 'virtualedit' is used it can be [lnum, col, off], where
+ For the byte position use |col()|.
+ For the use of {expr} see |col()|.
+ When 'virtualedit' is used {expr} can be [lnum, col, off], where
"off" is the offset in screen columns from the start of the
character. E.g., a position within a <Tab> or after the last
character.
- For the byte position use |col()|.
When Virtual editing is active in the current mode, a position
beyond the end of the line can be returned. |'virtualedit'|
The accepted positions are:
diff --git a/src/eval.c b/src/eval.c
index d55ba10..e22a61d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -672,7 +672,7 @@
static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv));
static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump));
-static pos_T *var2fpos __ARGS((typval_T *varp, int lnum, int *fnum));
+static pos_T *var2fpos __ARGS((typval_T *varp, int dollar_lnum, int *fnum));
static int get_env_len __ARGS((char_u **arg));
static int get_id_len __ARGS((char_u **arg));
static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose));
@@ -16505,9 +16505,9 @@
* Returns NULL when there is an error.
*/
static pos_T *
-var2fpos(varp, lnum, fnum)
+var2fpos(varp, dollar_lnum, fnum)
typval_T *varp;
- int lnum; /* TRUE when $ is last line */
+ int dollar_lnum; /* TRUE when $ is last line */
int *fnum; /* set to fnum for '0, 'A, etc. */
{
char_u *name;
@@ -16520,6 +16520,7 @@
list_T *l;
int len;
int error = FALSE;
+ listitem_T *li;
l = varp->vval.v_list;
if (l == NULL)
@@ -16535,6 +16536,14 @@
if (error)
return NULL;
len = (long)STRLEN(ml_get(pos.lnum));
+
+ /* We accept "$" for the column number: last column. */
+ li = list_find(l, 1L);
+ if (li != NULL && li->li_tv.v_type == VAR_STRING
+ && li->li_tv.vval.v_string != NULL
+ && STRCMP(li->li_tv.vval.v_string, "$") == 0)
+ pos.col = len + 1;
+
/* Accept a position up to the NUL after the line. */
if (pos.col == 0 || (int)pos.col > len + 1)
return NULL; /* invalid column number */
@@ -16567,7 +16576,7 @@
pos.coladd = 0;
#endif
- if (name[0] == 'w' && lnum)
+ if (name[0] == 'w' && dollar_lnum)
{
pos.col = 0;
if (name[1] == '0') /* "w0": first visible line */
@@ -16585,7 +16594,7 @@
}
else if (name[0] == '$') /* last column or line */
{
- if (lnum)
+ if (dollar_lnum)
{
pos.lnum = curbuf->b_ml.ml_line_count;
pos.col = 0;
diff --git a/src/version.c b/src/version.c
index bfb8cca..0985a50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 31,
+/**/
30,
/**/
29,