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

fix regex prompt whith empty regex

Browse Source
This commit is contained in:
Maxime Coste 2013-05-13 14:28:03 +02:00
parent 26f0fd4cc6
commit 42be2b23ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/normal.cc
View File

@ -386,7 +386,7 @@ void regex_prompt(Context& context, const String prompt, T on_validate)
{ {
try try
{ {
on_validate(Regex{str}, context); on_validate(str.empty() ? Regex{} : Regex{str}, context);
} }
catch (boost::regex_error& err) catch (boost::regex_error& err)
{ {
@ -408,7 +408,7 @@ void select_regex(Context& context)
ex = Regex{RegisterManager::instance()['/'].values(context)[0]}; ex = Regex{RegisterManager::instance()['/'].values(context)[0]};
else else
RegisterManager::instance()['/'] = String{ex.str()}; RegisterManager::instance()['/'] = String{ex.str()};
if (not ex.empty()) if (not ex.empty() and not ex.str().empty())
context.editor().multi_select(std::bind(select_all_matches, _1, ex)); context.editor().multi_select(std::bind(select_all_matches, _1, ex));
}); });
} }
@ -420,7 +420,7 @@ void split_regex(Context& context)
ex = Regex{RegisterManager::instance()['/'].values(context)[0]}; ex = Regex{RegisterManager::instance()['/'].values(context)[0]};
else else
RegisterManager::instance()['/'] = String{ex.str()}; RegisterManager::instance()['/'] = String{ex.str()};
if (not ex.empty()) if (not ex.empty() and not ex.str().empty())
context.editor().multi_select(std::bind(split_selection, _1, ex)); context.editor().multi_select(std::bind(split_selection, _1, ex));
}); });
} }