Commit 62007c84 authored by Benno Schulenberg's avatar Benno Schulenberg
Browse files

tweaks: invert two conditions and reshuffle, to reduce duplication

No related merge requests found
Showing with 9 additions and 12 deletions
+9 -12
...@@ -130,21 +130,18 @@ void search_init(bool replacing, bool keep_the_answer) ...@@ -130,21 +130,18 @@ void search_init(bool replacing, bool keep_the_answer)
#endif #endif
} }
free(thedefault); /* When not doing a regular-expression search, just search;
* otherwise compile the search string, and only search when
/* If doing a regular-expression search, compile the * the expression is valid. */
* search string, and get out when it's invalid. */ if (!ISSET(USE_REGEXP) || regexp_init(last_search)) {
if (ISSET(USE_REGEXP) && !regexp_init(last_search)) { if (replacing)
tidy_up_after_search(); ask_for_replacement();
return; else
go_looking();
} }
if (replacing)
ask_for_replacement();
else
go_looking();
tidy_up_after_search(); tidy_up_after_search();
free(thedefault);
return; return;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment