4 files changed, 19 insertions, 14 deletions

diff --git a/core/locale.conf b/core/locale.conf
index 6d756ce5..a401f6b5 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -115,8 +115,6 @@ Select to Brace = Select to _Brace
 Complete Word = Complete _Word
 Delete Word = De_lete Word
 Highlight Word = _Highlight Word
-Complete Symbol = Complete S_ymbol
-Show Documentation = Show D_ocumentation
 Toggle Block Comment = Toggle Bloc_k Comment
 Transpose Characters = T_ranspose Characters
 Join Lines = _Join Lines
@@ -165,6 +163,9 @@ Select Command = Select Co_mmand
 Run = _Run
 Compile = _Compile
 Filter Through = Fi_lter Through
+Adeptsense = _Adeptsense
+Complete Symbol = _Complete Symbol
+Show Documentation = Show _Documentation
 Snippets = _Snippets
 Insert Snippet... = _Insert Snippet...
 Expand Snippet/Next Placeholder = _Expand Snippet/Next Placeholder
diff --git a/modules/textadept/keys.conf b/modules/textadept/keys.conf
index 8ae03c15..77b3cf9e 100644
--- a/modules/textadept/keys.conf
+++ b/modules/textadept/keys.conf
@@ -42,8 +42,6 @@ Select to Brace = cM
 Complete Word = c\n
 Delete Word =
 Highlight Word = cH
-Complete Symbol = c\s
-Show Documentation = ch
 Toggle Block Comment = c/
 Transpose Characters = ct
 Join Lines = cJ
@@ -94,6 +92,9 @@ Select Command = cE
 Run = car
 Compile = caR
 Filter Through = c|
+% Adeptsense
+Complete Symbol = c\s
+Show Documentation = ch
 % Snippets
 Insert Snippet... = ck
 Expand Snippet/Next Placeholder = \t
diff --git a/modules/textadept/keys.osx.conf b/modules/textadept/keys.osx.conf
index e148d09e..f40584f8 100644
--- a/modules/textadept/keys.osx.conf
+++ b/modules/textadept/keys.osx.conf
@@ -42,8 +42,6 @@ Select to Brace = mM
 Complete Word = mesc
 Delete Word =
 Highlight Word = cH
-Complete Symbol = aesc
-Show Documentation = mh
 Toggle Block Comment = c/
 Transpose Characters = mt
 Join Lines = mj
@@ -94,6 +92,9 @@ Select Command = cE
 Run = mr
 Compile = mR
 Filter Through = c|
+% Adeptsense
+Complete Symbol = aesc
+Show Documentation = mh
 % Snippets
 Insert Snippet... = a\t
 Expand Snippet/Next Placeholder = \t
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 71eef1fc..e25e4e6a 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -146,14 +146,6 @@ menubar = {
     menuitem('Complete Word', { m_editing.autocomplete_word, '%w_' }),
     menuitem('Delete Word', { m_editing.current_word, 'delete' }),
     menuitem('Highlight Word', m_editing.highlight_word),
-    menuitem('Complete Symbol', function()
-      local m = _m[buffer:get_lexer()]
-      if m and m.sense then m.sense:complete() end
-    end),
-    menuitem('Show Documentation', function()
-      local m = _m[buffer:get_lexer()]
-      if m and m.sense then m.sense:show_apidoc() end
-    end),
     menuitem('Toggle Block Comment', m_editing.block_comment),
     menuitem('Transpose Characters', m_editing.transpose_chars),
     menuitem('Join Lines', m_editing.join_lines),
@@ -226,6 +218,16 @@ menubar = {
     menuitem('Compile', m_textadept.run.compile),
     menuitem('Filter Through', _m.textadept.filter_through.filter_through),
     SEPARATOR,
+    { title = L('Adeptsense'),
+      menuitem('Complete Symbol', function()
+        local m = _m[buffer:get_lexer()]
+        if m and m.sense then m.sense:complete() end
+      end),
+      menuitem('Show Documentation', function()
+        local m = _m[buffer:get_lexer()]
+        if m and m.sense then m.sense:show_apidoc() end
+      end),
+    },
     { title = L('Snippets'),
       menuitem('Insert Snippet...', m_textadept.snippets._select),
       menuitem('Expand Snippet/Next Placeholder', m_textadept.snippets._insert),