Renamed editing module's 'current_word' to 'select_word'.

Also added utils function for deleting the current word.

3 files changed, 17 insertions, 16 deletions

diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua
index ffd1ff78..2ac5a763 100644
--- a/modules/textadept/editing.lua
+++ b/modules/textadept/editing.lua
@@ -296,18 +296,6 @@ end
 events_connect(events.FILE_BEFORE_SAVE, M.prepare_for_save)
 
 ---
--- Selects the current word under the caret and if action indicates, deletes it.
--- @param action Optional action to perform with selected word. If `delete`, it
---   is deleted.
--- @name current_word
-function M.current_word(action)
-  local buffer = buffer
-  buffer:set_sel(buffer:word_start_position(buffer.current_pos),
-                 buffer:word_end_position(buffer.current_pos))
-  if action == 'delete' then buffer:delete_back() end
-end
-
----
 -- Transposes characters intelligently.
 -- If the caret is at the end of a line, the two characters before the caret are
 -- transposed. Otherwise, the characters to the left and right are.
@@ -382,6 +370,15 @@ function M.grow_selection(amount)
 end
 
 ---
+-- Selects the current word under the caret.
+-- @name select_word
+function M.select_word(action)
+  local buffer = buffer
+  buffer:set_sel(buffer:word_start_position(buffer.current_pos),
+                 buffer:word_end_position(buffer.current_pos))
+end
+
+---
 -- Selects the current line.
 -- @name select_line
 function M.select_line()
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 40954110..285263a3 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -11,6 +11,10 @@ module('_M.textadept.keys')]]
 
 -- Utility functions.
 M.utils = {
+  delete_word = function()
+    _M.textadept.editing.select_word()
+    buffer:delete_back()
+  end,
   enclose_as_xml_tags = function()
     _M.textadept.editing.enclose('<', '>')
     local buffer = buffer
@@ -159,7 +163,7 @@ keys.del = buffer.clear
 keys[not OSX and 'ca' or 'ma'] = buffer.select_all
 keys.cm = Mediting.match_brace
 keys[not OSX and 'c\n' or 'cesc'] = { Mediting.autocomplete_word, '%w_' }
-keys[not OSX and 'adel' or 'cdel'] = { Mediting.current_word, 'delete' }
+keys[not OSX and 'adel' or 'cdel'] = utils.delete_word
 keys[not OSX and 'caH' or 'mH'] = Mediting.highlight_word
 keys[not OSX and 'c/' or 'm/'] = Mediting.block_comment
 keys.ct = Mediting.transpose_chars
@@ -173,7 +177,7 @@ keys[not OSX and 'c"' or 'm"'] = { Mediting.select_enclosed, '"', '"' }
 keys[not OSX and 'c(' or 'm('] = { Mediting.select_enclosed, '(', ')' }
 keys[not OSX and 'c[' or 'm['] = { Mediting.select_enclosed, '[', ']' }
 keys[not OSX and 'c{' or 'm{'] = { Mediting.select_enclosed, '{', '}' }
-keys[not OSX and 'cD' or 'mD'] = { Mediting.current_word, 'select' }
+keys[not OSX and 'cD' or 'mD'] = Mediting.select_word
 keys[not OSX and 'cN' or 'mN'] = Mediting.select_line
 keys[not OSX and 'cP' or 'mP'] = Mediting.select_paragraph
 keys[not OSX and 'cI' or 'mI'] = Mediting.select_indented_block
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index ba8f7f89..d5f3de53 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -59,11 +59,11 @@ M.menubar = {
     { _L['gtk-paste'], buffer.paste },
     { _L['Duplicate Line'], buffer.line_duplicate },
     { _L['gtk-delete'], buffer.clear },
+    { _L['Delete Word'], utils.delete_word },
     { _L['gtk-select-all'], buffer.select_all },
     SEPARATOR,
     { _L['Match Brace'], Mediting.match_brace },
     { _L['Complete Word'], { Mediting.autocomplete_word, '%w_' } },
-    { _L['Delete Word'], { Mediting.current_word, 'delete' } },
     { _L['Highlight Word'], Mediting.highlight_word },
     { _L['Toggle Block Comment'], Mediting.block_comment },
     { _L['Transpose Characters'], Mediting.transpose_chars },
@@ -77,7 +77,7 @@ M.menubar = {
       { _L['Select in Parentheses'], { Mediting.select_enclosed, '(', ')' } },
       { _L['Select in Brackets'], { Mediting.select_enclosed, '[', ']' } },
       { _L['Select in Braces'], { Mediting.select_enclosed, '{', '}' } },
-      { _L['Select Word'], { Mediting.current_word, 'select' } },
+      { _L['Select Word'], Mediting.select_word },
       { _L['Select Line'], Mediting.select_line },
       { _L['Select Paragraph'], Mediting.select_paragraph },
       { _L['Select Indented Block'], Mediting.select_indented_block },