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.
This commit is contained in:
Maxime Coste 2022-06-12 21:30:56 +10:00
parent df79d0c245
commit f3cb2e4340
3 changed files with 3 additions and 8 deletions

View File

@ -319,6 +319,8 @@ public:
command->func(context(), params); command->func(context(), params);
} }
else
m_params = { 0, 0 };
} }
context().hooks().run_hook(Hook::NormalKey, key_to_str(key), context()); context().hooks().run_hook(Hook::NormalKey, key_to_str(key), context());

View File

@ -45,6 +45,7 @@ struct {
StringView notes; StringView notes;
} constexpr version_notes[] = { { } constexpr version_notes[] = { {
0, 0,
"» {+b}<esc>{} does not end macro recording anymore, use {+b}Q{}\n"
"» pipe commands do not append final end-of-lines anymore\n" "» pipe commands do not append final end-of-lines anymore\n"
"» {+u}complete-command{} to configure command completion\n" "» {+u}complete-command{} to configure command completion\n"
"» {+b}!{} and {+b}<a-!>{} now select the inserted text\n" "» {+b}!{} and {+b}<a-!>{} now select the inserted text\n"

View File

@ -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) void replay_macro(Context& context, NormalParams params)
{ {
const char reg = to_lower(params.reg ? params.reg : '@'); 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'}, {"replay recorded macro", replay_macro} },
{ {'Q'}, {"start or end macro recording", start_or_end_macro_recording} }, { {'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 lower case in selections", for_each_codepoint<to_lower>} },
{ {'~'}, {"convert to upper case in selections", for_each_codepoint<to_upper>} }, { {'~'}, {"convert to upper case in selections", for_each_codepoint<to_upper>} },
{ {alt('`')}, { "swap case in selections", for_each_codepoint<swap_case>} }, { {alt('`')}, { "swap case in selections", for_each_codepoint<swap_case>} },