[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.148-156-g41bdd90
James Vega
jamessan at debian.org
Wed Jun 17 04:21:03 UTC 2009
The following commit has been merged in the deb/runtime branch:
commit 41bdd9046438072661404564b8422ae7c1181278
Merge: 0a55f761b749b561852e3c43354222a5d2953abe aa2acc4452f3f12878994047920925a52928108a
Author: James Vega <jamessan at debian.org>
Date: Tue Jun 16 23:39:41 2009 -0400
Merge branch 'upstream-runtime' into deb/runtime
PRUNENAMES keyword added to upstream updatedb syntax file.
Conflicts:
runtime/syntax/updatedb.vim
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined runtime/doc/options.txt
index d0aaf1d,2c1062c..516d227
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1,4 -1,4 +1,4 @@@
- *options.txt* For Vim version 7.2. Last change: 2009 Apr 12
+ *options.txt* For Vim version 7.2. Last change: 2009 Jun 12
VIM REFERENCE MANUAL by Bram Moolenaar
@@@ -2458,7 -2458,8 +2458,8 @@@ A jump table for the options with a sho
{not in Vi}
External program to use for "=" command. When this option is empty
the internal formatting functions are used; either 'lisp', 'cindent'
- or 'indentexpr'.
+ or 'indentexpr'. When Vim was compiled without internal formatting,
+ the "indent" program is used.
Environment variables are expanded |:set_env|. See |option-backslash|
about including spaces and backslashes.
This option cannot be set from a |modeline| or in the |sandbox|, for
@@@ -4106,8 -4107,8 +4107,8 @@@
displayed as <xx>, with the hexadecimal value of the byte.
When 'display' contains "uhex" all unprintable characters are
displayed as <xx>.
- The NonText highlighting will be used for unprintable characters.
- |hl-NonText|
+ The SpecialKey highlighting will be used for unprintable characters.
+ |hl-SpecialKey|
Multi-byte characters 256 and above are always included, only the
characters up to 255 are specified with this option. When a character
@@@ -4615,7 -4616,7 +4616,7 @@@
*'modeline'* *'ml'* *'nomodeline'* *'noml'*
'modeline' 'ml' boolean (Vim default: on (off for root),
- Vi default: off)
+ Debian: off, Vi default: off)
local to buffer
*'modelines'* *'mls'*
'modelines' 'mls' number (default 5)
diff --combined runtime/filetype.vim
index 5f1b8d5,49bc5f8..a54c164
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@@ -1,7 -1,7 +1,7 @@@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram at vim.org>
- " Last Change: 2008 Dec 14
+ " Last Change: 2009 Jun 13
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@@ -110,8 -110,8 +110,8 @@@ au BufNewFile,BufRead build.xml setf
au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
" Apache config file
- au BufNewFile,BufRead .htaccess setf apache
- au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
+ au BufNewFile,BufRead .htaccess,/etc/httpd/*.conf setf apache
+ au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
" XA65 MOS6510 cross assembler
au BufNewFile,BufRead *.a65 setf a65
@@@ -899,7 -899,7 +899,7 @@@ au BufNewFile,BufRead *.java,*.jav set
au BufNewFile,BufRead *.jj,*.jjt setf javacc
" JavaScript, ECMAScript
- au BufNewFile,BufRead *.js,*.javascript,*.es setf javascript
+ au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx setf javascript
" Java Server Pages
au BufNewFile,BufRead *.jsp setf jsp
@@@ -1691,7 -1691,15 +1691,15 @@@ func! SetFileTypeSH(name
if expand("<amatch>") =~ g:ft_ignore_pat
return
endif
- if a:name =~ '\<ksh\>'
+ if a:name =~ '\<csh\>'
+ " Some .sh scripts contain #!/bin/csh.
+ call SetFileTypeShell("csh")
+ return
+ elseif a:name =~ '\<tcsh\>'
+ " Some .sh scripts contain #!/bin/tcsh.
+ call SetFileTypeShell("tcsh")
+ return
+ elseif a:name =~ '\<ksh\>'
let b:is_kornshell = 1
if exists("b:is_bash")
unlet b:is_bash
@@@ -1829,10 -1837,15 +1837,15 @@@ au BufNewFile,BufRead *.rules call s:
let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
func! s:FTRules()
- if expand('<amatch>:p') =~ '^/etc/udev/\%(rules\.d/\)\=.*\.rules$'
+ let path = expand('<amatch>:p')
+ if path =~ '^/etc/udev/\%(rules\.d/\)\=.*\.rules$'
setf udevrules
return
endif
+ if path =~ '^/etc/ufw/'
+ setf conf " Better than hog
+ return
+ endif
try
let config_lines = readfile('/etc/udev/udev.conf')
catch /^Vim\%((\a\+)\)\=:E484/
@@@ -1915,6 -1928,9 +1928,9 @@@ au BufNewFile,BufRead *.cm setf vosc
" Sysctl
au BufNewFile,BufRead /etc/sysctl.conf setf sysctl
+ " Synopsys Design Constraints
+ au BufNewFile,BufRead *.sdc setf sdc
+
" Sudoers
au BufNewFile,BufRead /etc/sudoers,sudoers.tmp setf sudoers
@@@ -1986,7 -2002,7 +2002,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)
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list