S&R: Add match marks only at the end of searching/replacing.
Since we now always add the match marks at the end of searching or replacing we don't need to do that while searching or replacing.
(+ Fix Esc handling)