Change Command+Option+Letter keys to Control+Command+Letter keys on Mac OSX.

The Option+Letter combination produces locale-dependent characters so it cannot
be used reliably.

3 files changed, 21 insertions, 21 deletions

diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index 825f8cb0..61cd8a0d 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -7,7 +7,7 @@ Linux / Win32 | Mac OSX | Command |
 **File**                        |||
 Ctrl+N      |⌘N  |New file
 Ctrl+O      |⌘O  |Open file
-Ctrl+Alt+O  |⌘⌥O |Open recent file...
+Ctrl+Alt+O  |^⌘O |Open recent file...
 Ctrl+Shift+O|⌘⇧O |Reload file
 Ctrl+S      |⌘S  |Save file
 Ctrl+Shift+S|⌘⇧S |Save file as..
@@ -66,10 +66,10 @@ Ctrl+G<br/>F3            |⌘G  |Find next
 Ctrl+Shift+G<br/>Shift+F3|⌘⇧G |Find previous
 Ctrl+Alt+R               |^R  |Replace
 Ctrl+Alt+Shift+R         |^⇧R |Replace all
-Ctrl+Alt+F               |⌘⌥F |Find incremental
+Ctrl+Alt+F               |^⌘F |Find incremental
 Ctrl+Shift+F             |⌘⇧F |Find in files
-Ctrl+Alt+G               |⌘⌥G |Goto next file found
-Ctrl+Alt+Shift+G         |⌘⌥⇧G|Goto previous file found
+Ctrl+Alt+G               |^⌘G |Goto next file found
+Ctrl+Alt+Shift+G         |^⌘⇧G|Goto previous file found
 Ctrl+J                   |⌘J  |Jump to line
 
 **Tools**                       |||
@@ -91,7 +91,7 @@ Shift+F2        |⇧F2    |Previous bookmark
 Alt+F2          |⌥F2    |Goto bookmark...
 Ctrl+U          |⌘U     |Snapopen `_USERHOME`
 None            |None   |Snapopen `_HOME`
-Ctrl+Alt+Shift+O|⌘⌥⇧O   |Snapopen current directory
+Ctrl+Alt+Shift+O|^⌘⇧O   |Snapopen current directory
 Ctrl+I          |⌘I     |Show style
 
 **Buffer**                      |||
@@ -149,13 +149,13 @@ Ctrl+Up                      |^⇡          |Scroll line up
 Alt+Shift+Up                 |⌥⇧⇡         |Line up extend rect. selection
 Left                         |⇠<br/>^B    |Char left
 Shift+Left                   |⇧⇠<br/>^⇧B  |Char left extend selection
-Ctrl+Left                    |^⇠<br/>^⌥B  |Word left
-Ctrl+Shift+Left              |^⇧⇠<br/>^⌥⇧B|Word left extend selection
+Ctrl+Left                    |^⇠<br/>^⌘B  |Word left
+Ctrl+Shift+Left              |^⇧⇠<br/>^⌘⇧B|Word left extend selection
 Alt+Shift+Left               |⌥⇧⇠         |Char left extend rect. selection
 Right                        |⇢<br/>^F    |Char right
 Shift+Right                  |⇧⇢<br/>^⇧F  |Char right extend selection
-Ctrl+Right                   |^⇢<br/>^⌥F  |Word right
-Ctrl+Shift+Right             |^⇧⇢<br/>^⌥⇧F|Word right extend selection
+Ctrl+Right                   |^⇢<br/>^⌘F  |Word right
+Ctrl+Shift+Right             |^⇧⇢<br/>^⌘⇧F|Word right extend selection
 Alt+Shift+Right              |⌥⇧⇢         |Char right extend rect. selection
 Home                         |⌘⇠<br/>^A   |Line start
 Shift+Home                   |⌘⇧⇠<br/>^⇧A |Line start extend selection
diff --git a/doc/manual/6_AdeptEditing.md b/doc/manual/6_AdeptEditing.md
index 1459903b..ba633e53 100644
--- a/doc/manual/6_AdeptEditing.md
+++ b/doc/manual/6_AdeptEditing.md
@@ -62,7 +62,7 @@ it is visible, use the button mnemonics: `Alt+N`, `Alt+P`, `Alt+R`, and `Alt+A`
 `Ctrl+Shift+F` brings up Find in Files (`⌘⇧F` on Mac OSX) and will prompt for a
 directory to search. The results are displayed in a new buffer. Double-clicking
 a search result jumps to it in the file. You can also use the `Ctrl+Alt+G` and
-`Ctrl+Alt+Shift+G` (`⌘⌥G` and `⌘⌥⇧G` on Mac OSX) key commands. Replace in Files
+`Ctrl+Alt+Shift+G` (`^⌘G` and `^⌘⇧G` on Mac OSX) key commands. Replace in Files
 is not supported. You will have to `Find in Files` first, and then `Replace All`
 for each file a result is found in. The `Match Case`, `Whole Word`, and
 `Lua pattern` flags still apply.
@@ -71,7 +71,7 @@ for each file a result is found in. The `Match Case`, `Whole Word`, and
 
 #### Find Incremental
 
-You can start an incremental search by pressing `Ctrl+Alt+F` (`⌘⌥F` on Mac OSX).
+You can start an incremental search by pressing `Ctrl+Alt+F` (`^⌘F` on Mac OSX).
 Incremental search searches the buffer as you type. Only the `Match Case` option
 is recognized.
 
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index bc4c44fe..517502ec 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -117,8 +117,8 @@ if not RESETTING then constantize_menu_buffer_functions() end
 
   Unassigned keys (~ denotes keys reserved by the operating system):
   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
+  cm: aAbBcC~DeE F  ~HiIjJkKlL~MnN  pPq~rRsStTuUvVwWxXyYzZ_"'()[]{}<>*+-/=\t\n~~
 
   CTRL = 'c' (Control ^)
   ALT = 'a' (Alt/option ⌥)
@@ -132,7 +132,7 @@ if not RESETTING then constantize_menu_buffer_functions() end
 -- File.
 keys[not OSX and 'cn' or 'mn'] = new_buffer
 keys[not OSX and 'co' or 'mo'] = io.open_file
-keys[not OSX and 'cao' or 'mao'] = io.open_recent_file
+keys[not OSX and 'cao' or 'cmo'] = io.open_recent_file
 keys[not OSX and 'cO' or 'mO'] = _buffer.reload
 keys[not OSX and 'cs' or 'ms'] = _buffer.save
 keys[not OSX and 'cS' or 'mS'] = _buffer.save_as
@@ -200,11 +200,11 @@ keys[not OSX and 'caR' or 'cR'] = gui.find.replace_all
 -- Find Prev is ap when find pane is focused.
 -- Replace is ar when find pane is focused.
 -- Replace All is aa when find pane is focused.
-keys[not OSX and 'caf' or 'maf'] = gui.find.find_incremental
+keys[not OSX and 'caf' or 'cmf'] = gui.find.find_incremental
 keys[not OSX and 'cF' or 'mF'] = utils.find_in_files
 -- Find in Files is ai when find pane is focused.
-keys[not OSX and 'cag' or 'mag'] = { gui.find.goto_file_in_list, true }
-keys[not OSX and 'caG' or 'maG'] = { gui.find.goto_file_in_list, false }
+keys[not OSX and 'cag' or 'cmg'] = { gui.find.goto_file_in_list, true }
+keys[not OSX and 'caG' or 'cmG'] = { gui.find.goto_file_in_list, false }
 keys[not OSX and 'cj' or 'mj'] = m_editing.goto_line
 
 -- Tools.
@@ -230,7 +230,7 @@ keys.af2 = m_textadept.bookmarks.goto
 -- Snapopen.
 keys[not OSX and 'cu' or 'mu'] = { m_textadept.snapopen.open, _USERHOME }
 -- TODO: { m_textadept.snapopen.open, _HOME }
-keys[not OSX and 'caO' or 'maO'] = utils.snapopen_filedir
+keys[not OSX and 'caO' or 'cmO'] = utils.snapopen_filedir
 keys[not OSX and 'ci' or 'mi'] = utils.show_style
 
 -- Buffer.
@@ -295,12 +295,12 @@ if OSX then
   end
   keys.cf = _buffer.char_right
   keys.cF = _buffer.char_right_extend
-  keys.caf = _buffer.word_right
-  keys.caF = _buffer.word_right_extend
+  keys.cmf = _buffer.word_right
+  keys.cmF = _buffer.word_right_extend
   keys.cb = _buffer.char_left
   keys.cB = _buffer.char_left_extend
-  keys.cab = _buffer.word_left
-  keys.caB = _buffer.word_left_extend
+  keys.cmb = _buffer.word_left
+  keys.cmB = _buffer.word_left_extend
   keys.cn = _buffer.line_down
   keys.cN = _buffer.line_down_extend
   keys.cp = _buffer.line_up