diff options
author | Bram Moolenaar <Bram@vim.org> | 2023-06-08 22:16:23 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2023-06-08 22:16:23 +0100 |
commit | c81dfaa69ceec9f6b88caf1dcdf2f859d4fcae47 (patch) | |
tree | 90f3e5f122383bb88a1be4415d1458c5e020ad24 | |
parent | 19548c6a742d954ecd0b50b0680c37cc6ced7473 (diff) |
patch 9.0.1621: FILETYPE_FILE is defined to the same value multiple timesv9.0.1621
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
-rw-r--r-- | src/feature.h | 38 | ||||
-rw-r--r-- | src/os_amiga.h | 18 | ||||
-rw-r--r-- | src/os_dos.h | 19 | ||||
-rw-r--r-- | src/os_mac.h | 19 | ||||
-rw-r--r-- | src/os_unix.h | 18 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 27 insertions, 87 deletions
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. diff --git a/src/os_amiga.h b/src/os_amiga.h index 98f3cffdec..57417137a0 100644 --- a/src/os_amiga.h +++ b/src/os_amiga.h @@ -129,24 +129,6 @@ typedef long off_t; #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" #endif -#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 #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim" #endif diff --git a/src/os_dos.h b/src/os_dos.h index 1d67ab8eca..f1fcbe6b79 100644 --- a/src/os_dos.h +++ b/src/os_dos.h @@ -88,25 +88,6 @@ # define DFLT_HELPFILE "$VIMRUNTIME\\doc\\help.txt" #endif -#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 - #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME\\syntax\\%s.vim" #endif diff --git a/src/os_mac.h b/src/os_mac.h index 17e94784c4..34fe1f14cb 100644 --- a/src/os_mac.h +++ b/src/os_mac.h @@ -145,25 +145,6 @@ # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" #endif -#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 - #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim" #endif diff --git a/src/os_unix.h b/src/os_unix.h index c03e2939a2..4c77e15862 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -216,24 +216,6 @@ typedef struct dsc$descriptor DESC; #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" #endif -#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 #ifndef SYS_MENU_FILE # define SYS_MENU_FILE "$VIMRUNTIME/menu.vim" #endif diff --git a/src/version.c b/src/version.c index bad9e5428c..e5cb446ff7 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1621, +/**/ 1620, /**/ 1619, |