Changed some key commands.

5 files changed, 18 insertions, 17 deletions

diff --git a/core/locale.conf b/core/locale.conf
index ce93ce6e..acf4358f 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -207,8 +207,8 @@ Select Lexer... = Select _Lexer...
 View = _View
 Next View = _Next View
 Previous View = _Previous View
-Split View Vertical = Split View _Vertical
 Split View Horizontal = Split View _Horizontal
+Split View Vertical = Split View _Vertical
 Unsplit View = _Unsplit View
 Unsplit All Views = Unsplit _All Views
 Grow View = _Grow View
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index 58274499..e47f7bb5 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -207,8 +207,8 @@ Select Lexer... = Выбрать тип _подсветки...
 View = _Вид
 Next View = _Следующий вид
 Previous View = _Предыдущий вид
-Split View Vertical = Разделить по _вертикали
 Split View Horizontal = Разделить по _горизонтали
+Split View Vertical = Разделить по _вертикали
 Unsplit View = _Убрать разделение
 Unsplit All Views = Убрать _все разделение
 Grow View = _Увеличить разделение
diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index f876b166..825f8cb0 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -42,7 +42,7 @@ Ctrl+(                  |⌘(       |Select in parentheses
 Ctrl+[                  |⌘[       |Select in brackets
 Ctrl+{                  |⌘{       |Select in braces
 Ctrl+Shift+D            |⌘⇧D      |Select word
-Ctrl+Shift+L            |⌘⇧L      |Select line
+Ctrl+Shift+N            |⌘⇧N      |Select line
 Ctrl+Shift+P            |⌘⇧P      |Select paragraph
 Ctrl+Shift+I            |⌘⇧I      |Select indented block
 Ctrl+Y                  |⌘⇧Y      |Select style
@@ -111,14 +111,14 @@ None            |None  |`UTF-8` encoding
 None            |None  |`ASCII` encoding
 None            |None  |`ISO-8859-1` encoding
 None            |None  |`UTF-16` encoding
-Ctrl+Alt+L      |⌘⌥L   |Select lexer...
+Ctrl+Shift+L    |⌘⇧L   |Select lexer...
 F5              |F5    |Refresh syntax highlighting
 
 **View**                        |||
 Ctrl+Alt+N               |^⌥⇥      |Next view
 Ctrl+Alt+P               |^⌥⇧⇥     |Previous view
-Ctrl+Alt+Shift+S         |^⇧S      |Split view vertical
-Ctrl+Alt+S               |^S       |Split view horizontal
+Ctrl+Alt+S<br/>Ctrl+Alt+H|^S       |Split view horizontal
+Ctrl+Alt+V               |^V       |Split view vertical
 Ctrl+Alt+W               |^W       |Unsplit view
 Ctrl+Alt+Shift+W         |^⇧W      |Unsplit all views
 Ctrl+Alt++<br/>Ctrl+Alt+=|^+<br/>^=|Grow view
@@ -127,7 +127,7 @@ None                     |None     |Toggle current fold
 Ctrl+Alt+Enter           |^↩       |Toggle view EOL
 Ctrl+Alt+\\              |^\\      |Toggle wrap mode
 Ctrl+Alt+Shift+I         |^⇧I      |Toggle show indent guides
-Ctrl+Alt+Space           |^Space   |Toggle view whitespace
+Ctrl+Alt+Shift+S         |^⇧S      |Toggle view whitespace
 Ctrl+Alt+Shift+V         |^⇧V      |Toggle virtual space
 Ctrl+=                   |⌘=       |Zoom in
 Ctrl+-                   |⌘-       |Zoom out
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 52ab0db1..bc4c44fe 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -101,9 +101,9 @@ if not RESETTING then constantize_menu_buffer_functions() end
   Windows and Linux menu key commands.
 
   Unassigned keys (~ denotes keys reserved by the operating system):
-  c:   A B C         H           N  p qQ     T ~ V   X Y      ) ] }  *      \n
+  c:   A B C         H              p qQ     T ~ V   X        ) ] }  *      \n
   a:  aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpP QrRsStTuUvVwWxXyYzZ_   ) ] }  *+-/=~~\n\s
-  ca: aAbBcCdDeE F  h   jJkK LmM N   PqQ    t   v   xXy zZ_"'()[]{}<>*  / ~~
+  ca: aAbBcCdDeE F      jJkKlLmM N   PqQ    t       xXy zZ_"'()[]{}<>*  / ~~  \s
 
   CTRL = 'c' (Control ^)
   ALT = 'a' (Alt)
@@ -116,9 +116,9 @@ if not RESETTING then constantize_menu_buffer_functions() end
   Mac OSX menu key commands.
 
   Unassigned keys (~ denotes keys reserved by the operating system):
-  m:   A B C        ~    JkK  ~M N  p  ~    tT U V   Xy       ) ] }  *    ~~\n~~
-  ma: aAbBcC~DeE F  ~HiIjJkK L~MnN  pPq~rRsStTuUvVwWxXyYzZ_"'()[]{}<>*+-/=  \n~~
-  c:      cC D    gG H  J K L    oO  qQ         v   xXyYzZ_   ) ] }  *  /
+  m:   A B C        ~    JkK  ~M    p  ~    tT U V   Xy       ) ] }  *    ~~\n~~
+  ma: aAbBcC~DeE F  ~HiIjJkKlL~MnN  pPq~rRsStTuUvVwWxXyYzZ_"'()[]{}<>*+-/=  \n~~
+  c:      cC D    gG H  J K L    oO  qQ             xXyYzZ_   ) ] }  *  /     \s
 
   CTRL = 'c' (Control ^)
   ALT = 'a' (Alt/option ⌥)
@@ -169,7 +169,7 @@ keys[not OSX and 'c(' or 'm('] = { m_editing.select_enclosed, '(', ')' }
 keys[not OSX and 'c[' or 'm['] = { m_editing.select_enclosed, '[', ']' }
 keys[not OSX and 'c{' or 'm{'] = { m_editing.select_enclosed, '{', '}' }
 keys[not OSX and 'cD' or 'mD'] = { m_editing.current_word, 'select' }
-keys[not OSX and 'cL' or 'mL'] = m_editing.select_line
+keys[not OSX and 'cN' or 'mN'] = m_editing.select_line
 keys[not OSX and 'cP' or 'mP'] = m_editing.select_paragraph
 keys[not OSX and 'cI' or 'mI'] = m_editing.select_indented_block
 keys[not OSX and 'cY' or 'mY'] = m_editing.select_style
@@ -254,14 +254,15 @@ keys[not OSX and 'cai' or 'ci'] = m_editing.convert_indentation
 -- TODO: { utils.set_encoding, 'ISO-8859-1' }
 -- TODO: { utils.set_encoding, 'MacRoman' }
 -- TODO: { utils.set_encoding, 'UTF-16LE' }
-keys[not OSX and 'cal' or 'mal'] = m_textadept.mime_types.select_lexer
+keys[not OSX and 'cL' or 'mL'] = m_textadept.mime_types.select_lexer
 keys.f5 = { _buffer.colourise, _buffer, 0, -1 }
 
 -- View.
 keys[not OSX and 'can' or 'ca\t'] = { gui.goto_view, 1, false }
 keys[not OSX and 'cap' or 'cas\t'] = { gui.goto_view, -1, false }
-keys[not OSX and 'caS' or 'cS'] = { _view.split, _view }
 keys[not OSX and 'cas' or 'cs'] = { _view.split, _view, false }
+if not OSX then keys.cah = keys.cas end
+keys[not OSX and 'cav' or 'cv'] = { _view.split, _view }
 keys[not OSX and 'caw' or 'cw'] = { _view.unsplit, _view }
 keys[not OSX and 'caW' or 'cW'] = utils.unsplit_all
 keys[not OSX and 'ca+' or 'c+'] = { utils.grow, 10 }
@@ -273,7 +274,7 @@ if not OSX then keys['ca\n\r'] = keys['ca\n'] end
 keys[not OSX and 'ca\\' or 'c\\'] = { utils.toggle_property, 'wrap_mode' }
 keys[not OSX and 'caI' or 'cI'] =
   { utils.toggle_property, 'indentation_guides' }
-keys[not OSX and 'ca ' or 'c '] = { utils.toggle_property, 'view_ws' }
+keys[not OSX and 'caS' or 'cS'] = { utils.toggle_property, 'view_ws' }
 keys[not OSX and 'caV' or 'cV'] =
   { utils.toggle_property, 'virtual_space_options', c.SCVS_USERACCESSIBLE }
 keys[not OSX and 'c=' or 'm='] = _buffer.zoom_in
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 541f18a6..304a4f0d 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -182,8 +182,8 @@ menubar = {
     { L('Next View'), { gui.goto_view, 1, false } },
     { L('Previous View'), { gui.goto_view, -1, false } },
     SEPARATOR,
-    { L('Split View Vertical'), { _view.split, _view } },
     { L('Split View Horizontal'), { _view.split, _view, false } },
+    { L('Split View Vertical'), { _view.split, _view } },
     { L('Unsplit View'), { _view.unsplit, _view } },
     { L('Unsplit All Views'), utils.unsplit_all },
     { L('Grow View'), { utils.grow, 10 } },