summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-17 21:57:09 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-17 21:57:09 +0200
commitaa9675a61d510c4a56c3845d05b32b1ef780d119 (patch)
tree3aa6d8244903bfb4a7e20b4b4642f0cb8967cd41
parent36967b32fd02eaab4273c1a1e7a1210a5fe45d09 (diff)
downloadvim-git-aa9675a61d510c4a56c3845d05b32b1ef780d119.tar.gz
patch 8.2.1476: filetype test fails on MS-Windowsv8.2.1476
Problem: Filetype test fails on MS-Windows. Solution: Remove "^" from pattern.
-rw-r--r--runtime/autoload/dist/ft.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim
index 84691b1e1..5c9410231 100644
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -575,7 +575,7 @@ endfunc
let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
func dist#ft#FTRules()
let path = expand('<amatch>:p')
- if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
+ if path =~ '/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
setf udevrules
return
endif
diff --git a/src/version.c b/src/version.c
index 83af39602..734d2ba2f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1476,
+/**/
1475,
/**/
1474,