mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-23 01:32:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: recalculate the multiline info just once when doing "Replace All"

Browse Source
This commit is contained in:
Benno Schulenberg 2020-06-02 19:14:36 +02:00
parent 569d00564b
commit e81e18dd14
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/search.c
View File

@ -498,6 +498,18 @@ char *replace_line(const char *needle)
return copy; return copy;
} }
#ifdef ENABLE_COLOR
/* Reset the multiline coloring info and then recalculate it. */
void wipe_and_recalculate_colorinfo(void)
{
for (linestruct *line = openfile->filetop; line != NULL; line = line->next)
for (short index = 0; index < openfile->syntax->nmultis; index++)
line->multidata[index] = -1;
precalc_multicolorinfo();
}
#endif
/* Step through each occurrence of the search string and prompt the user /* Step through each occurrence of the search string and prompt the user
* before replacing it. We seek for needle, and replace it with answer. * before replacing it. We seek for needle, and replace it with answer.
* The parameters real_current and real_current_x are needed in order to * The parameters real_current and real_current_x are needed in order to
@ -643,17 +655,11 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
openfile->current->data = copy; openfile->current->data = copy;
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
/* Check whether the replacement requires a change in the coloring. */
check_the_multis(openfile->current); check_the_multis(openfile->current);
/* If the replacement requires a change in the coloring, if (refresh_needed && !replaceall)
* reset all the multiline data and recalculate it. */ wipe_and_recalculate_colorinfo();
if (refresh_needed) {
for (linestruct *line = openfile->filetop; line != NULL; line = line->next)
for (short index = 0; index < openfile->syntax->nmultis; index++)
line->multidata[index] = -1;
precalc_multicolorinfo();
}
#endif #endif
set_modified(); set_modified();
as_an_at = TRUE; as_an_at = TRUE;
@ -663,10 +669,12 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
if (numreplaced == -1) if (numreplaced == -1)
not_found_msg(needle); not_found_msg(needle);
#ifdef ENABLE_COLOR #ifdef ENABLE_COLOR
else if (numreplaced > 0) if (refresh_needed)
refresh_needed = TRUE; wipe_and_recalculate_colorinfo();
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
openfile->mark = was_mark; openfile->mark = was_mark;
#endif #endif