1 files changed, 10 insertions, 1 deletions
diff --git a/src/input_handler.cc b/src/input_handler.cc
index a440dc1a..2e4a58f8 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -106,7 +106,16 @@ public:
             }
             auto it = keymap.find(key);
             if (it != keymap.end())
-                it->second(context(), m_count);
+            {
+                if (context().options()["autoinfo"].get<int>() >= 2 and context().has_ui())
+                {
+                    ColorPair col = get_color("Information");
+                    CharCoord pos = context().window().dimensions();
+                    pos.column -= 1;
+                    context().ui().info_show(key_to_str(key), it->second.docstring, pos, col, MenuStyle::Prompt);
+                }
+                it->second.func(context(), m_count);
+            }
             m_count = 0;
 
         }