From be8a54727383036e65ff3459f9b9ea7f733ec5bf Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Sun, 28 Aug 2011 15:41:46 -0400
Subject: 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.
---
doc/manual/14_Appendix.md | 18 +++++++++---------
doc/manual/6_AdeptEditing.md | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'doc/manual')
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
F3 |⌘G |Find next
Ctrl+Shift+G
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 |⇠
^B |Char left
Shift+Left |⇧⇠
^⇧B |Char left extend selection
-Ctrl+Left |^⇠
^⌥B |Word left
-Ctrl+Shift+Left |^⇧⇠
^⌥⇧B|Word left extend selection
+Ctrl+Left |^⇠
^⌘B |Word left
+Ctrl+Shift+Left |^⇧⇠
^⌘⇧B|Word left extend selection
Alt+Shift+Left |⌥⇧⇠ |Char left extend rect. selection
Right |⇢
^F |Char right
Shift+Right |⇧⇢
^⇧F |Char right extend selection
-Ctrl+Right |^⇢
^⌥F |Word right
-Ctrl+Shift+Right |^⇧⇢
^⌥⇧F|Word right extend selection
+Ctrl+Right |^⇢
^⌘F |Word right
+Ctrl+Shift+Right |^⇧⇢
^⌘⇧F|Word right extend selection
Alt+Shift+Right |⌥⇧⇢ |Char right extend rect. selection
Home |⌘⇠
^A |Line start
Shift+Home |⌘⇧⇠
^⇧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.
--
cgit v1.2.3