nano

commit 0a79c78e05d33aec707dc24a8129186a9cb7f10b
parent ad827a6aef254196fe5201b9e1fbe532cfbd1ef6
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Fri, 27 Mar 2015 11:29:23 +0000

Removing two unneeded calls to edit_refresh(), to greatly speed up nano
when doing a Replace All with *lots* of occurrences.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5165 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/search.c
 | 
7
++-----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -3,6 +3,9 @@
 	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.
+	* src/search.c (do_replace_loop): Place a call to edit_refresh better,
+	and remove two unneeded ones.  This greatly speeds up nano when doing
+	a Replace All with *lots* of occurrences.
 
 2015-03-25  Benno Schulenberg  <bensberg@justemail.net>
 	* doc/syntax/debian.nanorc: Slightly widen and relax the header regex.
diff --git a/src/search.c b/src/search.c
@@ -748,9 +748,6 @@ ssize_t do_replace_loop(
 	}
 #endif
 
-	if (!replaceall)
-	    edit_refresh();
-
 	/* Indicate that we found the search string. */
 	if (numreplaced == -1)
 	    numreplaced = 0;
@@ -761,6 +758,8 @@ ssize_t do_replace_loop(
 		xpt, strnlenpt(openfile->current->data,
 		openfile->current_x + match_len) - xpt, FALSE);
 
+	    edit_refresh();
+
 	    curs_set(0);
 
 	    do_replace_highlight(TRUE, exp_word);
@@ -850,7 +849,6 @@ ssize_t do_replace_loop(
 #ifndef DISABLE_COLOR
 	    reset_multis(openfile->current, TRUE);
 #endif
-	    edit_refresh();
 
 	    if (!replaceall) {
 #ifndef DISABLE_COLOR
@@ -877,7 +875,6 @@ ssize_t do_replace_loop(
 	unpartition_filestruct(&filepart);
 	openfile->edittop = edittop_save;
 	openfile->mark_set = TRUE;
-	edit_refresh();
     }
 #endif