diff options
author | 2007-10-07 19:31:20 -0400 | |
---|---|---|
committer | 2007-10-07 19:31:20 -0400 | |
commit | b7380f66ab0ba1815a4da0adfa0c9d03be582df8 (patch) | |
tree | fecb406d68c15b20237d77161dfcedc4b3f3e8fa | |
parent | af47e2fb39f959bb9cdcf74bd834d83687e1ec3f (diff) | |
download | textadept-b7380f66ab0ba1815a4da0adfa0c9d03be582df8.tar.gz textadept-b7380f66ab0ba1815a4da0adfa0c9d03be582df8.zip |
Moved key command manager to core.
-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.lua | 5 | ||||
-rw-r--r-- | modules/textadept/init.lua | 2 |
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 @@ -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 |