updated for version 7.3.518

Problem:    When 'encoding' is a double-byte encoding ":helptags" may not find
            tags correctly.
Solution:   Use vim_strbyte() instead of vim_strchr(). (Yasuhiro Matsumoto)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index d719826bcb10d59724e98fc333ff141a81cbcfaa..a17b40cb68a09b63be67cb5a8a41c0a5ff0ad45e 100644 (file)
--- 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 0f40176e0530a1c3737136da3fcdca34ab9782b4..b05c84345ee43c4a999da16541e30929e3d8e03a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    518,
 /**/
     517,
 /**/