diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-05-21 13:08:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-05-21 13:08:58 +0200 |
| commit | 6dc79f28902af22de6097e66a482e0c67d829395 (patch) | |
| tree | 0bda8eb5151ad158452762a52257ac356250df56 | |
| parent | 8ce55d13c48f0ab35e566e184de8668c669a9f3b (diff) | |
| download | vim-git-6dc79f28902af22de6097e66a482e0c67d829395.tar.gz | |
updated for version 7.2.437v7.2.437
Problem: When "\\\n" appears in the expression result the \n doesn't result
in a line break. (Andy Wokula)
Solution: Also replace a \n after a backslash into \r.
| -rw-r--r-- | src/regexp.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/regexp.c b/src/regexp.c index 216bf3a18..53559455e 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -6974,6 +6974,13 @@ vim_regsub_both(source, dest, copy, magic, backslash) else if (*s == '\\' && s[1] != NUL) { ++s; + /* Change NL to CR here too, so that this works: + * :s/abc\\\ndef/\="aaa\\\nbbb"/ on text: + * abc\ + * def + */ + if (*s == NL) + *s = CAR; had_backslash = TRUE; } } diff --git a/src/version.c b/src/version.c index 103e043dc..7a0642a22 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 437, +/**/ 436, /**/ 435, |