Move keymap as an implementation detail of the normal mode keys

Only expose a free function that tries to get the NormalCmd from a
key.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/input_handler.cc b/src/input_handler.cc
index d4214ed1..25ceacc3 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -281,19 +281,18 @@ public:
                 context().client().info_hide();
 
             do_restore_hooks = true;
-            auto it = keymap.find(key);
-            if (it != keymap.end() and it->key == key)
+            if (auto command = get_normal_command(key))
             {
                 auto autoinfo = context().options()["autoinfo"].get<AutoInfo>();
                 if (autoinfo & AutoInfo::Normal and context().has_client())
-                    context().client().info_show(key_to_str(key), it->value.docstring.str(),
+                    context().client().info_show(key_to_str(key), command->docstring.str(),
                                                  {}, InfoStyle::Prompt);
 
                 // reset m_params now to be reentrant
                 NormalParams params = m_params;
                 m_params = { 0, 0 };
 
-                it->value.func(context(), params);
+                command->func(context(), params);
             }
         }