updated for version 7.4b.017

Problem:    ":he \^x" gives a strange error message. (glts)
Solution:   Do not translate \^x to \_CTRL-x.

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 3098df9ed4ee5da174f8d6c60c2a3bd3c3212840..b79a2591163937dec12b8dfe408234335b0dfe56 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -6019,8 +6019,8 @@ find_help_tags(arg, num_matches, matches, keep_lang)
            if (*s < ' ' || (*s == '^' && s[1] && (ASCII_ISALPHA(s[1])
                           || vim_strchr((char_u *)"?@[\\]^", s[1]) != NULL)))
            {
-               if (d > IObuff && d[-1] != '_')
-                   *d++ = '_';         /* prepend a '_' */
+               if (d > IObuff && d[-1] != '_' && d[-1] != '\\')
+                   *d++ = '_';         /* prepend a '_' to make x_CTRL-x */
                STRCPY(d, "CTRL-");
                d += 5;
                if (*s < ' ')

diff --git a/src/version.c b/src/version.c
index c856835e70da100a9a674d1688bb18e39abc2750..67230f5dadbdd75e4cddf9114431ebd19c4a53be 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    17,
 /**/
     16,
 /**/