diff options
-rw-r--r-- | core/ext/mime_types.lua | 2 | ||||
-rw-r--r-- | core/file_io.lua | 2 | ||||
-rw-r--r-- | modules/cpp/commands.lua | 6 | ||||
-rw-r--r-- | modules/cpp/init.lua | 2 | ||||
-rw-r--r-- | modules/cpp/snippets.lua | 2 | ||||
-rw-r--r-- | modules/lua/commands.lua | 6 | ||||
-rw-r--r-- | modules/lua/init.lua | 2 | ||||
-rw-r--r-- | modules/lua/snippets.lua | 2 | ||||
-rwxr-xr-x | modules/new | 6 | ||||
-rw-r--r-- | modules/textadept/editing.lua | 2 | ||||
-rw-r--r-- | modules/textadept/init.lua | 2 | ||||
-rw-r--r-- | modules/textadept/key_commands.lua | 8 | ||||
-rw-r--r-- | modules/textadept/keys.lua | 2 | ||||
-rw-r--r-- | modules/textadept/mlines.lua | 2 | ||||
-rw-r--r-- | modules/textadept/snippets.lua | 2 |
15 files changed, 24 insertions, 24 deletions
diff --git a/core/ext/mime_types.lua b/core/ext/mime_types.lua index 5ada2b38..489f1d4a 100644 --- a/core/ext/mime_types.lua +++ b/core/ext/mime_types.lua @@ -92,7 +92,7 @@ local function load_language_module_from_filename(filename) if lang then local ret, err = pcall(require, lang) if ret then - modules[lang].set_buffer_properties() + _m[lang].set_buffer_properties() elseif not ret and not err:match("^module '"..lang.."' not found:") then textadept.handlers.error(err) end diff --git a/core/file_io.lua b/core/file_io.lua index d1909985..958a03cc 100644 --- a/core/file_io.lua +++ b/core/file_io.lua @@ -51,7 +51,7 @@ function save(buffer) if not buffer.filename then return save_as(buffer) end local f, err = io.open(buffer.filename, 'w') if f then - prepare = modules.textadept.editing.prepare_for_save + prepare = _m.textadept.editing.prepare_for_save if prepare then prepare() end local txt, _ = buffer:get_text(buffer.length) f:write(txt) diff --git a/modules/cpp/commands.lua b/modules/cpp/commands.lua index 25fa3584..472ca130 100644 --- a/modules/cpp/commands.lua +++ b/modules/cpp/commands.lua @@ -2,12 +2,12 @@ --- -- Commands for the cpp module. -module('modules.cpp.commands', package.seeall) +module('_m.cpp.commands', package.seeall) -- C++-specific key commands. local keys = _G.keys if type(keys) == 'table' then - local m_editing = modules.textadept.editing + local m_editing = _m.textadept.editing local m_handlers = textadept.handlers keys.cpp = { al = { textadept.io.open, _HOME..'/modules/cpp/init.lua' }, @@ -20,7 +20,7 @@ if type(keys) == 'table' then ['('] = { function() --~ buffer.word_chars = --~ '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - m_editing.show_call_tip(modules.cpp.api, true) + m_editing.show_call_tip(_m.cpp.api, true) --~ buffer:set_chars_default() return false end }, diff --git a/modules/cpp/init.lua b/modules/cpp/init.lua index 22ccf21d..7e1d8dd9 100644 --- a/modules/cpp/init.lua +++ b/modules/cpp/init.lua @@ -3,7 +3,7 @@ --- -- The cpp module. -- It provides utilities for editing C/C++ code. -module('modules.cpp', package.seeall) +module('_m.cpp', package.seeall) if type(_G.snippets) == 'table' then --- diff --git a/modules/cpp/snippets.lua b/modules/cpp/snippets.lua index ac4a7955..1625cea2 100644 --- a/modules/cpp/snippets.lua +++ b/modules/cpp/snippets.lua @@ -2,7 +2,7 @@ --- -- Snippets for the cpp module. -module('modules.cpp.snippets', package.seeall) +module('_m.cpp.snippets', package.seeall) local snippets = _G.snippets diff --git a/modules/lua/commands.lua b/modules/lua/commands.lua index 1f6d25a5..f3dbe333 100644 --- a/modules/lua/commands.lua +++ b/modules/lua/commands.lua @@ -2,7 +2,7 @@ --- -- Commands for the lua module. -module('modules.lua.commands', package.seeall) +module('_m.lua.commands', package.seeall) --- -- Patterns for auto 'end' completion for control structures. @@ -70,7 +70,7 @@ end -- Lua-specific key commands. local keys = _G.keys if type(keys) == 'table' then - local m_editing = modules.textadept.editing + local m_editing = _m.textadept.editing local m_handlers = textadept.handlers keys.lua = { al = { textadept.io.open, _HOME..'/modules/lua/init.lua' }, @@ -83,7 +83,7 @@ if type(keys) == 'table' then ['('] = { function() buffer.word_chars = '_.:abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' - m_editing.show_call_tip(modules.lua.api, true) + m_editing.show_call_tip(_m.lua.api, true) buffer:set_chars_default() return false end }, diff --git a/modules/lua/init.lua b/modules/lua/init.lua index 751aa281..1f2fe29d 100644 --- a/modules/lua/init.lua +++ b/modules/lua/init.lua @@ -3,7 +3,7 @@ --- -- The lua module. -- It provides utilities for editing Lua code. -module('modules.lua', package.seeall) +module('_m.lua', package.seeall) if type(_G.snippets) == 'table' then --- diff --git a/modules/lua/snippets.lua b/modules/lua/snippets.lua index eb884a8a..d93ea8ed 100644 --- a/modules/lua/snippets.lua +++ b/modules/lua/snippets.lua @@ -2,7 +2,7 @@ --- -- Snippets for the lua module. -module('modules.lua.snippets', package.seeall) +module('_m.lua.snippets', package.seeall) local snippets = _G.snippets diff --git a/modules/new b/modules/new index 18f23902..997e7ea0 100755 --- a/modules/new +++ b/modules/new @@ -11,7 +11,7 @@ cat > $1/init.lua <<_EOF --- -- The $1 module. -- It provides utilities for editing $2 code. -module('modules.$1', package.seeall) +module('_m.$1', package.seeall) if type(_G.snippets) == 'table' then --- @@ -42,7 +42,7 @@ cat > $1/snippets.lua <<_EOF --- -- Snippets for the $1 module. -module('modules.$1.snippets', package.seeall) +module('_m.$1.snippets', package.seeall) local snippets = _G.snippets @@ -56,7 +56,7 @@ cat > $1/commands.lua <<_EOF --- -- Commands for the $1 module. -module('modules.$1.commands', package.seeall) +module('_m.$1.commands', package.seeall) -- $2-specific key commands. local keys = _G.keys diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua index 241385cc..4af699ce 100644 --- a/modules/textadept/editing.lua +++ b/modules/textadept/editing.lua @@ -2,7 +2,7 @@ --- -- Editing commands for the textadept module. -module('modules.textadept.editing', package.seeall) +module('_m.textadept.editing', package.seeall) --- -- [Local table] The kill-ring. diff --git a/modules/textadept/init.lua b/modules/textadept/init.lua index 1f882d41..ee985df3 100644 --- a/modules/textadept/init.lua +++ b/modules/textadept/init.lua @@ -3,7 +3,7 @@ --- -- The textadept module. -- It provides utilities for editing text in Textadept. -module('modules.textadept', package.seeall) +module('_m.textadept', package.seeall) require 'textadept.editing' require 'textadept.keys' diff --git a/modules/textadept/key_commands.lua b/modules/textadept/key_commands.lua index 82672e78..55f038e4 100644 --- a/modules/textadept/key_commands.lua +++ b/modules/textadept/key_commands.lua @@ -2,7 +2,7 @@ --- -- Defines the key commands used by the Textadept key command manager. -module('modules.textadept.key_commands', package.seeall) +module('_m.textadept.key_commands', package.seeall) --[[ C: G Q @@ -63,13 +63,13 @@ keys.csae = { 'line_end_rect_extend', b } keys.csav = { 'page_down_rect_extend', b } keys.csay = { 'page_up_rect_extend', b } -local m_snippets = modules.textadept.snippets +local m_snippets = _m.textadept.snippets keys.ci = { m_snippets.insert } keys.csi = { m_snippets.cancel_current } keys.cai = { m_snippets.list } keys.ai = { m_snippets.show_scope } -local m_editing = modules.textadept.editing +local m_editing = _m.textadept.editing keys.cm = { m_editing.match_brace } keys.csm = { m_editing.match_brace, 'select' } keys['c '] = { m_editing.autocomplete_word, '%w_' } @@ -116,7 +116,7 @@ keys.as = { -- select in... g = { m_editing.grow_selection, 1 }, } -local m_mlines = modules.textadept.mlines +local m_mlines = _m.textadept.mlines keys.am = { a = { m_mlines.add }, sa = { m_mlines.add_multiple }, diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua index 0fea59c4..77a5cef7 100644 --- a/modules/textadept/keys.lua +++ b/modules/textadept/keys.lua @@ -12,7 +12,7 @@ -- ALT: The string representing the Alt key. -- ADD: The string representing used to join together a sequence of Control, -- Shift, or Alt modifier keys. -module('modules.textadept.keys', package.seeall) +module('_m.textadept.keys', package.seeall) -- options local SCOPES_ENABLED = true diff --git a/modules/textadept/mlines.lua b/modules/textadept/mlines.lua index fe1f57ce..512834de 100644 --- a/modules/textadept/mlines.lua +++ b/modules/textadept/mlines.lua @@ -5,7 +5,7 @@ -- There are several option variables used: -- MARK_MLINE: The integer mark used to identify an MLine marked line. -- MARK_MLINE_COLOR: The Scintilla color used for an MLine marked line. -module('modules.textadept.mlines', package.seeall) +module('_m.textadept.mlines', package.seeall) -- options local MARK_MLINE = 2 diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua index 5b7e3c09..3579df0a 100644 --- a/modules/textadept/snippets.lua +++ b/modules/textadept/snippets.lua @@ -14,7 +14,7 @@ -- RUBY_CMD: The command that executes the Ruby interpreter. -- MARK_SNIPPET_COLOR: The Scintilla color used for the line that marks the -- end of the snippet. -module('modules.textadept.snippets', package.seeall) +module('_m.textadept.snippets', package.seeall) -- options local MARK_SNIPPET = 4 |