diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/editorconfig.txt | 14 | ||||
| -rw-r--r-- | runtime/doc/news.txt | 2 | ||||
| -rw-r--r-- | runtime/plugin/editorconfig.lua | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/runtime/doc/editorconfig.txt b/runtime/doc/editorconfig.txt index e93713e5ff..04a057e5ff 100644 --- a/runtime/doc/editorconfig.txt +++ b/runtime/doc/editorconfig.txt @@ -13,16 +13,18 @@ the opened file are applied. For more information on EditorConfig, see https://editorconfig.org/. - *g:editorconfig_enable* -EditorConfig integration can be disabled by adding >lua + *g:editorconfig* *b:editorconfig* +EditorConfig integration can be disabled globally by adding >lua - vim.g.editorconfig_enable = false + vim.g.editorconfig = false < -to the user's |init.lua| file (or the Vimscript equivalent to |init.vim|). +to the user's |init.lua| file (or the Vimscript equivalent to |init.vim|). It +can also be disabled per-buffer by setting the |b:editorconfig| buffer-local +variable to `false`. - *b:editorconfig* When Nvim finds a valid .editorconfig file it will store the applied -properties in the buffer variable |b:editorconfig|. +properties in the buffer variable |b:editorconfig| if it was not already set to +`false` by the user. *editorconfig-properties* The following properties are supported by default: diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 3e291e59c9..33ac9ddd20 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -53,7 +53,7 @@ The following new APIs or features were added. • EditorConfig support is now builtin. This is enabled by default and happens automatically. To disable it, users should add >lua - vim.g.editorconfig_enable = false + vim.g.editorconfig = false < (or the Vimscript equivalent) to their |config| file. diff --git a/runtime/plugin/editorconfig.lua b/runtime/plugin/editorconfig.lua index c715279fd5..54cd0e828e 100644 --- a/runtime/plugin/editorconfig.lua +++ b/runtime/plugin/editorconfig.lua @@ -3,8 +3,7 @@ vim.api.nvim_create_autocmd({ 'BufNewFile', 'BufRead', 'BufFilePost' }, { group = group, callback = function(args) -- Buffer-local enable has higher priority - local enable = - vim.F.if_nil(vim.b.editorconfig_enable, vim.F.if_nil(vim.g.editorconfig_enable, true)) + local enable = vim.F.if_nil(vim.b.editorconfig, vim.F.if_nil(vim.g.editorconfig, true)) if not enable then return end |