summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-04-02 17:19:04 +0200
committerBram Moolenaar <Bram@vim.org>2014-04-02 17:19:04 +0200
commitfe5aab63feb2b03656700d3738d46a19e99edde0 (patch)
tree4314ed56672219a5e8f8c2f645e4eca77854aaac
parent3e45159ceb465082c183e79e2547cb6cc408167e (diff)
downloadvim-git-fe5aab63feb2b03656700d3738d46a19e99edde0.tar.gz
updated for version 7.4.240v7.4.240
Problem: ":tjump" shows "\n" as "\\n". Solution: Skip over "\" that escapes a backslash. (Gary Johnson)
-rw-r--r--src/tag.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/tag.c b/src/tag.c
index be80a1165..ba42f158c 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -741,8 +741,10 @@ do_tag(tag, type, count, forceit, verbose)
break;
msg_advance(15);
- /* skip backslash used for escaping command char */
- if (*p == '\\' && *(p + 1) == *tagp.command)
+ /* skip backslash used for escaping a command char or
+ * a backslash */
+ if (*p == '\\' && (*(p + 1) == *tagp.command
+ || *(p + 1) == '\\'))
++p;
if (*p == TAB)
diff --git a/src/version.c b/src/version.c
index b00297207..472a7fad0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 240,
+/**/
239,
/**/
238,