summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-02-11 12:15:43 +0100
committerBram Moolenaar <Bram@vim.org>2014-02-11 12:15:43 +0100
commitc467d9b2745642df836e89c026b2e84d9b227b59 (patch)
tree090e023ea0523b298e983fac845ea03ddb3bd4b6
parent10395d8d6c9f85d5af42d30fb5bd2225bd8ef626 (diff)
downloadvim-git-c467d9b2745642df836e89c026b2e84d9b227b59.tar.gz
updated for version 7.4.170v7.4.170
Problem: Some help tags don't work with ":help". (Tim Chase) Solution: Add exceptions.
-rw-r--r--src/ex_cmds.c10
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 8f85911ba..70cdd349d 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5936,14 +5936,18 @@ find_help_tags(arg, num_matches, matches, keep_lang)
"?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
"/\\?", "/\\z(\\)", "\\=", ":s\\=",
"[count]", "[quotex]", "[range]",
- "[pattern]", "\\|", "\\%$"};
+ "[pattern]", "\\|", "\\%$",
+ "s/\\~", "s/\\U", "s/\\L",
+ "s/\\1", "s/\\2", "s/\\3", "s/\\9"};
static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
"/star", "/\\\\star", "quotestar", "starstar",
"cpo-star", "/\\\\(\\\\)", "/\\\\%(\\\\)",
"?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
"/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
"\\[count]", "\\[quotex]", "\\[range]",
- "\\[pattern]", "\\\\bar", "/\\\\%\\$"};
+ "\\[pattern]", "\\\\bar", "/\\\\%\\$",
+ "s/\\\\\\~", "s/\\\\U", "s/\\\\L",
+ "s/\\\\1", "s/\\\\2", "s/\\\\3", "s/\\\\9"};
int flags;
d = IObuff; /* assume IObuff is long enough! */
@@ -5982,7 +5986,7 @@ find_help_tags(arg, num_matches, matches, keep_lang)
/* Replace:
* "[:...:]" with "\[:...:]"
* "[++...]" with "\[++...]"
- * "\{" with "\\{"
+ * "\{" with "\\{" -- matching "} \}"
*/
if ((arg[0] == '[' && (arg[1] == ':'
|| (arg[1] == '+' && arg[2] == '+')))
diff --git a/src/version.c b/src/version.c
index 06ab7b425..f3ede133e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 170,
+/**/
169,
/**/
168,