xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/jo-he/kakoune

Browse Source
This commit is contained in:
Maxime Coste 2019-07-07 09:13:11 +10:00
commit 9e62d2c345
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -493,7 +493,7 @@ Changes
tabstop option or the count parameter for tabstop. tabstop option or the count parameter for tabstop.
* `<a-)>`: rotate selections content, if specified, the count groups * `<a-)>`: rotate selections content, if specified, the count groups
selections, so `3<a-">` rotate (1, 2, 3) and (3, 4, 6) selections, so `3<a-)>` rotate (1, 2, 3) and (3, 4, 6)
independently. independently.
* `<a-(>`: rotate selections content backwards * `<a-(>`: rotate selections content backwards

4
doc/pages/keys.asciidoc
View File

@ -746,10 +746,10 @@ The following keys are recognized by this mode to help with editing
erase to previous WORD begin, save erased content to *clipboard* erase to previous WORD begin, save erased content to *clipboard*
*<a-d>*:: *<a-d>*::
erase to previous word end, save erased content to *clipboard* erase to next word begin, save erased content to *clipboard*
*<a-D>*:: *<a-D>*::
erase to previous WORD end, save erased content to *clipboard* erase to next WORD begin, save erased content to *clipboard*
*<c-k>*:: *<c-k>*::
erase to end of line, save erased content to *clipboard* erase to end of line, save erased content to *clipboard*

2
doc/pages/options.asciidoc
View File

@ -261,7 +261,7 @@ are exclusively available to built-in options.
timeout, in milliseconds, with no user input that will trigger the timeout, in milliseconds, with no user input that will trigger the
*PromptIdle*, *InsertIdle* and *NormalIdle* hooks, and autocompletion. *PromptIdle*, *InsertIdle* and *NormalIdle* hooks, and autocompletion.
*fs_checkout_timeout* `int`:: *fs_check_timeout* `int`::
_default_ 500 + _default_ 500 +
timeout, in milliseconds, between checks in normal mode of modifications timeout, in milliseconds, between checks in normal mode of modifications
of the file associated with the current buffer on the filesystem. of the file associated with the current buffer on the filesystem.

4
src/input_handler.cc
View File

@ -490,7 +490,7 @@ public:
} }
else if (key == alt('f')) else if (key == alt('f'))
to_next_word_begin<Word>(m_cursor_pos, m_line); to_next_word_begin<Word>(m_cursor_pos, m_line);
else if (key == alt('W')) else if (key == alt('F'))
to_next_word_begin<WORD>(m_cursor_pos, m_line); to_next_word_begin<WORD>(m_cursor_pos, m_line);
else if (key == alt('b')) else if (key == alt('b'))
to_prev_word_begin<Word>(m_cursor_pos, m_line); to_prev_word_begin<Word>(m_cursor_pos, m_line);
@ -514,7 +514,7 @@ public:
else if (key == ctrl('w') or key == alt(Key::Backspace)) else if (key == ctrl('w') or key == alt(Key::Backspace))
erase_move(&to_prev_word_begin<Word>); erase_move(&to_prev_word_begin<Word>);
else if (key == ctrl('W')) else if (key == ctrl('W'))
erase_move(&to_prev_word_begin<Word>); erase_move(&to_prev_word_begin<WORD>);
else if (key == alt('d')) else if (key == alt('d'))
erase_move(&to_next_word_begin<Word>); erase_move(&to_next_word_begin<Word>);
else if (key == alt('D')) else if (key == alt('D'))