From 973487abcd469a51a23f0d293a455ed73da7804c Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Thu, 18 May 2017 06:05:45 +0100
Subject: [PATCH] Small reorganization in the normal keymap

---
 src/normal.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/normal.cc b/src/normal.cc
index 25becfff..6b2b568a 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -1787,6 +1787,11 @@ const HashMap<Key, NormalCmd> keymap{
     { {'k'}, {"move up",  move<LineCount, Backward>} },
     { {'l'}, {"move right", move<CharCount, Forward>} },
 
+    { {Key::Left}, { "move left", move<CharCount, Backward>} },
+    { {Key::Down}, { "move down", move<LineCount, Forward>} },
+    { {Key::Up}, {   "move up", move<LineCount, Backward>} },
+    { {Key::Right}, {"move right", move<CharCount, Forward>} },
+
     { {'H'}, {"extend left", move<CharCount, Backward, SelectMode::Extend>} },
     { {'J'}, {"extend down", move<LineCount, Forward, SelectMode::Extend>} },
     { {'K'}, {"extend up", move<LineCount, Backward, SelectMode::Extend>} },
@@ -1817,6 +1822,9 @@ const HashMap<Key, NormalCmd> keymap{
     { {'v'}, {"move view", view_commands<false>} },
     { {'V'}, {"move view (locked)", view_commands<true>} },
 
+    { {Key::PageUp}, {  "scroll one page up", scroll<Backward>} },
+    { {Key::PageDown}, {"scroll one page down", scroll<Forward>} },
+
     { {'y'}, {"yank selected text", yank} },
     { {'p'}, {"paste after selected text", repeated<paste<InsertMode::Append>>} },
     { {'P'}, {"paste before selected text", repeated<paste<InsertMode::Insert>>} },
@@ -1943,19 +1951,11 @@ const HashMap<Key, NormalCmd> keymap{
 
     { {','}, {"user mappings", exec_user_mappings} },
 
-    { {Key::Left}, { "move left", move<CharCount, Backward>} },
-    { {Key::Down}, { "move down", move<LineCount, Forward>} },
-    { {Key::Up}, {   "move up", move<LineCount, Backward>} },
-    { {Key::Right}, {"move right", move<CharCount, Forward>} },
-
     { {ctrl('b')}, {"scroll one page up", scroll<Backward >} },
     { {ctrl('f')}, {"scroll one page down", scroll<Forward>} },
     { {ctrl('u')}, {"scroll half a page up", scroll<Backward, true>} },
     { {ctrl('d')}, {"scroll half a page down", scroll<Forward, true>} },
 
-    { {Key::PageUp}, {  "scroll one page up", scroll<Backward>} },
-    { {Key::PageDown}, {"scroll one page down", scroll<Forward>} },
-
     { {'z'}, {"restore selections from register", restore_selections<false>} },
     { {alt('z')}, {"append selections from register", restore_selections<true>} },
     { {'Z'}, {"save selections to register", save_selections<false>} },