ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

in edit_draw(), don't display any statusbar message when we get a 

zero-length regex, as we can get one under legitimate circumstances


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3677 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2006-06-21 20:51:36 +00:00
parent 5c878088a1
commit d76de38109
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -420,6 +420,9 @@ CVS code -
well as single-line ones. This avoids a segfault when trying well as single-line ones. This avoids a segfault when trying
to color e.g. "start="$" end="$"". (DLR, found by Trevor to color e.g. "start="$" end="$"". (DLR, found by Trevor
Caira) Caira)
- Don't display any statusbar message when we get a zero-length
regex, as we can get one under legitimate circumstances. (DLR,
found by Mike Frysinger)
update_line() update_line()
- Remove unneeded assert. (DLR) - Remove unneeded assert. (DLR)
edit_redraw() edit_redraw()

15
src/winio.c
View File

@ -2357,11 +2357,11 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
* line. */ * line. */
startmatch.rm_so += k; startmatch.rm_so += k;
startmatch.rm_eo += k; startmatch.rm_eo += k;
if (startmatch.rm_so == startmatch.rm_eo) {
/* Skip over a zero-length regex match. */
if (startmatch.rm_so == startmatch.rm_eo)
startmatch.rm_eo++; startmatch.rm_eo++;
statusbar( else if (startmatch.rm_so < endpos &&
_("Refusing zero-length regex match"));
} else if (startmatch.rm_so < endpos &&
startmatch.rm_eo > startpos) { startmatch.rm_eo > startpos) {
x_start = (startmatch.rm_so <= startpos) ? 0 : x_start = (startmatch.rm_so <= startpos) ? 0 :
strnlenpt(fileptr->data, strnlenpt(fileptr->data,
@ -2408,10 +2408,11 @@ void edit_draw(const filestruct *fileptr, const char *converted, int
goto step_two; goto step_two;
start_line = start_line->prev; start_line = start_line->prev;
} }
if (startmatch.rm_so == startmatch.rm_eo) {
/* Skip over a zero-length regex match. */
if (startmatch.rm_so == startmatch.rm_eo)
startmatch.rm_eo++; startmatch.rm_eo++;
statusbar(_("Refusing zero-length regex match")); else {
} else {
/* No start found, so skip to the next step. */ /* No start found, so skip to the next step. */
if (start_line == NULL) if (start_line == NULL)
goto step_two; goto step_two;