Rearranged Buffer and View menus and changed various accelerators.

3 files changed, 24 insertions, 25 deletions

diff --git a/modules/textadept/keys.conf b/modules/textadept/keys.conf
index e5b79a52..d542b7ba 100644
--- a/modules/textadept/keys.conf
+++ b/modules/textadept/keys.conf
@@ -114,18 +114,13 @@ Show Style = ci
 % Buffer
 Next Buffer = c\t cpgdn
 Previous Buffer = cs\t cpgup
-Switch Buffer = cb
-Toggle View EOL = ca\n ca\n\r
-Toggle Wrap Mode = ca\\
-Toggle Show Indent Guides = caI
-Toggle Use Tabs = caT
-Toggle View Whitespace = ca\s
-Toggle Virtual Space = caV
+Switch to Buffer... = cb
 % Indentation
 Tab width: 2 =
 Tab width: 3 =
 Tab width: 4 =
 Tab width: 8 =
+Toggle Use Tabs = caT
 Convert Indentation =
 % EOL Mode
 CRLF =
@@ -149,6 +144,11 @@ Unsplit View = caw
 Unsplit All Views = caW
 Grow View = ca+ ca=
 Shrink View = ca-
+Toggle View EOL = ca\n ca\n\r
+Toggle Wrap Mode = ca\\
+Toggle Show Indent Guides = caI
+Toggle View Whitespace = ca\s
+Toggle Virtual Space = caV
 Zoom In = c=
 Zoom Out = c-
 Reset Zoom = c0
diff --git a/modules/textadept/keys.osx.conf b/modules/textadept/keys.osx.conf
index ba4358f6..37e1c5ed 100644
--- a/modules/textadept/keys.osx.conf
+++ b/modules/textadept/keys.osx.conf
@@ -114,18 +114,13 @@ Show Style = ci
 % Buffer
 Next Buffer = m`
 Previous Buffer = m~
-Switch Buffer = cb
-Toggle View EOL = m\n
-Toggle Wrap Mode = m\\
-Toggle Show Indent Guides = mI
-Toggle Use Tabs = mT
-Toggle View Whitespace = m\s
-Toggle Virtual Space = mV
+Switch to Buffer... = cb
 % Indentation
 Tab width: 2 =
 Tab width: 3 =
 Tab width: 4 =
 Tab width: 8 =
+Toggle Use Tabs = mT
 Convert Indentation =
 % EOL Mode
 CRLF =
@@ -149,6 +144,11 @@ Unsplit View = mw
 Unsplit All Views = mW
 Grow View = m+ m=
 Shrink View = m-
+Toggle View EOL = m\n
+Toggle Wrap Mode = m\\
+Toggle Show Indent Guides = mI
+Toggle View Whitespace = m\s
+Toggle Virtual Space = mV
 Zoom In = c=
 Zoom Out = c-
 Reset Zoom = c0
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index e11c837f..82b8cc65 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -262,16 +262,7 @@ menubar = {
   { title = L('Buffer'),
     menuitem('Next Buffer', { _view.goto_buffer, _view, 1, false }),
     menuitem('Previous Buffer', { _view.goto_buffer, _view, -1, false }),
-    menuitem('Switch Buffer', gui.switch_buffer),
-    SEPARATOR,
-    menuitem('Toggle View EOL', { toggle_setting, 'view_eol' }),
-    menuitem('Toggle Wrap Mode', { toggle_setting, 'wrap_mode' }),
-    menuitem('Toggle Show Indent Guides',
-             { toggle_setting, 'indentation_guides' }),
-    menuitem('Toggle Use Tabs', { toggle_setting, 'use_tabs' }),
-    menuitem('Toggle View Whitespace', { toggle_setting, 'view_ws' }),
-    menuitem('Toggle Virtual Space',
-             { toggle_setting, 'virtual_space_options', 2 }),
+    menuitem('Switch to Buffer...', gui.switch_buffer),
     SEPARATOR,
     { title = L('Indentation'),
       menuitem('Tab width: 2', { set_indentation, 2 }),
@@ -279,6 +270,7 @@ menubar = {
       menuitem('Tab width: 4', { set_indentation, 4 }),
       menuitem('Tab width: 8', { set_indentation, 8 }),
       SEPARATOR,
+      menuitem('Toggle Use Tabs', { toggle_setting, 'use_tabs' }),
       menuitem('Convert Indentation', m_editing.convert_indentation),
     },
     { title = L('EOL Mode'),
@@ -306,12 +298,19 @@ menubar = {
     menuitem('Split View Horizontal', { _view.split, _view, false }),
     menuitem('Unsplit View', function() view:unsplit() end),
     menuitem('Unsplit All Views', function() while view:unsplit() do end end),
-    SEPARATOR,
     menuitem('Grow View',
              function() if view.size then view.size = view.size + 10 end end),
     menuitem('Shrink View',
              function() if view.size then view.size = view.size - 10 end end),
     SEPARATOR,
+    menuitem('Toggle View EOL', { toggle_setting, 'view_eol' }),
+    menuitem('Toggle Wrap Mode', { toggle_setting, 'wrap_mode' }),
+    menuitem('Toggle Show Indent Guides',
+             { toggle_setting, 'indentation_guides' }),
+    menuitem('Toggle View Whitespace', { toggle_setting, 'view_ws' }),
+    menuitem('Toggle Virtual Space',
+             { toggle_setting, 'virtual_space_options', 2 }),
+    SEPARATOR,
     menuitem('Zoom In', _buffer.zoom_in),
     menuitem('Zoom Out', _buffer.zoom_out),
     menuitem('Reset Zoom', function() buffer.zoom = 0 end),