Rearranged Edit menu and accelerators.

1 files changed, 21 insertions, 20 deletions

diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index e25e4e6a..e11c837f 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -142,14 +142,31 @@ menubar = {
     menuitem('gtk-select-all', _buffer.select_all),
     SEPARATOR,
     menuitem('Match Brace', m_editing.match_brace),
-    menuitem('Select to Brace', { m_editing.match_brace, 'select' }),
     menuitem('Complete Word', { m_editing.autocomplete_word, '%w_' }),
     menuitem('Delete Word', { m_editing.current_word, 'delete' }),
     menuitem('Highlight Word', m_editing.highlight_word),
     menuitem('Toggle Block Comment', m_editing.block_comment),
     menuitem('Transpose Characters', m_editing.transpose_chars),
     menuitem('Join Lines', m_editing.join_lines),
-    menuitem('Convert Indentation', m_editing.convert_indentation),
+    { title = L('Select'),
+      menuitem('Select to Matching Brace', { m_editing.match_brace, 'select' }),
+      menuitem('Select between XML Tags',
+               { m_editing.select_enclosed, '>', '<' }),
+      menuitem('Select in XML Tag', { m_editing.select_enclosed, '<', '>' }),
+      menuitem('Select in Double Quotes',
+               { m_editing.select_enclosed, '"', '"' }),
+      menuitem('Select in Single Quotes',
+               { m_editing.select_enclosed, "'", "'" }),
+      menuitem('Select in Parentheses',
+               { m_editing.select_enclosed, '(', ')' }),
+      menuitem('Select in Brackets', { m_editing.select_enclosed, '[', ']' }),
+      menuitem('Select in Braces', { m_editing.select_enclosed, '{', '}' }),
+      menuitem('Select Word', { m_editing.current_word, 'select' }),
+      menuitem('Select Line', m_editing.select_line),
+      menuitem('Select Paragraph', m_editing.select_paragraph),
+      menuitem('Select Indented Block', m_editing.select_indented_block),
+      menuitem('Select Style', m_editing.select_style),
+    },
     { title = L('Selection'),
       menuitem('Upper Case Selection', _buffer.upper_case),
       menuitem('Lower Case Selection', _buffer.lower_case),
@@ -174,24 +191,6 @@ menubar = {
       menuitem('Move Selected Lines Up', _buffer.move_selected_lines_up),
       menuitem('Move Selected Lines Down', _buffer.move_selected_lines_down),
     },
-    { title = L('Select'),
-      menuitem('Select between XML Tags',
-               { m_editing.select_enclosed, '>', '<' }),
-      menuitem('Select in XML Tag', { m_editing.select_enclosed, '<', '>' }),
-      menuitem('Select in Double Quotes',
-               { m_editing.select_enclosed, '"', '"' }),
-      menuitem('Select in Single Quotes',
-               { m_editing.select_enclosed, "'", "'" }),
-      menuitem('Select in Parentheses',
-               { m_editing.select_enclosed, '(', ')' }),
-      menuitem('Select in Brackets', { m_editing.select_enclosed, '[', ']' }),
-      menuitem('Select in Braces', { m_editing.select_enclosed, '{', '}' }),
-      menuitem('Select Word', { m_editing.current_word, 'select' }),
-      menuitem('Select Line', m_editing.select_line),
-      menuitem('Select Paragraph', m_editing.select_paragraph),
-      menuitem('Select Indented Block', m_editing.select_indented_block),
-      menuitem('Select Style', m_editing.select_style),
-    },
   },
   { title = L('Search'),
     menuitem('gtk-find', gui.find.focus),
@@ -279,6 +278,8 @@ menubar = {
       menuitem('Tab width: 3', { set_indentation, 3 }),
       menuitem('Tab width: 4', { set_indentation, 4 }),
       menuitem('Tab width: 8', { set_indentation, 8 }),
+      SEPARATOR,
+      menuitem('Convert Indentation', m_editing.convert_indentation),
     },
     { title = L('EOL Mode'),
       menuitem('CRLF', { set_eol_mode, 0 }),