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 ffca01ed0cdcfc6c2cdf7f5e0afaaa1dbc143089..66e64b29d8118b68aa350bb22d22cd0e6370a7f6 100644 (file)
--- 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('<amatch>:p')
   if path =~ '^/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|lib/udev/\%(rules\.d/\)\=.*\.rules\)$'

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index dff2b8960f889dbf0590f5d71e73c34c4532a035..55f99fc105f41d0f5a66704ec0b80df1e15967fd 100644 (file)
--- 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 e48da73e0b2a6925c20a3a7cff685ea79208f87a..b2a3ce40ac01111729f49d4f9f074ddd82c40bce 100644 (file)
--- 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,
 /**/