diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/events.lua | 19 | ||||
| -rw-r--r-- | core/init.lua | 1 |
2 files changed, 16 insertions, 4 deletions
diff --git a/core/events.lua b/core/events.lua index c707b872..48575b8e 100644 --- a/core/events.lua +++ b/core/events.lua @@ -208,16 +208,18 @@ add_handler('view_new', buffer.property['textadept.home'] = _HOME buffer.property['lexer.lua.home'] = _HOME..'/lexers/' buffer.property['lexer.lua.script'] = _HOME..'/lexers/lexer.lua' - --buffer.property['lexer.lua.color.theme'] = 'scite' + if _THEME and #_THEME > 0 then + buffer.property['lexer.lua.color.theme'] = _THEME + end -- lexer buffer.style_bits = 8 buffer.lexer = c.SCLEX_LPEG buffer:set_lexer_language('container') - local theme = buffer:get_property_expanded('lexer.lua.color.theme') - if theme and theme ~= '' then - local ret, errmsg = pcall(dofile, _HOME..'/themes/'..theme..'.lua') + if _THEME and #_THEME > 0 then + local ret, errmsg = + pcall(dofile, _HOME..'/themes/'.._THEME..'/view.lua') if ret then return end io.stderr:write(errmsg) end @@ -286,6 +288,15 @@ add_handler('buffer_new', buffer.lexer = textadept.constants.SCLEX_LPEG buffer:set_lexer_language('container') + if _THEME and #_THEME > 0 then + local ret, errmsg = + pcall(dofile, _HOME..'/themes/'.._THEME..'/buffer.lua') + if ret then return end + io.stderr:write(errmsg) + end + + -- Default theme. + -- folding buffer.property['fold'] = '1' buffer.property['fold.by.indentation'] = '1' diff --git a/core/init.lua b/core/init.lua index 82348f1f..6b491583 100644 --- a/core/init.lua +++ b/core/init.lua @@ -6,6 +6,7 @@ if not WIN32 then else package.cpath = _HOME..'/core/?.dll;'..package.cpath end +_THEME = '' require 'iface' require 'events' |