diff options
| author | Maxime Coste <frrrwww@gmail.com> | 2015-03-09 13:55:55 +0000 |
|---|---|---|
| committer | Maxime Coste <frrrwww@gmail.com> | 2015-03-09 13:55:55 +0000 |
| commit | d1f17228dd20fe42b88bcdf39d5316c7cfae74e2 (patch) | |
| tree | 54c88949235b7db1b5f75fc2d422dd282af40066 /src | |
| parent | 1cec8df45e297a8136df6f293d4874ae6c6cb013 (diff) | |
Use a static array to store the keymap
Diffstat (limited to 'src')
| -rw-r--r-- | src/normal.cc | 4 | ||||
| -rw-r--r-- | src/normal.hh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/normal.cc b/src/normal.cc index 7a6cc6dd..bfdfcf65 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -1350,7 +1350,7 @@ void move(Context& context, NormalParams params) selections.sort_and_merge_overlapping(); } -KeyMap keymap = +static NormalCmdDesc cmds[] = { { 'h', "move left", move<CharCount, Backward> }, { 'j', "move down", move<LineCount, Forward> }, @@ -1515,4 +1515,6 @@ KeyMap keymap = { Key::PageDown, "scroll one page down", scroll<Key::PageDown> }, }; +KeyMap keymap = cmds; + } diff --git a/src/normal.hh b/src/normal.hh index 4a453415..96cf1457 100644 --- a/src/normal.hh +++ b/src/normal.hh @@ -1,8 +1,8 @@ #ifndef normal_hh_INCLUDED #define normal_hh_INCLUDED +#include "array_view.hh" #include "keys.hh" -#include "unordered_map.hh" #include "string.hh" namespace Kakoune @@ -23,7 +23,7 @@ struct NormalCmdDesc void (*func)(Context& context, NormalParams params); }; -using KeyMap = Vector<NormalCmdDesc>; +using KeyMap = const ArrayView<NormalCmdDesc>; extern KeyMap keymap; } |