Mercurial > vim

changeset 12810:e0dea10b30b6 v8.0.1282

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1282: script-local variable defined in the wrong script commit https://github.com/vim/vim/commit/cef7322d8a902b4655ed861489c4e798672074f0 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Nov 9 21:05:31 2017 +0100 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.
author Christian Brabandt <cb@256bit.org>
date Thu, 09 Nov 2017 21:15:04 +0100
parents 93603d1aeeb3
children 4850b23f928c
files runtime/autoload/filetype.vim runtime/filetype.vim src/version.c
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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\)$'
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1542,7 +1542,6 @@ au BufNewFile,BufRead *.mib,*.my		setf m
 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
 
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1282,
+/**/
     1281,
 /**/
     1280,