aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Hinz <mh.codebro@gmail.com>2014-04-14 15:47:59 +0200
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-16 09:45:08 -0300
commit40970917dcd35c8e986c3dc678bf180a2b2ddf24 (patch)
tree44b6a416c8dd26ebff66f1908982327ef228b8ff
parentfca5a5e7449a1133a2fafbd09c9675d1b45ae238 (diff)
downloadrneovim-40970917dcd35c8e986c3dc678bf180a2b2ddf24.tar.gz
rneovim-40970917dcd35c8e986c3dc678bf180a2b2ddf24.tar.bz2
rneovim-40970917dcd35c8e986c3dc678bf180a2b2ddf24.zip
vim-patch:7.4.240
Problem: ":tjump" shows "\n" as "\\n". Solution: Skip over "\" that escapes a backslash. (Gary Johnson) https://code.google.com/p/vim/source/detail?r=8d1ba0a23588932d22ad37cbd87ae3bbd4bfeff8
-rw-r--r--src/tag.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/tag.c b/src/tag.c
index e5317b41b3..2df02752cc 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -645,9 +645,11 @@ do_tag (
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) {
msg_putchar(' ');
diff --git a/src/version.c b/src/version.c
index 595d5a13c3..72cc8cf5d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -221,7 +221,7 @@ static int included_patches[] = {
//242,
//241,
//240,
- //240,
+ 240,
239,
//238,
//237,