diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-08-07 15:24:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-08-07 15:24:41 +0200 |
| commit | d82db6046ceab1294c54f93fbe0ea619d87d80be (patch) | |
| tree | 3c047392171c2a004891a2187afbe93abd75df38 /src | |
| parent | 026a445c4034ce3f489d582c45e2cf49bd77322e (diff) | |
| download | vim-git-d82db6046ceab1294c54f93fbe0ea619d87d80be.tar.gz | |
updated for version 7.4b.017v7.4b.017
Problem: ":he \^x" gives a strange error message. (glts)
Solution: Do not translate \^x to \_CTRL-x.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 3098df9ed..b79a25911 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 c856835e7..67230f5da 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 17, +/**/ 16, /**/ 15, |