From c81dfaa69ceec9f6b88caf1dcdf2f859d4fcae47 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 8 Jun 2023 22:16:23 +0100 Subject: patch 9.0.1621: FILETYPE_FILE is defined to the same value multiple times 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 --- src/feature.h | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'src/feature.h') diff --git a/src/feature.h b/src/feature.h index ba61fa2daf..ca180dd1f0 100644 --- a/src/feature.h +++ b/src/feature.h @@ -715,19 +715,31 @@ /* * File names for: - * FILETYPE_FILE switch on file type detection - * FTPLUGIN_FILE switch on loading filetype plugin files - * INDENT_FILE switch on loading indent files - * FTOFF_FILE switch off file type detection - * FTPLUGOF_FILE switch off loading settings files - * INDOFF_FILE switch off loading indent files - */ -// # define FILETYPE_FILE "filetype.vim" -// # define FTPLUGIN_FILE "ftplugin.vim" -// # define INDENT_FILE "indent.vim" -// # define FTOFF_FILE "ftoff.vim" -// # define FTPLUGOF_FILE "ftplugof.vim" -// # define INDOFF_FILE "indoff.vim" + * 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.vim" +#endif +#ifndef FTPLUGIN_FILE +# define FTPLUGIN_FILE "ftplugin.vim" +#endif +#ifndef INDENT_FILE +# define INDENT_FILE "indent.vim" +#endif +#ifndef FTOFF_FILE +# define FTOFF_FILE "ftoff.vim" +#endif +#ifndef FTPLUGOF_FILE +# define FTPLUGOF_FILE "ftplugof.vim" +#endif +#ifndef INDOFF_FILE +# define INDOFF_FILE "indoff.vim" +#endif /* * SYS_MENU_FILE Name of the default menu.vim file. -- cgit v1.2.3