diff options
| -rw-r--r-- | core/events.lua | 12 | ||||
| -rw-r--r-- | core/init.lua | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/core/events.lua b/core/events.lua index 2960b4d8..47ed59ee 100644 --- a/core/events.lua +++ b/core/events.lua @@ -242,9 +242,7 @@ add_handler('view_new', buffer.property['lexer.lua.home'] = _LEXERPATH buffer.property['lexer.lua.script'] = _HOME..'/lexers/lexer.lua' if _THEME and #_THEME > 0 then - local tfile = _THEME..'/lexer.lua' - if not _THEME:find('[/\\]') then tfile = _HOME..'/themes/'..tfile end - buffer.property['lexer.lua.color.theme'] = tfile + buffer.property['lexer.lua.color.theme'] = _THEME..'/lexer.lua' end -- lexer @@ -261,9 +259,7 @@ add_handler('view_new', buffer:clear_cmd_key(string.byte('A'), c.SCMOD_CTRL) if _THEME and #_THEME > 0 then - local vfile = _THEME..'/view.lua' - if not _THEME:find('[/\\]') then vfile = _HOME..'/themes/'..vfile end - local ret, errmsg = pcall(dofile, vfile) + local ret, errmsg = pcall(dofile, _THEME..'/view.lua') if ret then return end io.stderr:write(errmsg) end @@ -327,9 +323,7 @@ add_handler('buffer_new', buffer.code_page = textadept.constants.SC_CP_UTF8 if _THEME and #_THEME > 0 then - local bfile = _THEME..'/buffer.lua' - if not _THEME:find('[/\\]') then bfile = _HOME..'/themes/'..bfile end - local ret, errmsg = pcall(dofile, bfile) + local ret, errmsg = pcall(dofile, _THEME..'/buffer.lua') if ret then return end io.stderr:write(errmsg) end diff --git a/core/init.lua b/core/init.lua index 66293773..f3d81512 100644 --- a/core/init.lua +++ b/core/init.lua @@ -17,6 +17,13 @@ if f then f:close() if theme and #theme > 0 then _THEME = theme end end +theme = _THEME +if not theme:find('[/\\]') then + _THEME = _HOME..'/themes/'..theme + if not lfs.attributes(_THEME) then + _THEME = _USERHOME..'/themes/'..theme + end +end require 'iface' require 'locale' |