diff options
| author | Jonas Strittmatter <40792180+smjonas@users.noreply.github.com> | 2023-06-26 12:19:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-26 11:19:13 +0100 |
| commit | 0ca2d11c1f473d9924c261c9dbd4e38730932bb4 (patch) | |
| tree | 69db2ae7250c442e68ec84c917e2d6626fc5ce57 /runtime/lua/vim | |
| parent | 7578144cbde7b216c5fa845e41559cb2e4c56a0a (diff) | |
| download | rneovim-0ca2d11c1f473d9924c261c9dbd4e38730932bb4.tar.gz rneovim-0ca2d11c1f473d9924c261c9dbd4e38730932bb4.tar.bz2 rneovim-0ca2d11c1f473d9924c261c9dbd4e38730932bb4.zip | |
vim-patch:9.0.1632: not all cabal config files are recognized (#24025)
Problem: Not all cabal config files are recognized.
Solution: Add a couple of patterns. (Marcin Szamotulski, closes vim/vim#12463)
https://github.com/vim/vim/commit/166cd7b801ebe4aa042a9bbd6007d1951800aaa9
Also:
- Do not expand Lua patterns in environment variables used in file patterns.
- Test $XDG_CONFIG_HOME on Windows, as it can be used by Nvim (and the runner
sets it).
Co-authored-by: Marcin Szamotulski <coot@coot.me>
Diffstat (limited to 'runtime/lua/vim')
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 7bcc67313d..fc94091622 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -1809,6 +1809,8 @@ local pattern = { ['bzr_log%..*'] = 'bzr', ['.*enlightenment/.*%.cfg'] = 'c', ['${HOME}/cabal%.config'] = 'cabalconfig', + ['${HOME}/%.config/cabal/config'] = 'cabalconfig', + ['${XDG_CONFIG_HOME}/cabal/config'] = 'cabalconfig', ['cabal%.project%..*'] = starsetf('cabalproject'), ['.*/%.calendar/.*'] = starsetf('calendar'), ['.*/share/calendar/.*/calendar%..*'] = starsetf('calendar'), @@ -2490,7 +2492,7 @@ local function match_pattern(name, path, tail, pat) return_early = true return nil end - return vim.env[env] + return vim.pesc(vim.env[env]) end) if return_early then return false |