From: Benno Schulenberg Date: Fri, 27 Mar 2015 10:49:19 +0000 (+0000) Subject: Adjusting some whitespace and wrapping. X-Git-Tag: v2.4.1~33 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ad827a6aef254196fe5201b9e1fbe532cfbd1ef6;p=nano.git Adjusting some whitespace and wrapping. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5164 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index 2d217656..ab3c0e9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * doc/syntax/patch.nanorc: Recognize also Debian package diffs. Fixes https://bugs.launchpad.net/ubuntu/+source/nano/+bug/1300565 requested by Rolf Leggewie. + * src/search.c (do_replace_loop): Adjust some whitespace and wrapping. 2015-03-25 Benno Schulenberg * doc/syntax/debian.nanorc: Slightly widen and relax the header regex. diff --git a/src/search.c b/src/search.c index a5233b5b..48f3e9b7 100644 --- a/src/search.c +++ b/src/search.c @@ -784,8 +784,7 @@ ssize_t do_replace_loop( #ifdef HAVE_REGEX_H /* Set the bol_or_eol flag if we're doing a bol and/or eol regex * replace ("^", "$", or "^$"). */ - if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp, - needle)) + if (ISSET(USE_REGEXP) && regexp_bol_or_eol(&search_regexp, needle)) bol_or_eol = TRUE; #endif @@ -801,8 +800,7 @@ ssize_t do_replace_loop( copy = replace_line(needle); - length_change = strlen(copy) - - strlen(openfile->current->data); + length_change = strlen(copy) - strlen(openfile->current->data); #ifndef NANO_TINY /* If the mark was on and (mark_begin, mark_begin_x) was the @@ -826,10 +824,8 @@ ssize_t do_replace_loop( /* Keep real_current_x in sync with the text changes. */ if (openfile->current == real_current && openfile->current_x <= *real_current_x) { - if (*real_current_x < - openfile->current_x + match_len) - *real_current_x = openfile->current_x + - match_len; + if (*real_current_x < openfile->current_x + match_len) + *real_current_x = openfile->current_x + match_len; *real_current_x += length_change; } #ifndef NANO_TINY @@ -852,9 +848,10 @@ ssize_t do_replace_loop( openfile->current->data = copy; #ifndef DISABLE_COLOR - reset_multis(openfile->current, TRUE); + reset_multis(openfile->current, TRUE); #endif - edit_refresh(); + edit_refresh(); + if (!replaceall) { #ifndef DISABLE_COLOR /* If color syntaxes are available and turned on, we