diff options
| -rw-r--r-- | core/gui.lua | 3 | ||||
| -rw-r--r-- | core/init.lua | 5 | ||||
| -rw-r--r-- | modules/textadept/mime_types.lua | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/core/gui.lua b/core/gui.lua index 0d07f33e..c8e593f2 100644 --- a/core/gui.lua +++ b/core/gui.lua @@ -250,7 +250,8 @@ events_connect(events.BUFFER_NEW, function() buffer.lexer_language = 'lpeg' buffer:private_lexer_call(SETDIRECTFUNCTION, buffer.direct_function) buffer:private_lexer_call(SETDIRECTPOINTER, buffer.direct_pointer) - buffer.property['lexer.lpeg.home'] = _LEXERPATH + buffer.property['lexer.lpeg.home'] = _USERHOME..'/lexers/?.lua;'.. + _HOME..'/lexers' load_theme_and_settings() buffer:private_lexer_call(SETLEXERLANGUAGE, 'text') end) diff --git a/core/init.lua b/core/init.lua index 2d4497ef..f4b96961 100644 --- a/core/init.lua +++ b/core/init.lua @@ -13,7 +13,6 @@ require('lfs_ext') require('gui') keys = require('keys') -_LEXERPATH = _USERHOME..'/lexers/?.lua;'.._HOME..'/lexers' _M = {} -- modules table -- LuaJIT compatibility. if jit then module, package.searchers, bit32 = nil, package.loaders, bit end @@ -23,10 +22,6 @@ if jit then module, package.searchers, bit32 = nil, package.loaders, bit end -- Extends Lua's _G table to provide extra functions and fields for Textadept. -- @field _HOME (string) -- The path to the directory containing Textadept. --- @field _LEXERPATH (string) --- The paths to lexers, formatted like Lua's [`package.path`][]. --- --- [`package.path`]: http://lua.org/manual/5.2/manual.html#pdf-package.path -- @field _RELEASE (string) -- The Textadept release version string. -- @field _USERHOME (string) diff --git a/modules/textadept/mime_types.lua b/modules/textadept/mime_types.lua index 06653223..39ba8be7 100644 --- a/modules/textadept/mime_types.lua +++ b/modules/textadept/mime_types.lua @@ -43,7 +43,7 @@ M.shebangs = {} M.patterns = {} --- --- List of lexers found in `_LEXERPATH`. +-- List of available lexers. -- @class table -- @name lexers M.lexers = {} @@ -157,7 +157,7 @@ end -- Generate lexer list. local lexers_found = {} -for dir in _LEXERPATH:gsub('[/\\]%?%.lua', ''):gmatch('[^;]+') do +for _, dir in ipairs{_HOME..'/lexers', _USERHOME..'/lexers'} do if lfs.attributes(dir) then for lexer in lfs.dir(dir) do if lexer:find('%.lua$') and lexer ~= 'lexer.lua' then |