5bef6781f
Ron Yorston
2021-02-02
Subject
vi: fix range selection by forward character motion
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
editors/vi.c+9 -6
| @@ -3047,12 +3047,15 @@ static int find_range(char **start, char **stop, char c) | |
| do_cmd(c); // execute movement cmd | |
| dot_end(); // find NL | |
| q = dot; | |
| - | } else { |
| - | // nothing -- this causes any other values of c to |
| - | // represent the one-character range under the |
| - | // cursor. this is correct for ' ' and 'l', but |
| - | // perhaps no others. |
| - | // |
| + | } else /* if (c == ' ' || c == 'l') */ { |
| + | // forward motion by character |
| + | int tmpcnt = (cmdcnt ?: 1); |
| + | do_cmd(c); // execute movement cmd |
| + | // exclude last char unless range isn't what we expected |
| + | // this indicates we've hit EOL |
| + | if (tmpcnt == dot - p) |
| + | dot--; |
| + | q = dot; |
| } | |
| if (q < p) { | |
| t = q; | |