Merge pull request #4157 from watiko/vim-7.4.694

vim-patch:7.4.{662,694}

2 files changed, 10 insertions, 10 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index d393ee7d02..2dd0201259 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3076,18 +3076,18 @@ current_block (
   } else
     old_end = VIsual;
 
-  /*
-   * Search backwards for unclosed '(', '{', etc..
-   * Put this position in start_pos.
-   * Ignore quotes here.
-   */
+  // Search backwards for unclosed '(', '{', etc..
+  // Put this position in start_pos.
+  // Ignore quotes here.  Keep the "M" flag in 'cpo', as that is what the
+  // user wants.
   save_cpo = p_cpo;
-  p_cpo = (char_u *)"%";
+  p_cpo = (char_u *)(vim_strchr(p_cpo, CPO_MATCHBSL) != NULL ? "%M" : "%");
   while (count-- > 0) {
-    if ((pos = findmatch(NULL, what)) == NULL)
+    if ((pos = findmatch(NULL, what)) == NULL) {
       break;
+    }
     curwin->w_cursor = *pos;
-    start_pos = *pos;       /* the findmatch for end_pos will overwrite *pos */
+    start_pos = *pos;  // the findmatch for end_pos will overwrite *pos
   }
   p_cpo = save_cpo;
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ab78400736..70600bf57b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -594,7 +594,7 @@ static int included_patches[] = {
   697,
   696,
   695,
-  // 694,
+  694,
   // 693,
   // 692 NA
   // 691 NA
@@ -626,7 +626,7 @@ static int included_patches[] = {
   665,
   // 664 NA
   // 663 NA
-  // 662,
+  662,
   // 661 NA
   660,
   659,