mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 12:51:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Not going beyond the number of available rows in the edit window.

Browse Source 
This fixes Savannah bug #42188.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5539 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2016-01-09 20:21:29 +00:00
parent ebbb5b5d1e
commit ec4ee1c489
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -2,6 +2,8 @@
* src/color.c (precalc_multicolorinfo), src/winio.c (edit_draw): * src/color.c (precalc_multicolorinfo), src/winio.c (edit_draw):
Make sure to keep advancing also when matches are zero-length. Make sure to keep advancing also when matches are zero-length.
This fixes Savannah bug #26977 reported by Tigrmesh. This fixes Savannah bug #26977 reported by Tigrmesh.
* src/winio.c (update_line): For softwrap, don't go beyond the number
of available rows in the edit window. This fixes Savannah bug #42188.
2016-01-07 Benno Schulenberg <bensberg@justemail.net> 2016-01-07 Benno Schulenberg <bensberg@justemail.net>
* src/global.c (assign_keyinfo): Delete two unneeded #ifdefs: if * src/global.c (assign_keyinfo): Delete two unneeded #ifdefs: if

2
src/winio.c
View File

@ -2789,7 +2789,7 @@ int update_line(filestruct *fileptr, size_t index)
#ifndef NANO_TINY #ifndef NANO_TINY
} else { } else {
size_t full_length = strlenpt(fileptr->data); size_t full_length = strlenpt(fileptr->data);
for (index += COLS; index <= full_length && line < editwinrows; index += COLS) { for (index += COLS; index <= full_length && line < editwinrows - 1; index += COLS) {
line++; line++;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "update_line(): softwrap code, moving to %d index %lu\n", line, (unsigned long)index); fprintf(stderr, "update_line(): softwrap code, moving to %d index %lu\n", line, (unsigned long)index);