Mercurial > vim
changeset 6041:761687c6808f v7.4.360
updated for version 7.4.360
Problem: In a regexp pattern a "$" followed by \v or \V is not seen as the
end-of-line.
Solution: Handle the situation. (Ozaki Kiichi)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 09 Jul 2014 19:32:34 +0200 |
| parents | 988aae9b13b3 |
| children | 371f4212d7b1 |
| files | src/regexp.c src/version.c |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/regexp.c +++ b/src/regexp.c @@ -3109,15 +3109,25 @@ peekchr() if (reg_magic >= MAGIC_OFF) { char_u *p = regparse + 1; - - /* ignore \c \C \m and \M after '$' */ + int is_magic_all = (reg_magic == MAGIC_ALL); + + /* ignore \c \C \m \M \v \V and \Z after '$' */ while (p[0] == '\\' && (p[1] == 'c' || p[1] == 'C' - || p[1] == 'm' || p[1] == 'M' || p[1] == 'Z')) + || p[1] == 'm' || p[1] == 'M' + || p[1] == 'v' || p[1] == 'V' || p[1] == 'Z')) + { + if (p[1] == 'v') + is_magic_all = TRUE; + else if (p[1] == 'm' || p[1] == 'M' || p[1] == 'V') + is_magic_all = FALSE; p += 2; + } if (p[0] == NUL || (p[0] == '\\' && (p[1] == '|' || p[1] == '&' || p[1] == ')' || p[1] == 'n')) + || (is_magic_all + && (p[0] == '|' || p[0] == '&' || p[0] == ')')) || reg_magic == MAGIC_ALL) curchr = Magic('$'); }