[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.284-159-gf076aee
James Vega
jamessan at debian.org
Wed Jan 13 06:27:18 UTC 2010
The following commit has been merged in the deb/runtime branch:
commit 6cab6ddc5f007ba28ba0f3847117ab0a3abfaeac
Merge: c33ea575c82493a00a4bda113934a087e3171ccc 4c6f903dadab102c500a8acac0fde3e22ff08fed
Author: James Vega <jamessan at debian.org>
Date: Wed Jan 13 00:58:01 2010 -0500
Merge branch 'upstream-runtime' into deb/runtime
diff --combined runtime/filetype.vim
index 84cd0a4,21f7d87..d988f58
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@@ -2007,7 -2007,7 +2007,7 @@@ func! s:FTtex(
call cursor(1,1)
let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
- let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
+ let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>\|part\>\|chapter\>\|section\>\|subsection\>\|subsubsection\>\|paragraph\>\|subparagraph\>\|subsubparagraph'
let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
\ 'cnp', firstNC + 1000)
@@@ -2435,6 -2435,12 +2435,12 @@@ au BufNewFile,BufRead /etc/xinetd.d/*
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
+
+ " Use the filetype detect plugins. They may overrule any of the previously
+ " detected filetypes.
+ runtime! ftdetect/*.vim
+
+
" Generic configuration file (check this last, it's just guessing!)
au BufNewFile,BufRead,StdinReadPost *
\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
@@@ -2443,10 -2449,6 +2449,6 @@@
\ setf conf |
\ endif
- " Use the plugin-filetype checks last, they may overrule any of the previously
- " detected filetypes.
- runtime! ftdetect/*.vim
-
augroup END
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list