xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid restoring selections in regex_prompt when they cannot have been modified

Browse Source
This commit is contained in:
Maxime Coste 2015-09-04 19:00:42 +01:00
parent 3e9fcf828f
commit a45876124b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/normal.cc
View File

@ -563,16 +563,20 @@ void regex_prompt(Context& context, const String prompt, T func)
{ {
if (event != PromptEvent::Change and context.has_ui()) if (event != PromptEvent::Change and context.has_ui())
context.ui().info_hide(); context.ui().info_hide();
const bool incsearch = context.options()["incsearch"].get<bool>();
if (incsearch)
{
selections.update(); selections.update();
context.selections_write_only() = selections; context.selections_write_only() = selections;
if (context.has_window()) if (context.has_window())
context.window().set_position(position); context.window().set_position(position);
context.input_handler().set_prompt_face(get_face("Prompt")); context.input_handler().set_prompt_face(get_face("Prompt"));
if (event == PromptEvent::Abort) }
return;
if (event == PromptEvent::Change and if (event == PromptEvent::Abort or
(str.empty() or not context.options()["incsearch"].get<bool>())) (event == PromptEvent::Change and (not incsearch or str.empty())))
return; return;
if (event == PromptEvent::Validate) if (event == PromptEvent::Validate)