vi: allow repetition count for paragraph motion

The paragraph motion commands '{' and '}' should accept a count.

function                                             old     new   delta
do_cmd                                              5054    5071     +17
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/0 up/down: 17/0)               Total: 17 bytes

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 4e1a2390f..e3e0f4b44 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3513,16 +3513,15 @@ static void do_cmd(int c)
                 } while (--cmdcnt > 0);
                 break;
         case '{':                       // {- move backward paragraph
-                q = char_search(dot, "\n\n", ((unsigned)BACK << 1) | FULL);
-                if (q != NULL) {        // found blank line
-                        dot = next_line(q);     // move to next blank line
-                }
-                break;
         case '}':                       // }- move forward paragraph
-                q = char_search(dot, "\n\n", (FORWARD << 1) | FULL);
-                if (q != NULL) {        // found blank line
-                        dot = next_line(q);     // move to next blank line
-                }
+                do {
+                        q = char_search(dot, "\n\n", c == '{' ?
+                                                ((unsigned)BACK << 1) | FULL :
+                                                (FORWARD << 1) | FULL);
+                        if (q != NULL) {        // found blank line
+                                dot = next_line(q);     // move to next blank line
+                        }
+                } while (--cmdcnt > 0);
                 break;
 #endif /* FEATURE_VI_SEARCH */
         case '0':                       // 0- goto beginning of line