aboutsummaryrefslogtreecommitdiffhomepage
path: root/init.lua
diff options
context:
space:
mode:
authorGravatar mitchell <70453897+667e-11@users.noreply.github.com>2010-03-29 19:04:32 -0400
committerGravatar mitchell <70453897+667e-11@users.noreply.github.com>2010-03-29 19:04:32 -0400
commit1177ef981b04a0c368ab4cbad5e0f6bfdd252cb6 (patch)
tree16feac1865912f20d3a5334a9a80c7849f6d4499 /init.lua
parent9583dadb72798bddcf14260d263a2b3b9ac451a3 (diff)
Use textadept.user_dofile() for user init.lua.
Diffstat (limited to 'init.lua')
-rw-r--r--init.lua13
1 files changed, 2 insertions, 11 deletions
diff --git a/init.lua b/init.lua
index c81f2766..05b1361f 100644
--- a/init.lua
+++ b/init.lua
@@ -4,23 +4,14 @@ local textadept = _G.textadept
local paths = {
_HOME..'/modules/?.lua',
- _HOME..'/modules/?/init.lua',
+ _HOME..'/modules/?/init.lua',
_USERHOME..'/modules/?.lua',
_USERHOME..'/modules/?/init.lua',
package.path
}
package.path = table.concat(paths, ';')
-local loaded_user_modules = false
-local user_init = _USERHOME..'/init.lua'
-local lfs = require 'lfs'
-if lfs.attributes(user_init) then
- local ret, errmsg = pcall(dofile, user_init)
- if not ret then error(errmsg) end
- loaded_user_modules = ret
-end
-
-if not loaded_user_modules then
+if not textadept.user_dofile('init.lua') then
-- Core extension modules to load on startup.
require 'ext/keys' -- provides key command support
require 'ext/find' -- provides functionality for find/replace