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

Merge remote-tracking branch 'evertvp/master'

Browse Source
This commit is contained in:
Maxime Coste 2014-03-24 21:44:14 +00:00
commit bbdb2494d1
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/input_handler.cc
View File

@ -337,6 +337,18 @@ String common_prefix(memoryview<String> strings)
return res; return res;
} }
void history_push(std::vector<String>& history, const String& entry)
{
if(entry.empty())
{
return;
}
std::vector<String>::iterator it;
while ((it = find(history, entry)) != history.end())
history.erase(it);
history.push_back(entry);
}
class Prompt : public InputMode class Prompt : public InputMode
{ {
public: public:
@ -365,13 +377,7 @@ public:
} }
else if (key == ctrl('m')) // enter else if (key == ctrl('m')) // enter
{ {
if (not line.empty()) history_push(history, line);
{
std::vector<String>::iterator it;
while ((it = find(history, line)) != history.end())
history.erase(it);
history.push_back(line);
}
context().print_status(DisplayLine{}); context().print_status(DisplayLine{});
if (context().has_ui()) if (context().has_ui())
context().ui().menu_hide(); context().ui().menu_hide();
@ -383,6 +389,7 @@ public:
} }
else if (key == Key::Escape or key == ctrl('c')) else if (key == Key::Escape or key == ctrl('c'))
{ {
history_push(history, line);
context().print_status(DisplayLine{}); context().print_status(DisplayLine{});
if (context().has_ui()) if (context().has_ui())
context().ui().menu_hide(); context().ui().menu_hide();