summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-04 14:17:47 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-04 14:17:47 +0000
commit066b62206fdcdef8a878c17f2921a4cf558a0b75 (patch)
tree9465a732900a62516688a378963fd0a3aedd3e7f /src
parent12ddc3e02c95805c32036e5faa30f0870de7c9c7 (diff)
updated for version 7.1-199v7.1.199
Diffstat (limited to 'src')
-rw-r--r--src/ex_getln.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 7d543f2493..547f1a17be 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -4078,6 +4078,7 @@ addstar(fname, len, context)
* ~ would be at the start of the file name, but not the tail.
* $ could be anywhere in the tail.
* ` could be anywhere in the file name.
+ * When the name ends in '$' don't add a star, remove the '$'.
*/
tail = gettail(retval);
if ((*retval != '~' || tail != retval)
@@ -4085,6 +4086,8 @@ addstar(fname, len, context)
&& vim_strchr(tail, '$') == NULL
&& vim_strchr(retval, '`') == NULL)
retval[len++] = '*';
+ else if (len > 0 && retval[len - 1] == '$')
+ --len;
retval[len] = NUL;
}
}
diff --git a/src/version.c b/src/version.c
index 7f2739b234..42138ca9b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 199,
+/**/
198,
/**/
197,