diff options
| author | Maxime Coste <mawww@kakoune.org> | 2022-06-12 21:30:56 +1000 |
|---|---|---|
| committer | Maxime Coste <mawww@kakoune.org> | 2022-07-05 08:43:40 +1000 |
| commit | f3cb2e434004a718d1225cb0d74c694e66a7248b (patch) | |
| tree | 3db093128a1fac7610e9e339b3fc93493446b831 /src | |
| parent | df79d0c2453991c4762c6c6ffbccd714312c87f9 (diff) | |
Remove <esc> as end macro recording, Q should be enough
Besides being redundant, it is easy to press esc by mistake/habit
while recording a macro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/input_handler.cc | 2 | ||||
| -rw-r--r-- | src/main.cc | 1 | ||||
| -rw-r--r-- | src/normal.cc | 8 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc index 9a622559..4f67678e 100644 --- a/src/input_handler.cc +++ b/src/input_handler.cc @@ -319,6 +319,8 @@ public: command->func(context(), params); } + else + m_params = { 0, 0 }; } context().hooks().run_hook(Hook::NormalKey, key_to_str(key), context()); diff --git a/src/main.cc b/src/main.cc index 83d37a9d..22adf194 100644 --- a/src/main.cc +++ b/src/main.cc @@ -45,6 +45,7 @@ struct { StringView notes; } constexpr version_notes[] = { { 0, + "» {+b}<esc>{} does not end macro recording anymore, use {+b}Q{}\n" "» pipe commands do not append final end-of-lines anymore\n" "» {+u}complete-command{} to configure command completion\n" "» {+b}!{} and {+b}<a-!>{} now select the inserted text\n" diff --git a/src/normal.cc b/src/normal.cc index 7694f513..09aad6f8 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -1548,12 +1548,6 @@ void start_or_end_macro_recording(Context& context, NormalParams params) } } -void end_macro_recording(Context& context, NormalParams) -{ - if (context.input_handler().is_recording()) - context.input_handler().stop_recording(); -} - void replay_macro(Context& context, NormalParams params) { const char reg = to_lower(params.reg ? params.reg : '@'); @@ -2357,8 +2351,6 @@ static constexpr HashMap<Key, NormalCmd, MemoryDomain::Undefined, KeymapBackend> { {'q'}, {"replay recorded macro", replay_macro} }, { {'Q'}, {"start or end macro recording", start_or_end_macro_recording} }, - { {Key::Escape}, {"end macro recording", end_macro_recording} }, - { {'`'}, {"convert to lower case in selections", for_each_codepoint<to_lower>} }, { {'~'}, {"convert to upper case in selections", for_each_codepoint<to_upper>} }, { {alt('`')}, { "swap case in selections", for_each_codepoint<swap_case>} }, |