summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-09-05 15:15:07 +0200
committerBram Moolenaar <Bram@vim.org>2012-09-05 15:15:07 +0200
commit7c0a86b1e871a9546387252b5a33594fc17487aa (patch)
tree6b5daa78a6d20cbb3f82fa4adc7a3179b703a6ee
parentb4a80cdd913605eefb26d6f091a386a4af0ac048 (diff)
updated for version 7.3.651v7.3.651
Problem: Completion after ":help \{-" gives an error message. Solution: Prepend a backslash.
-rw-r--r--src/ex_cmds.c15
-rw-r--r--src/version.c2
2 files changed, 12 insertions, 5 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f715af6a8f..889ea62032 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4851,7 +4851,7 @@ do_sub(eap)
#ifdef FEAT_EVAL
if (do_count)
{
- /* prevent accidently changing the buffer by a function */
+ /* prevent accidentally changing the buffer by a function */
save_ma = curbuf->b_p_ma;
curbuf->b_p_ma = FALSE;
sandbox++;
@@ -5264,7 +5264,7 @@ do_sub_msg(count_only)
* is assumed to be 'p' if missing.
*
* This is implemented in two passes: first we scan the file for the pattern and
- * set a mark for each line that (not) matches. secondly we execute the command
+ * set a mark for each line that (not) matches. Secondly we execute the command
* for each line that has a mark. This is required because after deleting
* lines we do not know where to search for the next match.
*/
@@ -5896,9 +5896,14 @@ find_help_tags(arg, num_matches, matches, keep_lang)
}
else
{
- /* replace "[:...:]" with "\[:...:]"; "[+...]" with "\[++...]" */
- if (arg[0] == '[' && (arg[1] == ':'
- || (arg[1] == '+' && arg[2] == '+')))
+ /* Replace:
+ * "[:...:]" with "\[:...:]"
+ * "[++...]" with "\[++...]"
+ * "\{" with "\\{"
+ */
+ if ((arg[0] == '[' && (arg[1] == ':'
+ || (arg[1] == '+' && arg[2] == '+')))
+ || (arg[0] == '\\' && arg[1] == '{'))
*d++ = '\\';
for (s = arg; *s; ++s)
diff --git a/src/version.c b/src/version.c
index a2ca2386e8..6afaf8d317 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 651,
+/**/
650,
/**/
649,