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

diff --git a/src/feature.h b/src/feature.h
index ba61fa2dafa7689668a3ecddca3d0f1d3246a421..ca180dd1f053904970618e87e4c74c8795a5cc63 100644 (file)
--- 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 98f3cffdec1f701ab3b677860c013f6898aafb21..57417137a0f9c0a3b0f88a7fc6040cfc55e930b4 100644 (file)
--- 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 1d67ab8ecae8c699128026c250a4f5c895fabc36..f1fcbe6b793d2c9e65db3dbc2beb7469deb532c2 100644 (file)
--- 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 17e94784c4bc3855fb5d2a2727fd9e66a5fccbc7..34fe1f14cbc8614763f886fcd03ace36c6a39e31 100644 (file)
--- 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 c03e2939a2d1ff513d18a1942251c632ab2bf47a..4c77e158629f2211742aa71abaccc4e38fe2cf9e 100644 (file)
--- 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 bad9e5428c7815c9e2cbadb69914d18daa1a4526..e5cb446ff71db70afb9eb44725cbf4dc70b9c279 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1621,
 /**/
     1620,
 /**/