Merge branch 'busybox' into merge

1 files changed, 9 insertions, 7 deletions

diff --git a/editors/vi.c b/editors/vi.c
index a8b4dc5a4..70c8f3daf 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3067,11 +3067,14 @@ static void do_cmd(int c);
 static int find_range(char **start, char **stop, char c)
 {
         char *save_dot, *p, *q, *t;
-        int cnt, multiline = 0;
+        int cnt, multiline = 0, forward;
 
         save_dot = dot;
         p = q = dot;
 
+        // will a 'G' command move forwards or backwards?
+        forward = cmdcnt == 0 || cmdcnt > count_lines(text, dot);
+
         if (strchr("cdy><", c)) {
                 // these cmds operate on whole lines
                 p = q = begin_line(p);
@@ -3095,13 +3098,13 @@ static int find_range(char **start, char **stop, char c)
                 if (dot > text && *dot == '\n')
                         dot--;          // stay off NL
                 q = dot;
-        } else if (strchr("H-k{", c)) {
+        } else if (strchr("H-k{", c) || (c == 'G' && !forward)) {
                 // these operate on multi-lines backwards
                 q = end_line(dot);      // find NL
                 do_cmd(c);              // execute movement cmd
                 dot_begin();
                 p = dot;
-        } else if (strchr("L+j}\r\n", c)) {
+        } else if (strchr("L+j}\r\n", c) || (c == 'G' && forward)) {
                 // these operate on multi-lines forwards
                 p = begin_line(dot);
                 do_cmd(c);              // execute movement cmd
@@ -3836,11 +3839,10 @@ static void do_cmd(int c)
                 if (c1 == 27) { // ESC- user changed mind and wants out
                         c = c1 = 27;    // Escape- do nothing
                 } else if (strchr("wW", c1)) {
+                        ml = 0; // multi-line ranges aren't allowed for words
                         if (c == 'c') {
                                 // don't include trailing WS as part of word
-                                while (isblank(*q)) {
-                                        if (q <= text || q[-1] == '\n')
-                                                break;
+                                while (isspace(*q) && q > p) {
                                         q--;
                                 }
                         }
@@ -3848,7 +3850,7 @@ static void do_cmd(int c)
                 } else if (strchr("^0bBeEft%$ lh\b\177", c1)) {
                         // partial line copy text into a register and delete
                         dot = yank_delete(p, q, ml, yf, ALLOW_UNDO);    // delete word
-                } else if (strchr("cdykjHL+-{}\r\n", c1)) {
+                } else if (strchr("cdykjGHL+-{}\r\n", c1)) {
                         // whole line copy text into a register and delete
                         dot = yank_delete(p, q, ml, yf, ALLOW_UNDO);    // delete lines
                         whole = 1;