To: vim_dev@googlegroups.com Subject: Patch 8.2.1474 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1474 Problem: /usr/lib/udef/rules.d not recognized as udevrules. Solution: Adjust match pattern. (Haochen Tong, closes 36722) Files: runtime/autoload/dist/ft.vim, src/testdir/test_filetype.vim *** ../vim-8.2.1473/runtime/autoload/dist/ft.vim 2019-03-08 07:47:10.000000000 +0100 --- runtime/autoload/dist/ft.vim 2020-08-17 21:14:02.922549916 +0200 *************** *** 298,304 **** func dist#ft#FTmms() let n = 1 ! while n < 10 let line = getline(n) if line =~ '^\s*\(%\|//\)' || line =~ '^\*' setf mmix --- 298,304 ---- func dist#ft#FTmms() let n = 1 ! while n < 20 let line = getline(n) if line =~ '^\s*\(%\|//\)' || line =~ '^\*' setf mmix *************** *** 325,331 **** func dist#ft#FTmm() let n = 1 ! while n < 10 let line = getline(n) if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)' setf objcpp --- 325,331 ---- func dist#ft#FTmm() let n = 1 ! while n < 20 let line = getline(n) if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)' setf objcpp *************** *** 575,581 **** let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*' func dist#ft#FTRules() let path = expand(':p') ! if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$' setf udevrules return endif --- 575,581 ---- let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*' func dist#ft#FTRules() let path = expand(':p') ! if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$' setf udevrules return endif *** ../vim-8.2.1473/src/testdir/test_filetype.vim 2020-08-15 14:07:19.578165841 +0200 --- src/testdir/test_filetype.vim 2020-08-17 21:14:02.922549916 +0200 *************** *** 472,477 **** --- 472,478 ---- \ 'uc': ['file.uc'], \ 'udevconf': ['/etc/udev/udev.conf'], \ 'udevperm': ['/etc/udev/permissions.d/file.permissions'], + \ 'udevrules': ['/etc/udev/rules.d/file.rules', '/usr/lib/udev/rules.d/file.rules', '/lib/udev/rules.d/file.rules'], \ 'uil': ['file.uit', 'file.uil'], \ 'updatedb': ['/etc/updatedb.conf'], \ 'upstart': ['/usr/share/upstart/file.conf', '/usr/share/upstart/file.override', '/etc/init/file.conf', '/etc/init/file.override', '/.init/file.conf', '/.init/file.override', '/.config/upstart/file.conf', '/.config/upstart/file.override'], *** ../vim-8.2.1473/src/version.c 2020-08-17 21:07:17.945045678 +0200 --- src/version.c 2020-08-17 21:15:38.405962883 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1474, /**/ -- hundred-and-one symptoms of being an internet addict: 226. You sit down at the computer right after dinner and your spouse says "See you in the morning." /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///