diff options
Diffstat (limited to 'editors')
-rw-r--r-- | editors/vi.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/editors/vi.c b/editors/vi.c index 593dc8520..3cbf6937d 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -116,7 +116,7 @@ static Byte *status_buffer; // mesages to the user | |||
116 | static int have_status_msg; // is default edit status needed? | 116 | static int have_status_msg; // is default edit status needed? |
117 | static int last_status_cksum; // hash of current status line | 117 | static int last_status_cksum; // hash of current status line |
118 | static Byte *cfn; // previous, current, and next file name | 118 | static Byte *cfn; // previous, current, and next file name |
119 | static Byte *text, *end, *textend; // pointers to the user data in memory | 119 | static Byte *text, *end; // pointers to the user data in memory |
120 | static Byte *screen; // pointer to the virtual screen buffer | 120 | static Byte *screen; // pointer to the virtual screen buffer |
121 | static int screensize; // and its size | 121 | static int screensize; // and its size |
122 | static Byte *screenbegin; // index into text[], of top line on the screen | 122 | static Byte *screenbegin; // index into text[], of top line on the screen |
@@ -582,7 +582,7 @@ static void colon(Byte * buf) | |||
582 | { | 582 | { |
583 | Byte c, *orig_buf, *buf1, *q, *r; | 583 | Byte c, *orig_buf, *buf1, *q, *r; |
584 | Byte *fn, cmd[BUFSIZ], args[BUFSIZ]; | 584 | Byte *fn, cmd[BUFSIZ], args[BUFSIZ]; |
585 | int i, l, li, ch, st, b, e; | 585 | int i, l, li, ch, b, e; |
586 | int useforce = FALSE, forced = FALSE; | 586 | int useforce = FALSE, forced = FALSE; |
587 | struct stat st_buf; | 587 | struct stat st_buf; |
588 | 588 | ||
@@ -606,7 +606,7 @@ static void colon(Byte * buf) | |||
606 | if (*buf == ':') | 606 | if (*buf == ':') |
607 | buf++; // move past the ':' | 607 | buf++; // move past the ':' |
608 | 608 | ||
609 | li = st = ch = i = 0; | 609 | li = ch = i = 0; |
610 | b = e = -1; | 610 | b = e = -1; |
611 | q = text; // assume 1,$ for the range | 611 | q = text; // assume 1,$ for the range |
612 | r = end - 1; | 612 | r = end - 1; |
@@ -1075,14 +1075,13 @@ static void Hit_Return(void) | |||
1075 | //----- Synchronize the cursor to Dot -------------------------- | 1075 | //----- Synchronize the cursor to Dot -------------------------- |
1076 | static void sync_cursor(Byte * d, int *row, int *col) | 1076 | static void sync_cursor(Byte * d, int *row, int *col) |
1077 | { | 1077 | { |
1078 | Byte *beg_cur; // begin and end of "d" line | 1078 | Byte *beg_cur; // begin and end of "d" line |
1079 | Byte *beg_scr, *end_scr; // begin and end of screen | 1079 | Byte *end_scr; // begin and end of screen |
1080 | Byte *tp; | 1080 | Byte *tp; |
1081 | int cnt, ro, co; | 1081 | int cnt, ro, co; |
1082 | 1082 | ||
1083 | beg_cur = begin_line(d); // first char of cur line | 1083 | beg_cur = begin_line(d); // first char of cur line |
1084 | 1084 | ||
1085 | beg_scr = end_scr = screenbegin; // first char of screen | ||
1086 | end_scr = end_screen(); // last char of screen | 1085 | end_scr = end_screen(); // last char of screen |
1087 | 1086 | ||
1088 | if (beg_cur < screenbegin) { | 1087 | if (beg_cur < screenbegin) { |
@@ -1385,8 +1384,6 @@ static Byte *new_text(int size) | |||
1385 | text = (Byte *) xmalloc(size + 8); | 1384 | text = (Byte *) xmalloc(size + 8); |
1386 | memset(text, '\0', size); // clear new text[] | 1385 | memset(text, '\0', size); // clear new text[] |
1387 | //text += 4; // leave some room for "oops" | 1386 | //text += 4; // leave some room for "oops" |
1388 | textend = text + size - 1; | ||
1389 | //textend -= 4; // leave some root for "oops" | ||
1390 | return (text); | 1387 | return (text); |
1391 | } | 1388 | } |
1392 | 1389 | ||
@@ -1963,9 +1960,7 @@ static Byte *text_yank(Byte * p, Byte * q, int dest) // copy text into a registe | |||
1963 | static Byte what_reg(void) | 1960 | static Byte what_reg(void) |
1964 | { | 1961 | { |
1965 | Byte c; | 1962 | Byte c; |
1966 | int i; | ||
1967 | 1963 | ||
1968 | i = 0; | ||
1969 | c = 'D'; // default to D-reg | 1964 | c = 'D'; // default to D-reg |
1970 | if (0 <= YDreg && YDreg <= 25) | 1965 | if (0 <= YDreg && YDreg <= 25) |
1971 | c = 'a' + (Byte) YDreg; | 1966 | c = 'a' + (Byte) YDreg; |