Merge remote-tracking branch 'Delapouite/docs-scroll'

This commit is contained in:
Maxime Coste 2017-10-07 21:51:37 +08:00
commit ca17fbbeb9
3 changed files with 17 additions and 9 deletions

View File

@ -369,8 +369,10 @@ Movement
* `<a-n>`: select previous match
* `<a-N>`: add a new selection with previous match
* `pageup`: scroll up
* `pagedown`: scroll down
* `pageup, <c-b>`: scroll one page up
* `pagedown, <c-f>`: scroll one page down
* `<c-u>`: scroll half a page up
* `<c-d>`: scroll half a page down
* `'`: rotate selections (the main selection becomes the next one)
* `<a-'>`: rotate selections backwards

View File

@ -179,11 +179,17 @@ is a sequence of non whitespace characters
*<a-N>*::
add a new selection with previous match
*pageup*::
scroll up
*pageup, <c-b>*::
scroll one page up
*pagedown*::
scroll down
*pagedown, <c-f>*::
scroll one page down
*<c-u>*::
scroll half a page up
*<c-d>*::
scroll half a page down
*'*::
rotate selections (the main selection becomes the next one)

View File

@ -1989,9 +1989,6 @@ 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>>} },
@ -2118,6 +2115,9 @@ const HashMap<Key, NormalCmd> keymap{
{ {','}, {"user mappings", exec_user_mappings} },
{ {Key::PageUp}, { "scroll one page up", scroll<Backward>} },
{ {Key::PageDown}, {"scroll one page down", scroll<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>} },