From d82db6046ceab1294c54f93fbe0ea619d87d80be Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 7 Aug 2013 15:24:41 +0200 Subject: [PATCH] updated for version 7.4b.017 Problem: ":he \^x" gives a strange error message. (glts) Solution: Do not translate \^x to \_CTRL-x. --- src/ex_cmds.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 3098df9ed4..b79a259116 100644 --- 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 c856835e70..67230f5dad 100644 --- 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, /**/ -- 2.47.2