updated for version 7.3.1104
Problem: New regexp engine does not handle "~".
Solution: Add support for "~".
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index f9b1888..6b6d369 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -829,9 +829,26 @@
EMSGN(_(e_misplaced), no_Magic(c));
return FAIL;
- case Magic('~'): /* previous substitute pattern */
- /* TODO: Not supported yet */
- return FAIL;
+ case Magic('~'):
+ {
+ char_u *lp;
+
+ /* Previous substitute pattern.
+ * Generated as "\%(pattern\)". */
+ if (reg_prev_sub == NULL)
+ {
+ EMSG(_(e_nopresub));
+ return FAIL;
+ }
+ for (lp = reg_prev_sub; *lp != NUL; mb_cptr_adv(lp))
+ {
+ EMIT(PTR2CHAR(lp));
+ if (lp != reg_prev_sub)
+ EMIT(NFA_CONCAT);
+ }
+ EMIT(NFA_NOPEN);
+ break;
+ }
case Magic('1'):
case Magic('2'):
diff --git a/src/testdir/test24.in b/src/testdir/test24.in
index 80eb90b..7dfc1af 100644
--- a/src/testdir/test24.in
+++ b/src/testdir/test24.in
Binary files differ
diff --git a/src/testdir/test24.ok b/src/testdir/test24.ok
index ed25dd4..cd61210 100644
--- a/src/testdir/test24.ok
+++ b/src/testdir/test24.ok
@@ -27,3 +27,6 @@
xx an A xx
XX 9;
YY 77;
+ xyz
+ bcd
+ BB
diff --git a/src/version.c b/src/version.c
index 2ec2881..5732072 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1104,
+/**/
1103,
/**/
1102,
