patch 9.1.0702: Patch 9.1.0700 broke CI

Problem:  Patch 9.1.0700 broke CI
Solution: Revert for now

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/fileio.c b/src/fileio.c
index 890eac7858c3114a2079b5d21980aa7596be83a3..d27a1727ed1718a573316629ef484787f048632b 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5714,8 +5714,7 @@ file_pat_to_reg_pat(
                                )
                            *allow_dirs = TRUE;
                        reg_pat[i++] = '\\';
-                       if (enc_dbcs != 0 && (*mb_ptr2len)(p) > 1)
-                           reg_pat[i++] = *p++;
+                       reg_pat[i++] = *p;
                    }
                break;
 #ifdef BACKSLASH_IN_FILENAME

diff --git a/src/testdir/test_crash.vim b/src/testdir/test_crash.vim
index bfd04ff10f9a1bb6e04913e7e2e984b76bd39c1e..d6975931b393133903e6fba7f716b66438b63c16 100644 (file)
--- a/src/testdir/test_crash.vim
+++ b/src/testdir/test_crash.vim
@@ -222,11 +222,11 @@ func Test_crash1_3()
   call term_sendkeys(buf, args)
   call TermWait(buf, 150)
 
-  let file = 'crash/heap_overflow_glob2regpat'
-  let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
-  let args = printf(cmn_args, vim, file)
-  call term_sendkeys(buf, args)
-  call TermWait(buf, 50)
+  " let file = 'crash/heap_overflow_glob2regpat'
+  " let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
+  " let args = printf(cmn_args, vim, file)
+  " call term_sendkeys(buf, args)
+  " call TermWait(buf, 50)
 
   let file = 'crash/nullptr_regexp_nfa'
   let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"

diff --git a/src/version.c b/src/version.c
index 5dfb313d25b46820b784d8486ee4126370d439dd..c3e510a92a5b5604a4dab4ccff0159d29d9053f5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    702,
 /**/
     701,
 /**/