From 25451ac1128feb0f1ce8c1adbf327964f6b8b086 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Fri, 23 Dec 2016 20:46:50 +0000 Subject: [PATCH] Set the register incrementally as well during incremental search Fixes #1054 --- src/normal.cc | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/normal.cc b/src/normal.cc index 54cbbc6c..bb408a4d 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -643,8 +643,7 @@ void regex_prompt(Context& context, String prompt, T func) context.input_handler().set_prompt_face(get_face("Prompt")); } - if (event == PromptEvent::Abort or - (event == PromptEvent::Change and (not incsearch or str.empty()))) + if (not incsearch and event == PromptEvent::Change) return; if (event == PromptEvent::Validate) @@ -678,13 +677,20 @@ void search(Context& context, NormalParams params) : (direction == Forward ? "search:" : "reverse search:"); const char reg = to_lower(params.reg ? params.reg : '/'); + auto reg_content = RegisterManager::instance()[reg].values(context); + Vector saved_reg{reg_content.begin(), reg_content.end()}; + int main_index = context.selections().main_index(); int count = params.count; regex_prompt(context, prompt.str(), - [reg, count](Regex ex, PromptEvent event, Context& context) { + [reg, count, saved_reg, main_index] + (Regex ex, PromptEvent event, Context& context) { if (ex.empty()) - ex = Regex{context.main_sel_register_value(reg)}; - else if (event == PromptEvent::Validate) + ex = Regex{saved_reg[main_index]}; + if (event == PromptEvent::Abort) + RegisterManager::instance()[reg] = saved_reg; + else RegisterManager::instance()[reg] = ex.str(); + if (not ex.empty() and not ex.str().empty()) { bool main_wrapped = false;