From 6db279e12d40b1fb3863ff645cf130d1bcf7384c Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 2 Feb 2017 11:56:22 +0100 Subject: update comment and readme about lua path Commit 3570869c removed the lexers sub directory from the Lua search path. Update the comment and readme to reflect this change. --- lua/lexers/README.md | 3 ++- vis-lua.c | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lua/lexers/README.md b/lua/lexers/README.md index 10dde78..72fa67f 100644 --- a/lua/lexers/README.md +++ b/lua/lexers/README.md @@ -13,9 +13,10 @@ Vis searches the lexers in the following locations (check the end of the * `./lua/lexers` relative to the binary location (using `/proc/self/exe`) * `$XDG_CONFIG_HOME/vis/lexers` where `$XDG_CONFIG_HOME` refers to `$HOME/.config` if unset. + * `/etc/vis/lexers` * `/usr/local/share/vis/lexers` or `/usr/share/vis/lexers` depending on the build configuration - * `package.path` (standard lua search path) + * `package.path` the standard Lua search path is queried for `lexers/$name` At runtime a specific lexer can be loded by means of `:set syntax ` where `` corresponds to the filename without the `.lua` extension. diff --git a/vis-lua.c b/vis-lua.c index e45f694..cda9dd9 100644 --- a/vis-lua.c +++ b/vis-lua.c @@ -2183,11 +2183,11 @@ void vis_lua_init(Vis *vis) { vis_lua_path_strip(vis); /* extends lua's package.path with: - * - $VIS_PATH/{,lexers} - * - {,lexers} relative to the binary location - * - $XDG_CONFIG_HOME/vis/{,lexers} (defaulting to $HOME/.config/vis/{,lexers}) - * - /etc/vis/{,lexers} (for system-wide configuration provided by administrator) - * - /usr/local/share/vis/{,lexers} (or whatever is specified during ./configure) + * - $VIS_PATH + * - ./lua (relative path to the binary location) + * - $XDG_CONFIG_HOME/vis (defaulting to $HOME/.config/vis) + * - /etc/vis (for system-wide configuration provided by administrator) + * - /usr/(local/)?share/vis (or whatever is specified during ./configure) * - package.path (standard lua search path) */ char path[PATH_MAX]; -- cgit v1.2.3