emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vi: fix obvious thinko's

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-22 16:38:53 +00:00
parent 50b5cac59f
commit e3eae0d445
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/vi.c
View File

@ -1274,9 +1274,8 @@ static void sync_cursor(char *d, int *row, int *col)
// handle tabs like real vi // handle tabs like real vi
if (d == tp && cmd_mode) { if (d == tp && cmd_mode) {
break; break;
} else {
co = next_tabstop(co);
} }
co = next_tabstop(co);
} else if ((unsigned char)*tp < ' ' || *tp == 0x7f) { } else if ((unsigned char)*tp < ' ' || *tp == 0x7f) {
co++; // display as ^X, use 2 columns co++; // display as ^X, use 2 columns
} }
@ -1326,7 +1325,7 @@ static char *begin_line(char *p) // return pointer to first char cur line
return p; return p;
} }
static char *end_line(char *p) // return pointer to NL of cur line line static char *end_line(char *p) // return pointer to NL of cur line
{ {
if (p < end - 1) { if (p < end - 1) {
p = memchr(p, '\n', end - p - 1); p = memchr(p, '\n', end - p - 1);
@ -1348,7 +1347,7 @@ static char *dollar_line(char *p) // return pointer to just before NL line
static char *prev_line(char *p) // return pointer first char prev line static char *prev_line(char *p) // return pointer first char prev line
{ {
p = begin_line(p); // goto begining of cur line p = begin_line(p); // goto begining of cur line
if (p[-1] == '\n' && p > text) if (p > text && p[-1] == '\n')
p--; // step to prev line p--; // step to prev line
p = begin_line(p); // goto begining of prev line p = begin_line(p); // goto begining of prev line
return p; return p;
@ -1357,7 +1356,7 @@ static char *prev_line(char *p) // return pointer first char prev line
static char *next_line(char *p) // return pointer first char next line static char *next_line(char *p) // return pointer first char next line
{ {
p = end_line(p); p = end_line(p);
if (*p == '\n' && p < end - 1) if (p < end - 1 && *p == '\n')
p++; // step to next line p++; // step to next line
return p; return p;
} }