summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-02-06 16:26:26 +0100
committerBram Moolenaar <Bram@vim.org>2013-02-06 16:26:26 +0100
commit309379fc989a4f3337c9cf3361ab6eb9a456c626 (patch)
treeb2e09c942df46345f1e6f7b0c292153e37b9c18f
parent530e7dfafd7e951ac36e39c87bf72ebdb4caa428 (diff)
updated for version 7.3.802v7.3.802
Problem: After setting 'isk' to a value ending in a comma appending to the option fails. Solution: Disallow a trailing comma for 'isk' and similar options.
-rw-r--r--src/charset.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/charset.c b/src/charset.c
index b5dcfac1ba..fd4b500be5 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -284,7 +284,12 @@ buf_init_chartab(buf, global)
}
++c;
}
+
+ c = *p;
p = skip_to_option_part(p);
+ if (c == ',' && *p == NUL)
+ /* Trailing comma is not allowed. */
+ return FAIL;
}
}
chartab_initialized = TRUE;
diff --git a/src/version.c b/src/version.c
index 69184b05ad..90ac7247e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 802,
+/**/
801,
/**/
800,