aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2011-04-25 17:05:57 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2011-04-25 17:05:57 -0400
commit3a409f5784bae59a814c74971f58611077c64ef1 (patch)
treec394c875c112fa1f326f09eefcb8f0e92f2c420f
parent097be74aaf0029c00f7f5c05b655c3b7f31803ff (diff)
downloadtextadept-3a409f5784bae59a814c74971f58611077c64ef1.tar.gz
textadept-3a409f5784bae59a814c74971f58611077c64ef1.zip
Changed Mac OSX Adeptsense completion from '~' to 'Ctrl+Esc'.
-rw-r--r--doc/manual/14_Appendix.md2
-rw-r--r--modules/cpp/init.lua4
-rw-r--r--modules/lua/init.lua4
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/manual/14_Appendix.md b/doc/manual/14_Appendix.md
index 2237cb66..82ab7d69 100644
--- a/doc/manual/14_Appendix.md
+++ b/doc/manual/14_Appendix.md
@@ -26,7 +26,7 @@
<tr><td>Ctrl+E</td><td>Ctrl+M</td><td>Go to matching brace</td></tr>
<tr><td>Ctrl+Shift+E</td><td>Apple+Shift+E</td><td>Select to matching brace</td></tr>
<tr><td>Ctrl+Return</td><td>Escape</td><td>Autocomplete word in file</td></tr>
- <tr><td>Ctrl+I</td><td>~</td><td>Autocomplete symbol for supported languages</td></tr>
+ <tr><td>Ctrl+I</td><td>Ctrl+Escape</td><td>Autocomplete symbol for supported languages</td></tr>
<tr><td>Ctrl+H</td><td>Ctrl+H</td><td>Show symbol apidoc for supported languages</td></tr>
<tr><td>Ctrl+Q</td><td>Ctrl+Q</td><td>Block comment/uncomment</td></tr>
<tr><td>None</td><td>None</td><td>Delete word</td></tr>
diff --git a/modules/cpp/init.lua b/modules/cpp/init.lua
index caa6f183..168699b4 100644
--- a/modules/cpp/init.lua
+++ b/modules/cpp/init.lua
@@ -16,7 +16,7 @@ module('_m.cpp', package.seeall)
-- + `->`: When to the right of a known symbol, show an autocompletion list of
-- fields and functions.
-- + `Ctrl+I`: (Windows and Linux) Autocomplete symbol.
--- + `~`: (Mac OSX) Autocomplete symbol.
+-- + `Ctrl+Esc`: (Mac OSX) Autocomplete symbol.
-- + `Ctrl+H`: Show documentation for the selected symbol or the symbol under
-- the caret.
-- + `Shift+Return`: Add ';' to line end and insert newline.
@@ -91,7 +91,7 @@ _G.keys.cpp = {
buffer:add_text(';')
buffer:new_line()
end },
- [not OSX and 'ci' or '~'] = { sense.complete, sense },
+ [not OSX and 'ci' or 'cesc'] = { sense.complete, sense },
ch = { sense.show_apidoc, sense },
}
diff --git a/modules/lua/init.lua b/modules/lua/init.lua
index ae4d8ffc..cca7e3cb 100644
--- a/modules/lua/init.lua
+++ b/modules/lua/init.lua
@@ -19,7 +19,7 @@ module('_m.lua', package.seeall)
-- + `:`: When to the right of a known symbol, show an autocompletion list of
-- functions only.
-- + `Ctrl+I`: (Windows and Linux) Autocomplete symbol.
--- + `~`: (Mac OSX) Autocomplete symbol.
+-- + `Ctrl+Esc`: (Mac OSX) Autocomplete symbol.
-- + `Ctrl+H`: Show documentation for the selected symbol or the symbol under
-- the caret.
--
@@ -176,7 +176,7 @@ _G.keys.lua = {
g = { goto_required },
},
['s\n'] = { try_to_autocomplete_end },
- [not OSX and 'ci' or '~'] = { sense.complete, sense },
+ [not OSX and 'ci' or 'cesc'] = { sense.complete, sense },
ch = { sense.show_apidoc, sense },
}