aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/ext/pm.lua11
-rw-r--r--init.lua36
2 files changed, 24 insertions, 23 deletions
diff --git a/core/ext/pm.lua b/core/ext/pm.lua
index ed997c5d..fa5d21d0 100644
--- a/core/ext/pm.lua
+++ b/core/ext/pm.lua
@@ -44,17 +44,6 @@
-- widget "*textadept-pm-entry" style "textadept-pm-display-style"
-- widget "*textadept-pm-view" style "textadept-pm-display-style"
----
--- Browsers loaded by the project manager.
--- @class table
--- @name browsers
--- @usage Add additional browsers to this list.
-local browsers = {
- 'buffer_browser', 'file_browser', 'ctags_browser', 'macro_browser',
- 'find_browser', 'modules_browser', 'project_browser'
-}
-for _, b in ipairs(browsers) do require('ext/pm.'..b) end
-
local pm = textadept.pm
---
diff --git a/init.lua b/init.lua
index ca6895ac..90e067e6 100644
--- a/init.lua
+++ b/init.lua
@@ -1,22 +1,34 @@
-- Copyright 2007-2009 Mitchell mitchell<att>caladbolg.net. See LICENSE.
-require 'ext/pm'
-require 'ext/find'
-require 'ext/command_entry'
-require 'ext/mime_types'
-require 'ext/keys'
-
local mpath = _HOME..'/modules/?.lua;'.._HOME..'/modules/?/init.lua'
package.path = mpath..';'..package.path
--- modules to load on startup
+-- Core extension modules to load on startup.
+require 'ext/keys' -- provides key command support
+require 'ext/find' -- provides functionality for find/replace
+require 'ext/command_entry' -- provides tab-completion for the command entry
+require 'ext/mime_types' -- provides support for language detection based on
+ -- the file; loads its language-specific module if
+ -- it exists
+require 'ext/pm' -- provides the dynamic browser (side pane) functionality
+require 'ext/pm.buffer_browser' -- buffer browser
+require 'ext/pm.file_browser' -- file browser
+require 'ext/pm.project_browser' -- project browser
+require 'ext/pm.modules_browser' -- modules browser
+require 'ext/pm.macro_browser' -- macro browser
+if not WIN32 then
+ require 'ext/pm.ctags_browser' -- ctags browser
+ require 'ext/pm.find_browser' -- find browser
+end
+
+-- Generic modules to load on startup.
require 'textadept'
--- end modules
-require 'ext/menu'
---require 'ext/key_commands_std'
---require 'ext/key_commands_mac'
-require 'ext/key_commands'
+-- Core extension modules that must be loaded last.
+require 'ext/menu' -- provides the menu bar
+--require 'ext/key_commands_std' -- key commands for Windows and Linux
+--require 'ext/key_commands_mac' -- key commands for Mac OSX
+require 'ext/key_commands' -- key commands for Mitchell (Nano-Emacs hybrid)
if not RESETTING then
-- process command line arguments