Swap Replace/Replace All and Run/Compile key bindings.

Replace/Replace All is destructive so it should not be easily accessible where
it can be mistakenly pressed.

4 files changed, 15 insertions, 15 deletions

diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index e2b65bdd..cb3ada08 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -64,8 +64,8 @@ Ctrl+Shift+Down         |^⇧⇣      |Move selected lines down
 Ctrl+F                   |⌘F  |Find
 Ctrl+G<br/>F3            |⌘G  |Find next
 Ctrl+Shift+G<br/>Shift+F3|⌘⇧G |Find previous
-Ctrl+R                   |⌘R  |Replace
-Ctrl+Shift+R             |⌘⇧R |Replace all
+Ctrl+Alt+R               |^R  |Replace
+Ctrl+Alt+Shift+R         |^⇧R |Replace all
 Ctrl+Alt+F               |⌘⌥F |Find incremental
 Ctrl+Shift+F             |⌘⇧F |Find in files
 Ctrl+Alt+G               |⌘⌥G |Goto next file found
@@ -75,8 +75,8 @@ Ctrl+J                   |⌘J  |Jump to line
 **Tools**                       |||
 Ctrl+E          |⌘E     |Command entry
 Ctrl+Shift+E    |⌘⇧E    |Select command
-Ctrl+Alt+R      |^R     |Run
-Ctrl+Alt+Shift+R|^⇧R    |Compile
+Ctrl+R          |⌘R     |Run
+Ctrl+Shift+R    |⌘⇧R    |Compile
 Ctrl+&#124;     |⌘&#124;|Filter text through
 Ctrl+Space      |⌥⎋     |Complete symbol
 Ctrl+H          |^H     |Show documentation
diff --git a/doc/manual/6_AdeptEditing.md b/doc/manual/6_AdeptEditing.md
index 9b05ce28..1459903b 100644
--- a/doc/manual/6_AdeptEditing.md
+++ b/doc/manual/6_AdeptEditing.md
@@ -51,8 +51,8 @@ Lua code! For example: replacing all `(%w+)` with `%(string.upper('%1'))`
 capitalizes all words in the buffer. Lua captures (`%n`) are only available from
 a Lua pattern search, but embedded Lua code enclosed in `%()` is always allowed.
 
-Note the `Ctrl+G`, `Ctrl+Shift+G`, `Ctrl+R`, `Ctrl+Shift+R` key commands for
-find next, find previous, replace, and replace all (`⌘G`, `⌘⇧G`, `⌘R`, `⌘⇧R`
+Note the `Ctrl+G`, `Ctrl+Shift+G`, `Ctrl+Alt+R`, `Ctrl+Alt+Shift+R` key commands
+for find next, find previous, replace, and replace all (`⌘G`, `⌘⇧G`, `^R`, `^⇧R`
 respectively on Mac OSX) only work when the Find/Replace dialog is hidden. When
 it is visible, use the button mnemonics: `Alt+N`, `Alt+P`, `Alt+R`, and `Alt+A`
 (`⌘N`, `⌘P`, `⌘R`, `⌘A`) for English locale.
diff --git a/doc/manual/7_Modules.md b/doc/manual/7_Modules.md
index 917a0b33..5dd551f1 100644
--- a/doc/manual/7_Modules.md
+++ b/doc/manual/7_Modules.md
@@ -59,12 +59,12 @@ which key commands are available. They are typically stored in the `Ctrl+L`
 ##### Run
 
 Most language-specific modules have a command that runs the code in the current
-file. Pressing `Ctrl+Alt+R` (`^R` on Mac OSX) runs that command.
+file. Pressing `Ctrl+R` (`⌘R` on Mac OSX) runs that command.
 
 ##### Compile
 
 Most language-specific modules have a command that compiles the code in the
-current file. Pressing `Ctrl+Alt+Shift+R` (`^⇧R` on Mac OSX) runs that command.
+current file. Pressing `Ctrl+Shift+R` (`⌘⇧R` on Mac OSX) runs that command.
 
 ##### Block Comments
 
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 573782bc..3533d061 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -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):
-  c:   A B C        ~    JkK  ~M N  p  ~    tT U V   Xy       ) ] }  *    ~~\n~~
-  ca: aAbBcC~DeE F  ~HiIjJkK L~MnN  pPq~rRsStTuUvVwWxXyYzZ_"'()[]{}<>*+-/=  \n~~
-  m:      cC D    gG H  J K L    oO  qQ         v   xXyYzZ_   ) ] }  *  /
+  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_   ) ] }  *  /
 
   CTRL = 'c' (Command ⌘)
   ALT = 'a' (Alt/option ⌥)
@@ -194,8 +194,8 @@ keys.cg = gui.find.find_next
 if not OSX then keys.f3 = keys.cg end
 keys.cG = gui.find.find_prev
 if not OSX then keys.sf3 = keys.cG end
-keys.cr = gui.find.replace
-keys.cR = gui.find.replace_all
+keys[not OSX and 'car' or 'mr'] = gui.find.replace
+keys[not OSX and 'caR' or 'mR'] = gui.find.replace_all
 -- Find Next is an when find pane is focused.
 -- Find Prev is ap when find pane is focused.
 -- Replace is ar when find pane is focused.
@@ -210,8 +210,8 @@ keys.cj = m_editing.goto_line
 -- Tools.
 keys.ce = gui.command_entry.focus
 keys.cE = utils.select_command
-keys[not OSX and 'car' or 'mr'] = m_textadept.run.run
-keys[not OSX and 'caR' or 'mR'] = m_textadept.run.compile
+keys.cr = m_textadept.run.run
+keys.cR = m_textadept.run.compile
 keys['c|'] = m_textadept.filter_through.filter_through
 -- Adeptsense.
 keys[not OSX and 'c ' or 'aesc'] = m_textadept.adeptsense.complete_symbol