mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-29 16:13:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Skipping to the next step when a found start has been qualified as

Browse Source 
an end earlier.  This helps with Python's triple-quoted strings.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5247 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2015-06-14 17:56:44 +00:00
parent 2e121fa08c
commit d49c267f91
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
2015-06-14 Benno Schulenberg <bensberg@justemail.net> 2015-06-14 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (edit_draw): Add some debugging code to track which * src/winio.c (edit_draw): Add some debugging code to track which
multidata codes (for multiline regexes) get assigned to which lines. multidata codes (for multiline regexes) get assigned to which lines.
* src/winio.c (edit_draw): Start and end regexes can be very similar;
so if a found start has been qualified as an end earlier, believe it
and skip to the next step. This helps with Python's docstrings.
2015-06-11 Benno Schulenberg <bensberg@justemail.net> 2015-06-11 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (get_key_buffer): Add some debugging code to make it * src/winio.c (get_key_buffer): Add some debugging code to make it

6
src/winio.c
View File

@ -2600,6 +2600,12 @@ void edit_draw(filestruct *fileptr, const char *converted, int
start_line = start_line->prev; start_line = start_line->prev;
} }
/* If the found start has been qualified as an end earlier,
* believe it and skip to the next step. */
if (start_line != NULL &&
start_line->multidata[tmpcolor->id] == CBEGINBEFORE)
goto step_two;
/* Skip over a zero-length regex match. */ /* Skip over a zero-length regex match. */
if (startmatch.rm_so == startmatch.rm_eo) if (startmatch.rm_so == startmatch.rm_eo)
startmatch.rm_eo++; startmatch.rm_eo++;