Patch 9.0.1167

2 views
Skip to first unread message

Bram Moolenaar

unread,
Jan 9, 2023, 3:08:35 PM1/9/23
to vim...@googlegroups.com

Patch 9.0.1167
Problem: EditorConfig files do not have their own filetype.
Solution: Add the "editorconfig" filetype. (Gregory Anders, closes #11779)
Files: runtime/filetype.vim, src/testdir/test_filetype.vim


*** ../vim-9.0.1166/runtime/filetype.vim 2022-12-27 20:17:15.805022039 +0000
--- runtime/filetype.vim 2023-01-09 20:04:40.761740811 +0000
***************
*** 606,613 ****
\ setf clojure |
\ endif

! " EditorConfig (close enough to dosini)
! au BufNewFile,BufRead .editorconfig setf dosini

" Embedix Component Description
au BufNewFile,BufRead *.ecd setf ecd
--- 606,613 ----
\ setf clojure |
\ endif

! " EditorConfig
! au BufNewFile,BufRead .editorconfig setf editorconfig

" Embedix Component Description
au BufNewFile,BufRead *.ecd setf ecd
*** ../vim-9.0.1166/src/testdir/test_filetype.vim 2022-12-31 14:46:49.805459113 +0000
--- src/testdir/test_filetype.vim 2023-01-09 20:04:40.761740811 +0000
***************
*** 160,166 ****
\ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
\ 'dockerfile': ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
\ 'dosbatch': ['file.bat'],
! \ 'dosini': ['.editorconfig', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap'],
\ 'dot': ['file.dot', 'file.gv'],
\ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'],
\ 'dtd': ['file.dtd'],
--- 160,166 ----
\ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
\ 'dockerfile': ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
\ 'dosbatch': ['file.bat'],
! \ 'dosini': ['/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap'],
\ 'dot': ['file.dot', 'file.gv'],
\ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'],
\ 'dtd': ['file.dtd'],
***************
*** 172,177 ****
--- 172,178 ----
\ 'dylanlid': ['file.lid'],
\ 'ecd': ['file.ecd'],
\ 'edif': ['file.edf', 'file.edif', 'file.edo'],
+ \ 'editorconfig': ['.editorconfig'],
\ 'eelixir': ['file.eex', 'file.leex'],
\ 'elinks': ['elinks.conf'],
\ 'elixir': ['file.ex', 'file.exs', 'mix.lock'],
*** ../vim-9.0.1166/src/version.c 2023-01-09 19:04:19.304528371 +0000
--- src/version.c 2023-01-09 20:07:34.181555987 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 1167,
/**/

--
Back off man, I'm a scientist.
-- Peter, Ghostbusters

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages