From: Bram Moolenaar Date: Thu, 9 Nov 2017 20:05:31 +0000 (+0100) Subject: patch 8.0.1282: script-local variable defined in the wrong script X-Git-Tag: v8.0.1282 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cef7322d8a902b4655ed861489c4e798672074f0;p=vim patch 8.0.1282: script-local variable defined in the wrong script Problem: script-local variable defined in the wrong script Solution: Move variable to autoload/filetype.vim. --- diff --git a/runtime/autoload/filetype.vim b/runtime/autoload/filetype.vim index ffca01ed0..66e64b29d 100644 --- a/runtime/autoload/filetype.vim +++ b/runtime/autoload/filetype.vim @@ -560,6 +560,7 @@ func filetype#CSH() endif endfunc +let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*' func filetype#FTRules() let path = expand(':p') if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$' diff --git a/runtime/filetype.vim b/runtime/filetype.vim index dff2b8960..55f99fc10 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1542,7 +1542,6 @@ au BufNewFile,BufRead *.mib,*.my setf mib au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog au BufNewFile,BufRead *.rules call filetype#FTRules() -let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*' " Spec (Linux RPM) au BufNewFile,BufRead *.spec setf spec diff --git a/src/version.c b/src/version.c index e48da73e0..b2a3ce40a 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1282, /**/ 1281, /**/