aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Seifferth <frankseifferth@posteo.net>2019-04-22 12:58:12 +0200
committerFrank Seifferth <frankseifferth@posteo.net>2019-10-09 18:49:24 +0100
commit7bb6a56f26c5be912d38ef3a6fc21ffb5a740a0f (patch)
tree8d1788667c81b98f3730be7fdf7d62dc63ffe9b1
parent45e07b8acdf4ba874dd7828ddff298acae2d15c2 (diff)
downloadvis-editorconfig-7bb6a56f26c5be912d38ef3a6fc21ffb5a740a0f.tar.gz
Update to editorconfig-core-lua v0.3.0
The lua module has been renamed to editorconfig in v0.3.0.[1] The rename could trigger a naming conflict with the `editorconfig.lua` module in vis. This commit includes a rename of the script to `edconf.lua` to prevent the naming conflict. [1]: https://github.com/editorconfig/editorconfig-core-lua/commit/3393dcf59cdc9e86102a56b2cd4b7aca60f45cee
-rw-r--r--README.md2
-rw-r--r--edconf.lua (renamed from editorconfig.lua)4
2 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index e2308d3..bc49140 100644
--- a/README.md
+++ b/README.md
@@ -13,4 +13,4 @@ You'll need the Lua wrapper for editorconfig-core installed. This can be done th
git clone https://github.com/vktec/vis-editorconfig "$HOME/.config/vis/editorconfig"
```
-Then add `require "editorconfig/editorconfig"` to your `visrc.lua`.
+Then add `require "editorconfig/edconf"` to your `visrc.lua`.
diff --git a/editorconfig.lua b/edconf.lua
index 67389b7..d801a19 100644
--- a/editorconfig.lua
+++ b/edconf.lua
@@ -1,5 +1,5 @@
require "vis"
-ec = require "editorconfig_core"
+ec = require "editorconfig"
-- Simple wrapper
function vis_set(option, value)
@@ -16,7 +16,7 @@ end
OPTIONS = {
indent_style = function (value)
- vis_set("expandtab", (value == ec.T.INDENT_STYLE_SPACE))
+ vis_set("expandtab", (value == ec.INDENT_STYLE_SPACE))
end,
indent_size = function (value)