diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-09-22 22:02:14 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-09-22 22:02:14 -0400 |
| commit | 3b0437916424cde16ce4c4dd13faa70b68a84a7d (patch) | |
| tree | f7c5ac24e2a20c69f3b268e8302d209a2e43cb1b | |
| parent | 1c84a0e09093d728408024a6baa9967df596be54 (diff) | |
| parent | e1517d4f53ddd4e23bb13acbfdf0f7ff2bfe2309 (diff) | |
| download | rneovim-3b0437916424cde16ce4c4dd13faa70b68a84a7d.tar.gz rneovim-3b0437916424cde16ce4c4dd13faa70b68a84a7d.tar.bz2 rneovim-3b0437916424cde16ce4c4dd13faa70b68a84a7d.zip | |
Merge pull request #1210 from atwupack/vp-7.4.360
vim-patch:7.4.360
| -rw-r--r-- | src/nvim/regexp.c | 18 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 193c68860d..90da02bb1b 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -2790,17 +2790,29 @@ static int peekchr(void) * either "\|", "\)", "\&", or "\n" */ if (reg_magic >= MAGIC_OFF) { char_u *p = regparse + 1; + bool is_magic_all = (reg_magic == MAGIC_ALL); - /* ignore \c \C \m and \M after '$' */ + // 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')) - || reg_magic == MAGIC_ALL) + || (is_magic_all + && (p[0] == '|' || p[0] == '&' || p[0] == ')')) + || reg_magic == MAGIC_ALL) { curchr = Magic('$'); + } } break; case '\\': diff --git a/src/nvim/version.c b/src/nvim/version.c index 5a0b01df28..cdacc0b2df 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -268,7 +268,7 @@ static int included_patches[] = { //363, 362, 361, - //360, + 360, 359, 358, 357, |