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

Merge remote-tracking branch 'Delapouite/stars-less'

Browse Source
This commit is contained in:
Maxime Coste 2017-07-08 13:31:17 +09:00
commit 8cad40a0c9
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/input_handler.cc
View File

@ -141,17 +141,17 @@ private:
constexpr StringView register_doc = constexpr StringView register_doc =
"Special registers:\n" "Special registers:\n"
" * %: buffer name\n" "[0-9]: selections capture group\n"
" * .: selection contents\n" "%: buffer name\n"
" * #: selection index\n" ".: selection contents\n"
" * [0-9]: selections capture group\n" "#: selection index\n"
" * _: null register\n" "_: null register\n"
" * \": default yank/paste register\n" "\": default yank/paste register\n"
" * @: default macro register\n" "@: default macro register\n"
" * /: default search register\n" "/: default search register\n"
" * ^: default mark register\n" "^: default mark register\n"
" * |: default shell command register\n" "|: default shell command register\n"
" * :: last entered command\n"; ":: last entered command\n";
class Normal : public InputMode class Normal : public InputMode
{ {
@ -263,7 +263,7 @@ public:
{ format("invalid register '{}'", *cp), { format("invalid register '{}'", *cp),
get_face("Error") }); get_face("Error") });
} }
}, "Enter target register", register_doc); }, "enter target register", register_doc);
} }
else else
{ {
@ -767,7 +767,7 @@ public:
display(); display();
m_line_changed = true; m_line_changed = true;
} }
}, "Enter register name", register_doc); }, "enter register name", register_doc);
display(); display();
return; return;
} }
@ -1189,7 +1189,7 @@ public:
[this](Key key, Context&) { [this](Key key, Context&) {
if (auto cp = key.codepoint()) if (auto cp = key.codepoint())
insert(RegisterManager::instance()[*cp].get(context())); insert(RegisterManager::instance()[*cp].get(context()));
}, "Enter register name", register_doc); }, "enter register name", register_doc);
update_completions = false; update_completions = false;
} }
else if (key == ctrl('n')) else if (key == ctrl('n'))
@ -1214,11 +1214,10 @@ public:
m_completer.explicit_word_complete(); m_completer.explicit_word_complete();
if (key.key == 'l') if (key.key == 'l')
m_completer.explicit_line_complete(); m_completer.explicit_line_complete();
}, "Complete", }, "enter completion type",
" Enter completion type:\n" "f: filename\n"
" * f: filename completion\n" "w: word\n"
" * w: word completion\n" "l: line\n");
" * l: line completion\n");
update_completions = false; update_completions = false;
} }
else if (key == ctrl('o')) else if (key == ctrl('o'))