aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-26 20:03:41 -04:00
Code

patch 9.0.1621: FILETYPE_FILE is defined to the same value multiple times

Browse Source 
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
This commit is contained in:
Bram Moolenaar 2023-06-08 22:16:23 +01:00
parent 19548c6a74
commit c81dfaa69c
6 changed files with 26 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/feature.h
View File

@ -715,19 +715,31 @@
/* /*
* File names for: * File names for:
* FILETYPE_FILE switch on file type detection * FILETYPE_FILE used for file type detection
* FTPLUGIN_FILE switch on loading filetype plugin files * FTPLUGIN_FILE used for loading filetype plugin files
* INDENT_FILE switch on loading indent files * INDENT_FILE used for loading indent files
* FTOFF_FILE switch off file type detection * FTOFF_FILE used for file type detection
* FTPLUGOF_FILE switch off loading settings files * FTPLUGOF_FILE used for loading settings files
* INDOFF_FILE switch off loading indent files * INDOFF_FILE used for loading indent files
*/ */
// # define FILETYPE_FILE "filetype.vim" #ifndef FILETYPE_FILE
// # define FTPLUGIN_FILE "ftplugin.vim" # define FILETYPE_FILE "filetype.vim"
// # define INDENT_FILE "indent.vim" #endif
// # define FTOFF_FILE "ftoff.vim" #ifndef FTPLUGIN_FILE
// # define FTPLUGOF_FILE "ftplugof.vim" # define FTPLUGIN_FILE "ftplugin.vim"
// # define INDOFF_FILE "indoff.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. * SYS_MENU_FILE Name of the default menu.vim file.

18
src/os_amiga.h
View File

@ -129,24 +129,6 @@ typedef long off_t;
#ifndef DFLT_HELPFILE #ifndef DFLT_HELPFILE
# define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt"
#endif #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 #ifndef SYNTAX_FNAME
# define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim" # define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim"
#endif #endif

19
src/os_dos.h
View File

@ -88,25 +88,6 @@
# define DFLT_HELPFILE "$VIMRUNTIME\\doc\\help.txt" # define DFLT_HELPFILE "$VIMRUNTIME\\doc\\help.txt"
#endif #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 #ifndef SYNTAX_FNAME
# define SYNTAX_FNAME "$VIMRUNTIME\\syntax\\%s.vim" # define SYNTAX_FNAME "$VIMRUNTIME\\syntax\\%s.vim"
#endif #endif

19
src/os_mac.h
View File

@ -145,25 +145,6 @@
# define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt"
#endif #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 #ifndef SYNTAX_FNAME
# define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim" # define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim"
#endif #endif

18
src/os_unix.h
View File

@ -216,24 +216,6 @@ typedef struct dsc$descriptor DESC;
#ifndef DFLT_HELPFILE #ifndef DFLT_HELPFILE
# define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt"
#endif #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 #ifndef SYS_MENU_FILE
# define SYS_MENU_FILE "$VIMRUNTIME/menu.vim" # define SYS_MENU_FILE "$VIMRUNTIME/menu.vim"
#endif #endif

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1621,
/**/ /**/
1620, 1620,
/**/ /**/