Rearranged Edit menu and accelerators.

4 files changed, 69 insertions, 68 deletions

diff --git a/core/locale.conf b/core/locale.conf
index a401f6b5..c065e785 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -107,18 +107,30 @@ gtk-redo = gtk-redo
 gtk-cut = gtk-cut
 gtk-copy = gtk-copy
 gtk-paste = gtk-paste
-Duplicate Line = Duplicat_e Line
+Duplicate Line = Duplicate _Line
 gtk-delete = gtk-delete
 gtk-select-all = gtk-select-all
 Match Brace = _Match Brace
-Select to Brace = Select to _Brace
 Complete Word = Complete _Word
-Delete Word = De_lete Word
+Delete Word = D_elete Word
 Highlight Word = _Highlight Word
-Toggle Block Comment = Toggle Bloc_k Comment
+Toggle Block Comment = Toggle _Block Comment
 Transpose Characters = T_ranspose Characters
 Join Lines = _Join Lines
-Convert Indentation = Convert _Indentation
+Select = _Select
+Select to Matching Brace = Select to _Matching Brace
+Select between XML Tags = Select between _XML Tags
+Select in XML Tag = Select in XML _Tag
+Select in Double Quotes = Select in _Double Quotes
+Select in Single Quotes = Select in _Single Quotes
+Select in Parentheses = Select in _Parentheses
+Select in Brackets = Select in _Brackets
+Select in Braces = Select in B_races
+Select Word = Select _Word
+Select Line = Select _Line
+Select Paragraph = Select Para_graph
+Select Indented Block = Select _Indented Block
+Select Style = Select St_yle
 Selection = Selectio_n
 Upper Case Selection = _Upper Case Selection
 Lower Case Selection = _Lower Case Selection
@@ -133,19 +145,6 @@ Grow Selection = _Grow Selection
 Shrink Selection = _Shrink Selection
 Move Selected Lines Up = _Move Selected Lines Up
 Move Selected Lines Down = Move Selected Lines Do_wn
-Select = _Select
-Select between XML Tags = Select between _XML Tags
-Select in XML Tag = Select in XML _Tag
-Select in Double Quotes = Select in _Double Quotes
-Select in Single Quotes = Select in _Single Quotes
-Select in Parentheses = Select in _Parentheses
-Select in Brackets = Select in _Brackets
-Select in Braces = Select in B_races
-Select Word = Select _Word
-Select Line = Select _Line
-Select Paragraph = Select Para_graph
-Select Indented Block = Select _Indented Block
-Select Style = Select St_yle
 Search = _Search
 gtk-find = gtk-find
 %Find Next = Find _Next
@@ -197,6 +196,7 @@ Tab width: 2 = Tab width: _2
 Tab width: 3 = Tab width: _3
 Tab width: 4 = Tab width: _4
 Tab width: 8 = Tab width: _8
+Convert Indentation = _Convert Indentation
 EOL Mode = EOL _Mode
 %CRLF = CRLF
 %CR = CR
diff --git a/modules/textadept/keys.conf b/modules/textadept/keys.conf
index 77b3cf9e..e5b79a52 100644
--- a/modules/textadept/keys.conf
+++ b/modules/textadept/keys.conf
@@ -38,14 +38,26 @@ Duplicate Line = cd
 gtk-delete =
 gtk-select-all = ca
 Match Brace = cm
-Select to Brace = cM
 Complete Word = c\n
 Delete Word =
 Highlight Word = cH
 Toggle Block Comment = c/
 Transpose Characters = ct
 Join Lines = cJ
-Convert Indentation =
+% Select
+Select to Matching Brace = cM
+Select between XML Tags = c<
+Select in XML Tag = c>
+Select in Double Quotes = c"
+Select in Single Quotes = c'
+Select in Parentheses = c(
+Select in Brackets = c[
+Select in Braces = c{
+Select Word =
+Select Line = cL
+Select Paragraph = cP
+Select Indented Block = cI
+Select Style =
 % Selection
 Upper Case Selection =
 Lower Case Selection =
@@ -60,19 +72,6 @@ Grow Selection = c+
 Shrink Selection = c_
 Move Selected Lines Up = csup
 Move Selected Lines Down = csdown
-% Select
-Select between XML Tags = c<
-Select in XML Tag = c>
-Select in Double Quotes = c"
-Select in Single Quotes = c'
-Select in Parentheses = c(
-Select in Brackets = c[
-Select in Braces = c{
-Select Word =
-Select Line = cL
-Select Paragraph = cP
-Select Indented Block = cI
-Select Style =
 
 % Search
 gtk-find = cf
@@ -127,6 +126,7 @@ Tab width: 2 =
 Tab width: 3 =
 Tab width: 4 =
 Tab width: 8 =
+Convert Indentation =
 % EOL Mode
 CRLF =
 CR =
diff --git a/modules/textadept/keys.osx.conf b/modules/textadept/keys.osx.conf
index f40584f8..ba4358f6 100644
--- a/modules/textadept/keys.osx.conf
+++ b/modules/textadept/keys.osx.conf
@@ -38,14 +38,26 @@ Duplicate Line = cd
 gtk-delete =
 gtk-select-all = ca
 Match Brace = mm
-Select to Brace = mM
 Complete Word = mesc
 Delete Word =
 Highlight Word = cH
 Toggle Block Comment = c/
 Transpose Characters = mt
 Join Lines = mj
-Convert Indentation =
+% Select
+Select to Matching Brace = mM
+Select between XML Tags = c<
+Select in XML Tag = c>
+Select in Double Quotes = c"
+Select in Single Quotes = c'
+Select in Parentheses = c(
+Select in Brackets = c[
+Select in Braces = c{
+Select Word =
+Select Line = cL
+Select Paragraph = cP
+Select Indented Block = cI
+Select Style =
 % Selection
 Upper Case Selection =
 Lower Case Selection =
@@ -60,19 +72,6 @@ Grow Selection = c+
 Shrink Selection = c_
 Move Selected Lines Up = msdown
 Move Selected Lines Down = msup
-% Select
-Select between XML Tags = c<
-Select in XML Tag = c>
-Select in Double Quotes = c"
-Select in Single Quotes = c'
-Select in Parentheses = c(
-Select in Brackets = c[
-Select in Braces = c{
-Select Word =
-Select Line = cL
-Select Paragraph = cP
-Select Indented Block = cI
-Select Style =
 
 % Search
 gtk-find = cf
@@ -127,6 +126,7 @@ Tab width: 2 =
 Tab width: 3 =
 Tab width: 4 =
 Tab width: 8 =
+Convert Indentation =
 % EOL Mode
 CRLF =
 CR =
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 }),