nano

commit 023fccb96661919eb1ede3342c8e3c460e62ff47
parent ea4e9b3156d4c361caa5ab816a22add3769e8ffc
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 10 Apr 2016 11:14:03 +0200

search: avoid saving and restoring placewewant when bracket matching

Now that findnextstr() no longer sets placewewant, we can can make
a copy of the old value just where needed: when a bracket is found.

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

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/search.c b/src/search.c
@@ -1011,7 +1011,6 @@ bool find_bracket_match(bool reverse, const char *bracket_set)
     /* We've definitely found something. */
     openfile->current = fileptr;
     openfile->current_x = found - fileptr->data;
-    openfile->placewewant = xplustabs();
     openfile->current_y = fileptr->lineno - openfile->edittop->lineno;
 
     return TRUE;
@@ -1022,7 +1021,7 @@ bool find_bracket_match(bool reverse, const char *bracket_set)
 void do_find_bracket(void)
 {
     filestruct *current_save;
-    size_t current_x_save, pww_save;
+    size_t current_x_save;
     const char *ch;
 	/* The location in matchbrackets of the bracket at the current
 	 * cursor position. */
@@ -1062,7 +1061,6 @@ void do_find_bracket(void)
     /* Save where we are. */
     current_save = openfile->current;
     current_x_save = openfile->current_x;
-    pww_save = openfile->placewewant;
 
     /* If we're on an opening bracket, which must be in the first half
      * of matchbrackets, we want to search forwards for a closing
@@ -1115,6 +1113,8 @@ void do_find_bracket(void)
 	    /* If count is zero, we've found a matching bracket.  Update
 	     * the screen and get out. */
 	    if (count == 0) {
+		size_t pww_save = openfile->placewewant;
+		openfile->placewewant = xplustabs();
 		edit_redraw(current_save, pww_save);
 		break;
 	    }
@@ -1124,7 +1124,6 @@ void do_find_bracket(void)
 	    statusbar(_("No matching bracket"));
 	    openfile->current = current_save;
 	    openfile->current_x = current_x_save;
-	    openfile->placewewant = pww_save;
 	    break;
 	}
     }