To: vim_dev@googlegroups.com
Subject: Patch 9.0.0424
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.0424
Problem:    gitattributes files are not recognized.
Solution:   Add patterns to match gitattributes files. (closes #11085)
Files:      runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.0423/runtime/filetype.vim	2022-09-08 14:41:45.338817579 +0100
--- runtime/filetype.vim	2022-09-09 14:10:42.348695272 +0100
***************
*** 720,726 ****
--- 720,730 ----
  au BufNewFile,BufRead .gitmodules,*.git/modules/*/config	setf gitconfig
  if !empty($XDG_CONFIG_HOME)
    au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
+   au BufNewFile,BufRead $XDG_CONFIG_HOME/git/attributes		setf gitattributes
  endif
+ au BufNewFile,BufRead .gitattributes,*.git/info/attributes	setf gitattributes
+ au BufNewFile,BufRead */.config/git/attributes  		setf gitattributes
+ au BufNewFile,BufRead */etc/gitattributes  			setf gitattributes
  au BufNewFile,BufRead git-rebase-todo		setf gitrebase
  au BufRead,BufNewFile .gitsendemail.msg.??????	setf gitsendemail
  au BufNewFile,BufRead *.git/*
*** ../vim-9.0.0423/src/testdir/test_filetype.vim	2022-09-08 14:41:45.338817579 +0100
--- src/testdir/test_filetype.vim	2022-09-09 14:06:28.137325274 +0100
***************
*** 213,218 ****
--- 213,219 ----
      \ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
      \ 'gemtext': ['file.gmi', 'file.gemini'],
      \ 'gift': ['file.gift'],
+     \ 'gitattributes': ['file.git/info/attributes', '.gitattributes', '/.config/git/attributes', '/etc/gitattributes', '/usr/local/etc/gitattributes', 'some.git/info/attributes'],
      \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
      \ 'gitconfig': ['file.git/config', 'file.git/config.worktree', 'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/usr/local/etc/gitconfig', '/etc/gitconfig.d/file', 'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
      \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
*** ../vim-9.0.0423/src/version.c	2022-09-09 13:27:40.403539790 +0100
--- src/version.c	2022-09-09 14:11:02.632645141 +0100
***************
*** 705,706 ****
--- 705,708 ----
  {   /* Add new patch number below this line */
+ /**/
+     424,
  /**/

-- 
"You know, it's at times like this when I'm trapped in a Vogon airlock with
a man from Betelgeuse and about to die of asphyxiation in deep space that I
really wish I'd listened to what my mother told me when I was young!"
"Why, what did she tell you?"
"I don't know, I didn't listen!"
		-- Arthur Dent and Ford Prefect in Douglas Adams'
		   "The Hitchhiker's Guide to the Galaxy"

 /// 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    ///