diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-06-09 21:30:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-09 21:30:29 +0800 |
| commit | 49019da86e283052c042509689f3a287056d1340 (patch) | |
| tree | bd88de9802988f5df0b5f54e24c7fca7797e92ce | |
| parent | 106922898ad1510954737d38e7f8db78559ae6bd (diff) | |
| download | rneovim-49019da86e283052c042509689f3a287056d1340.tar.gz rneovim-49019da86e283052c042509689f3a287056d1340.tar.bz2 rneovim-49019da86e283052c042509689f3a287056d1340.zip | |
vim-patch:9.0.1621: FILETYPE_FILE is defined to the same value multiple times (#23965)
Problem: FILETYPE_FILE is defined to the same value multiple times. Same
for a few similar macros.
Solution: Define FILETYPE_FILE and others in feature.h only
https://github.com/vim/vim/commit/c81dfaa69ceec9f6b88caf1dcdf2f859d4fcae47
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/globals.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index b71c0d2c70..f2c9aea675 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -29,8 +29,15 @@ # define _PATHSEPSTR "/" #endif +// FILETYPE_FILE used for file type detection +// FTPLUGIN_FILE used for loading filetype plugin files +// INDENT_FILE used for loading indent files +// FTOFF_FILE used for file type detection +// FTPLUGOF_FILE used for loading settings files +// INDOFF_FILE used for loading indent files + #ifndef FILETYPE_FILE -# define FILETYPE_FILE "filetype.lua filetype.vim" +# define FILETYPE_FILE "filetype.lua filetype.vim" #endif #ifndef FTPLUGIN_FILE |