Merge pull request #970 from atwupack/vp-7.4.328

vim-patch:7.4.328

2 files changed, 11 insertions, 11 deletions

diff --git a/src/nvim/search.c b/src/nvim/search.c
index c995300d56..b0a782a515 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3015,21 +3015,21 @@ current_block (
   }
   curwin->w_cursor = *end_pos;
 
-  /*
-   * Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE.
-   * If the ending '}' is only preceded by indent, skip that indent.
-   * But only if the resulting area is not smaller than what we started with.
-   */
+  // Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE.
+  // If the ending '}', ')' or ']' is only preceded by indent, skip that
+  // indent. But only if the resulting area is not smaller than what we
+  // started with.
   while (!include) {
     incl(&start_pos);
     sol = (curwin->w_cursor.col == 0);
     decl(&curwin->w_cursor);
-    if (what == '{')
-      while (inindent(1)) {
-        sol = TRUE;
-        if (decl(&curwin->w_cursor) != 0)
-          break;
+    while (inindent(1)) {
+      sol = TRUE;
+      if (decl(&curwin->w_cursor) != 0) {
+        break;
       }
+    }
+
     /*
      * In Visual mode, when the resulting area is not bigger than what we
      * started with, extend it to the next block, and then exclude again.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8eb06b2c80..5416bc7473 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -221,7 +221,7 @@ static int included_patches[] = {
   331,
   //330,
   //329,
-  //328,
+  328,
   327,
   //326,
   //325,