To: vim_dev@googlegroups.com
Subject: Patch 9.0.1621
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.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
Files:      src/feature.h, src/os_amiga.h, src/os_dos.h, src/os_mac.h,
            src/os_unix.h


*** ../vim-9.0.1620/src/feature.h	2023-05-08 22:11:03.440937436 +0100
--- src/feature.h	2023-06-08 22:12:14.664231107 +0100
***************
*** 715,733 ****
  
  /*
   * 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"
  
  /*
   * SYS_MENU_FILE	Name of the default menu.vim file.
--- 715,745 ----
  
  /*
   * File names for:
!  * 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.
*** ../vim-9.0.1620/src/os_amiga.h	2020-09-09 11:58:47.000000000 +0100
--- src/os_amiga.h	2023-06-08 22:11:55.768216719 +0100
***************
*** 129,152 ****
  #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
--- 129,134 ----
*** ../vim-9.0.1620/src/os_dos.h	2019-11-30 17:48:57.000000000 +0000
--- src/os_dos.h	2023-06-08 22:12:32.792244463 +0100
***************
*** 88,112 ****
  # 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
--- 88,93 ----
*** ../vim-9.0.1620/src/os_mac.h	2023-04-14 21:54:21.092430693 +0100
--- src/os_mac.h	2023-06-08 22:12:39.336249179 +0100
***************
*** 145,169 ****
  # 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
--- 145,150 ----
*** ../vim-9.0.1620/src/os_unix.h	2023-05-11 22:25:37.681434047 +0100
--- src/os_unix.h	2023-06-08 22:12:46.304254136 +0100
***************
*** 216,239 ****
  #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
--- 216,221 ----
*** ../vim-9.0.1620/src/version.c	2023-06-08 21:26:14.589704404 +0100
--- src/version.c	2023-06-08 22:15:13.276345568 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1621,
  /**/

-- 
The coffee just wasn't strong enough to defend itself -- Tom Waits

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///