updated for version 7.4.328

Problem:    Selection of inner block is inconsistent.
Solution:   Skip indent not only for '}' but all parens. (Tom McDonald)

diff --git a/src/search.c b/src/search.c
index efe9e1c351d1cd99b12e98f71f7af94c79ab9e76..283e77867ed32554bc7a18ffdfe3ac513ee5da96 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -3608,21 +3608,22 @@ current_block(oap, count, include, what, other)
 
     /*
      * 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.
+     * 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/version.c b/src/version.c
index 9215ae475d92801ac3d022002cf90708427cf770..f25abaeee785ad6b045295cf8a9612e1c2f462d2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    328,
 /**/
     327,
 /**/