aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/ext/key_commands.lua (renamed from modules/textadept/key_commands.lua)4
-rw-r--r--core/ext/keys.lua (renamed from modules/textadept/keys.lua)2
-rw-r--r--init.lua5
-rw-r--r--modules/textadept/init.lua2
4 files changed, 8 insertions, 5 deletions
diff --git a/modules/textadept/key_commands.lua b/core/ext/key_commands.lua
index 599bac82..d8c99a24 100644
--- a/modules/textadept/key_commands.lua
+++ b/core/ext/key_commands.lua
@@ -2,8 +2,8 @@
---
-- Defines the key commands used by the Textadept key command manager.
--- For non-ascii keys, see _m.textadept.keys for string aliases.
-module('_m.textadept.key_commands', package.seeall)
+-- For non-ascii keys, see textadept.keys for string aliases.
+module('textadept.key_commands', package.seeall)
--[[
C: G Q
diff --git a/modules/textadept/keys.lua b/core/ext/keys.lua
index 89fd4b36..f182d044 100644
--- a/modules/textadept/keys.lua
+++ b/core/ext/keys.lua
@@ -13,7 +13,7 @@
-- ADD: The string representing used to join together a sequence of Control,
-- Shift, or Alt modifier keys.
--
-module('_m.textadept.keys', package.seeall)
+module('textadept.keys', package.seeall)
-- Usage:
-- Keys are defined in the global table 'keys'. Keys in that table are key
diff --git a/init.lua b/init.lua
index b13a939e..13a37a7d 100644
--- a/init.lua
+++ b/init.lua
@@ -3,13 +3,18 @@
require 'ext/pm'
require 'ext/find'
require 'ext/mime_types'
+require 'ext/keys'
local mpath = _HOME..'modules/?.lua;'.._HOME..'/modules/?/init.lua'
package.path = package.path..';'..mpath
-- modules to load on startup
require 'textadept'
+-- end modules
+require 'ext/key_commands'
+
+-- process command line arguments
local textadept = textadept
if #arg == 0 then
textadept.io.load_session()
diff --git a/modules/textadept/init.lua b/modules/textadept/init.lua
index 42240c1d..6b807a32 100644
--- a/modules/textadept/init.lua
+++ b/modules/textadept/init.lua
@@ -6,8 +6,6 @@
module('_m.textadept', package.seeall)
require 'textadept.editing'
-require 'textadept.keys'
require 'textadept.lsnippets'
require 'textadept.macros'
require 'textadept.mlines'
-require 'textadept.key_commands' -- last