To: vim_dev@googlegroups.com Subject: Patch 9.0.0093 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0093 Problem: Sway config files are recognized as i3config. Solution: Recognize swayconfig separately. (James Eapen, closes #10672) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-9.0.0092/runtime/filetype.vim 2022-07-26 19:18:23.864892621 +0100 --- runtime/filetype.vim 2022-07-27 15:03:39.300264375 +0100 *************** *** 859,867 **** " Httest au BufNewFile,BufRead *.htt,*.htb setf httest ! " i3 (and sway) ! au BufNewFile,BufRead */i3/config,*/sway/config setf i3config ! au BufNewFile,BufRead */.i3/config,*/.sway/config setf i3config " Icon au BufNewFile,BufRead *.icn setf icon --- 859,871 ---- " Httest au BufNewFile,BufRead *.htt,*.htb setf httest ! " i3 ! au BufNewFile,BufRead */i3/config setf i3config ! au BufNewFile,BufRead */.i3/config setf i3config ! ! " sway ! au BufNewFile,BufRead */sway/config setf swayconfig ! au BufNewFile,BufRead */.sway/config setf swayconfig " Icon au BufNewFile,BufRead *.icn setf icon *** ../vim-9.0.0092/src/testdir/test_filetype.vim 2022-07-26 21:41:28.711069937 +0100 --- src/testdir/test_filetype.vim 2022-07-27 15:03:39.300264375 +0100 *************** *** 535,540 **** --- 535,541 ---- \ 'svelte': ['file.svelte'], \ 'svg': ['file.svg'], \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'], + \ 'swayconfig': ['/home/user/.sway/config', '/home/user/.config/sway/config', '/etc/sway/config', '/etc/xdg/sway/config'], \ 'swift': ['file.swift'], \ 'swiftgyb': ['file.swift.gyb'], \ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf', 'any/etc/sysctl.conf', 'any/etc/sysctl.d/file.conf'], *** ../vim-9.0.0092/src/version.c 2022-07-27 14:39:57.308548748 +0100 --- src/version.c 2022-07-27 15:05:29.491873552 +0100 *************** *** 737,738 **** --- 737,740 ---- { /* Add new patch number below this line */ + /**/ + 93, /**/ -- hundred-and-one symptoms of being an internet addict: 151. You find yourself engaged to someone you've never actually met, except through e-mail. /// 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 ///