To: vim_dev@googlegroups.com Subject: Patch 8.2.3805 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3805 Problem: i3config files are not recognized. Solution: Add patterns to match i3config files. (Quentin Hibon, closes #7969) Files: runtime/filetype.vim, src/testdir/test_filetype.vim *** ../vim-8.2.3804/runtime/filetype.vim 2021-12-09 20:54:10.430603951 +0000 --- runtime/filetype.vim 2021-12-14 09:19:48.109188516 +0000 *************** *** 790,795 **** --- 790,799 ---- " 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 *** ../vim-8.2.3804/src/testdir/test_filetype.vim 2021-12-09 20:54:10.430603951 +0000 --- src/testdir/test_filetype.vim 2021-12-14 09:14:50.266833487 +0000 *************** *** 226,231 **** --- 226,232 ---- \ 'hollywood': ['file.hws'], \ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'], \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'], + \ 'i3config': ['/home/user/.i3/config', '/home/user/.config/i3/config', '/etc/i3/config', '/etc/xdg/i3/config'], \ 'logcheck': ['/etc/logcheck/file.d-some/file', '/etc/logcheck/file.d/file', 'any/etc/logcheck/file.d-some/file', 'any/etc/logcheck/file.d/file'], \ 'modula3': ['file.m3', 'file.mg', 'file.i3', 'file.ig'], \ 'natural': ['file.NSA', 'file.NSC', 'file.NSG', 'file.NSL', 'file.NSM', 'file.NSN', 'file.NSP', 'file.NSS'], *** ../vim-8.2.3804/src/version.c 2021-12-14 09:01:35.200116814 +0000 --- src/version.c 2021-12-14 09:33:06.025383035 +0000 *************** *** 751,752 **** --- 751,754 ---- { /* Add new patch number below this line */ + /**/ + 3805, /**/ -- If you put seven of the most talented OSS developers in a room and ask them to fix a bug in a spreadsheet program, in one week you'd have 2 new mail readers and a text-based web browser. /// 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 ///