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

tweaks: reshuffle a few lines to avoid an #ifdef and unbalanced braces

master
Benno Schulenberg 2021-09-11 15:07:05 +02:00
parent 914921887e
commit b6366411dc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/search.c
View File

@ -609,14 +609,13 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
size_t length_change; size_t length_change;
char *altered; char *altered;
#ifndef NANO_TINY
add_undo(REPLACE, NULL);
#endif
altered = replace_line(needle); altered = replace_line(needle);
length_change = strlen(altered) - strlen(openfile->current->data); length_change = strlen(altered) - strlen(openfile->current->data);
#ifndef NANO_TINY #ifndef NANO_TINY
add_undo(REPLACE, NULL);
/* If the mark was on and it was located after the cursor, /* If the mark was on and it was located after the cursor,
* then adjust its x position for any text length changes. */ * then adjust its x position for any text length changes. */
if (was_mark && !right_side_up) { if (was_mark && !right_side_up) {
@ -632,8 +631,9 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
/* If the mark was not on or it was before the cursor, then /* If the mark was not on or it was before the cursor, then
* adjust the cursor's x position for any text length changes. */ * adjust the cursor's x position for any text length changes. */
if (!was_mark || right_side_up) { if (!was_mark || right_side_up)
#endif #endif
{
if (openfile->current == real_current && if (openfile->current == real_current &&
openfile->current_x < *real_current_x) { openfile->current_x < *real_current_x) {
if (*real_current_x < openfile->current_x + match_len) if (*real_current_x < openfile->current_x + match_len)
@ -641,8 +641,8 @@ ssize_t do_replace_loop(const char *needle, bool whole_word_only,
*real_current_x += length_change; *real_current_x += length_change;
#ifndef NANO_TINY #ifndef NANO_TINY
bot_x = *real_current_x; bot_x = *real_current_x;
}
#endif #endif
}
} }
/* Don't find the same zero-length or BOL match again. */ /* Don't find the same zero-length or BOL match again. */