diff options
| -rw-r--r-- | src/ex_cmds.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index d719826bc..a17b40cb6 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -6535,7 +6535,10 @@ helptags_one(dir, ext, tagfname, add_help_tags) p1 = vim_strchr(IObuff, '*'); /* find first '*' */ while (p1 != NULL) { - p2 = vim_strchr(p1 + 1, '*'); /* find second '*' */ + /* Use vim_strbyte() instead of vim_strchr() so that when + * 'encoding' is dbcs it still works, don't find '*' in the + * second byte. */ + p2 = vim_strbyte(p1 + 1, '*'); /* find second '*' */ if (p2 != NULL && p2 > p1 + 1) /* skip "*" and "**" */ { for (s = p1 + 1; s < p2; ++s) diff --git a/src/version.c b/src/version.c index 0f40176e0..b05c84345 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 518, +/**/ 517, /**/ 516, |