diff options
author | mitchell <70453897+667e-11@users.noreply.github.com> | 2009-11-08 22:54:37 -0500 |
---|---|---|
committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2009-11-08 22:54:37 -0500 |
commit | 9225218eb00f350dd32a8a8592029f12ea7fb1d9 (patch) | |
tree | 43949dafc8660158395fe19e91b5155ba16738e1 /core/events.lua | |
parent | cc9028fbf9b082252615595dae5580c7cb38c952 (diff) |
Search _USERHOME for theme names in addition to _HOME.
Diffstat (limited to 'core/events.lua')
-rw-r--r-- | core/events.lua | 12 |
1 files changed, 3 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 |