Code cleanup.

4 files changed, 10 insertions, 29 deletions

diff --git a/core/events.lua b/core/events.lua
index 1befd35a..0870afce 100644
--- a/core/events.lua
+++ b/core/events.lua
@@ -397,13 +397,7 @@ end)
 
 -- Set event constants.
 for _, v in pairs(_SCINTILLA.events) do M[v[1]:upper()] = v[1] end
-local textadept_events = { -- defined in C
-  'appleevent_odoc', 'buffer_after_switch', 'buffer_before_switch',
-  'buffer_deleted', 'buffer_new', 'csi', 'error', 'find', 'find_text_changed',
-  'focus', 'initialized', 'keypress', 'menu_clicked', 'mouse', 'quit',
-  'replace', 'replace_all', 'reset_after', 'reset_before', 'resume', 'suspend',
-  'tab_clicked', 'view_after_switch', 'view_before_switch', 'view_new'
-}
+local textadept_events = {'appleevent_odoc','buffer_after_switch','buffer_before_switch','buffer_deleted','buffer_new','csi','error','find','find_text_changed','focus','initialized','keypress','menu_clicked','mouse','quit','replace','replace_all','reset_after','reset_before','resume','suspend', 'tab_clicked','view_after_switch','view_before_switch','view_new'}
 for _, v in pairs(textadept_events) do M[v:upper()] = v end
 
 return M
diff --git a/core/lfs_ext.lua b/core/lfs_ext.lua
index 47e37e86..ac88d854 100644
--- a/core/lfs_ext.lua
+++ b/core/lfs_ext.lua
@@ -10,18 +10,13 @@ module('lfs')]]
 -- The filter table containing common binary file extensions and version control
 -- directories to exclude when iterating over files and directories using
 -- `walk`.
+-- Extensions excluded: a, bmp, bz2, class, dll, exe, gif, gz, jar, jpeg, jpg,
+-- o, pdf, png, so, tar, tgz, tif, tiff, xz, and zip.
+-- Directories excluded: .bzr, .git, .hg, .svn, _FOSSIL_, and node_modules.
 -- @see walk
 -- @class table
 -- @name default_filter
-lfs.default_filter = {
-  -- File extensions to exclude.
-  '!.a', '!.bmp', '!.bz2', '!.class', '!.dll', '!.exe', '!.gif', '!.gz',
-  '!.jar', '!.jpeg', '!.jpg', '!.o', '!.pdf', '!.png', '!.so', '!.tar', '!.tgz',
-  '!.tif', '!.tiff', '!.xz', '!.zip',
-  -- Directories to exclude.
-  '!/%.bzr$', '!/%.git$', '!/%.hg$', '!/%.svn$', '!/_FOSSIL_$',
-  '!/node_modules$'
-}
+lfs.default_filter = {--[[Extensions]]'!.a','!.bmp','!.bz2','!.class','!.dll','!.exe','!.gif','!.gz','!.jar','!.jpeg','!.jpg','!.o','!.pdf','!.png','!.so','!.tar','!.tgz','!.tif','!.tiff','!.xz','!.zip',--[[Directories]]'!/%.bzr$','!/%.git$','!/%.hg$','!/%.svn$','!/_FOSSIL_$','!/node_modules$'}
 
 -- Documentation is in `lfs.walk()`.
 -- @param level Utility value indicating the directory level this function is
diff --git a/init.lua b/init.lua
index af3a8ee8..3db4be00 100644
--- a/init.lua
+++ b/init.lua
@@ -355,15 +355,11 @@ end, 1)
 events.connect(events.VIEW_NEW, function()
   local buffer, view = _G.buffer, _G.view
   -- Allow redefinitions of these Scintilla key bindings.
-  local ctrl_keys = {
-    '[', ']', '/', '\\', 'Z', 'Y', 'X', 'C', 'V', 'A', 'L', 'T', 'D', 'U'
-  }
-  for _, key in ipairs(ctrl_keys) do
-    view:clear_cmd_key(string.byte(key) | view.MOD_CTRL << 16)
+  for _, code in utf8.codes('[]/\\ZYXCVALTDU') do
+    view:clear_cmd_key(code | view.MOD_CTRL << 16)
   end
-  for _, key in ipairs{'L', 'T', 'U', 'Z'} do -- ctrl+shift keys
-    view:clear_cmd_key(
-      string.byte(key) | (view.MOD_CTRL | view.MOD_SHIFT) << 16)
+  for _, code in utf8.codes('LTUZ') do
+    view:clear_cmd_key(code | (view.MOD_CTRL | view.MOD_SHIFT) << 16)
   end
   -- Since BUFFER_NEW loads themes and settings on startup, only load them for
   -- subsequent views.
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index 7883de82..13f52197 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -17,11 +17,7 @@ local SEPARATOR = {''}
 
 -- The following buffer and view functions need to be made constant in order for
 -- menu items to identify the key associated with the functions.
-local menu_buffer_functions = {
-  'undo', 'redo', 'cut', 'copy', 'paste', 'line_duplicate', 'clear',
-  'select_all', 'upper_case', 'lower_case', 'move_selected_lines_up',
-  'move_selected_lines_down'
-}
+local menu_buffer_functions = {'undo','redo','cut','copy','paste','line_duplicate','clear','select_all','upper_case','lower_case','move_selected_lines_up','move_selected_lines_down'}
 for _, f in ipairs(menu_buffer_functions) do buffer[f] = buffer[f] end
 view.zoom_in, view.zoom_out = view.zoom_in, view.zoom_out