summaryrefslogtreecommitdiff
path: root/src/main.cc
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2013-04-06 13:02:16 +0200
committerMaxime Coste <frrrwww@gmail.com>2013-04-06 13:02:16 +0200
commitbe9bfa479fccf9c8dc7732b8b382b05d3a647aec (patch)
treee2029f826819215d6944b6221572e86034db08ab /src/main.cc
parent1ab8120147b7e5a8dbcdd51f36e8b4d6de2f8567 (diff)
use more explicit prompts for search and pipe, use color to validate
Diffstat (limited to 'src/main.cc')
-rw-r--r--src/main.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.cc b/src/main.cc
index aaa85d76..7f1fa201 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -155,7 +155,7 @@ void do_command(Context& context)
void do_pipe(Context& context)
{
- context.input_handler().prompt("|", get_color("StatusLine"), complete_nothing,
+ context.input_handler().prompt("pipe: ", get_color("Prompt"), complete_nothing,
[](const String& cmdline, PromptEvent event, Context& context)
{
if (event != PromptEvent::Validate)
@@ -174,8 +174,9 @@ void do_pipe(Context& context)
template<SelectMode mode, bool forward>
void do_search(Context& context)
{
+ const char* prompt = forward ? "search: " : "reverse search: ";
SelectionList selections = context.editor().selections();
- context.input_handler().prompt("/", get_color("StatusLine"), complete_nothing,
+ context.input_handler().prompt(prompt, get_color("Prompt"), complete_nothing,
[selections](const String& str, PromptEvent event, Context& context) {
try
{
@@ -185,6 +186,7 @@ void do_search(Context& context)
return;
Regex ex{str};
+ context.input_handler().set_prompt_colors(get_color("Prompt"));
if (event == PromptEvent::Validate)
{
if (str.empty())
@@ -202,6 +204,8 @@ void do_search(Context& context)
{
if (event == PromptEvent::Validate)
throw runtime_error("regex error: "_str + err.what());
+ else
+ context.input_handler().set_prompt_colors(get_color("Error"));
}
catch (runtime_error&)
{