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

tweaks: move the tyding-up-after-a-search to a single exit point

master
Benno Schulenberg 2019-05-06 10:29:45 +02:00
parent 8720cfcce9
commit f0bc94fd02
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/search.c
View File

@ -114,9 +114,7 @@ void search_init(bool replacing, bool keep_the_answer)
* nothing was searched for yet during this session, get out. */
if (i == -1 || (i == -2 && *last_search == '\0')) {
statusbar(_("Cancelled"));
tidy_up_after_search();
free(thedefault);
return;
break;
}
/* If Enter was pressed, prepare to do a replace or a search. */
@ -139,9 +137,7 @@ void search_init(bool replacing, bool keep_the_answer)
go_looking();
}
tidy_up_after_search();
free(thedefault);
return;
break;
}
func = func_from_key(&i);
@ -157,20 +153,19 @@ void search_init(bool replacing, bool keep_the_answer)
} else if (func == flip_replace) {
if (ISSET(VIEW_MODE)) {
print_view_warning();
tidy_up_after_search();
free(thedefault);
return;
break;
}
replacing = !replacing;
} else {
if (func == flip_goto)
do_gotolinecolumn(openfile->current->lineno,
openfile->placewewant + 1, TRUE, TRUE);
tidy_up_after_search();
free(thedefault);
return;
break;
}
}
tidy_up_after_search();
free(thedefault);
}
/* Look for needle, starting at (current, current_x). begin is the line