[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.284-159-gf076aee

James Vega jamessan at debian.org
Wed Jan 13 06:27:26 UTC 2010 

The following commit has been merged in the deb/runtime branch:
commit f076aeec189016ba42e566c8a5596831e7e6bda6
Merge: 6cab6ddc5f007ba28ba0f3847117ab0a3abfaeac fd764202792b39ab3f0dd499c434038c425e57d3
Author: James Vega <jamessan at debian.org>
Date:   Wed Jan 13 01:00:00 2010 -0500

    Merge branch 'upstream-runtime' into deb/runtime
    
    Conflicts:
    	runtime/doc/pi_netrw.txt
    	runtime/ftplugin/gitcommit.vim
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --combined runtime/doc/options.txt
index c31acf6,e178613..9eacc81
--- 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 Oct 12
+ *options.txt*	For Vim version 7.2.  Last change: 2010 Jan 06
  
  
  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@@ -813,11 -813,11 +813,11 @@@ A jump table for the options with a sho
  	When 'background' is set Vim will adjust the default color groups for
  	the new value.  But the colors used for syntax highlighting will not
  	change.					*g:colors_name*
- 	When a color scheme is loaded (the "colors_name" variable is set)
+ 	When a color scheme is loaded (the "g:colors_name" variable is set)
  	setting 'background' will cause the color scheme to be reloaded.  If
  	the color scheme adjusts to the value of 'background' this will work.
  	However, if the color scheme sets 'background' itself the effect may
- 	be undone.  First delete the "colors_name" variable when needed.
+ 	be undone.  First delete the "g:colors_name" variable when needed.
  
  	When setting 'background' to the default value with: >
  		:set background&
@@@ -1760,8 -1760,8 +1760,8 @@@
  	set and to the Vim default value when 'compatible' is reset.
  	NOTE: This option is set to the POSIX default value at startup when
  	the Vi default value would be used and the $VIM_POSIX environment
- 	variable exists |posix|.  This means tries to behave like the POSIX
- 	specification.
+ 	variable exists |posix|.  This means Vim tries to behave like the
+ 	POSIX specification.
  
  	    contains	behavior	~
  								*cpo-a*
@@@ -2451,6 -2451,9 +2451,9 @@@
  	'eadirection' option tells in which direction the size is affected.
  	Changing the height and width of a window can be avoided by setting
  	'winfixheight' and 'winfixwidth', respectively.
+ 	If a window size is specified when creating a new window sizes are
+ 	currently not equalized (it's complicated, but may be implemented in
+ 	the future).
  
  						*'equalprg'* *'ep'*
  'equalprg' 'ep'		string	(default "")
@@@ -3247,7 -3250,7 +3250,7 @@@
  	the case of X).  The font names given should be "normal" fonts.  Vim
  	will try to find the related bold and italic fonts.
  
- 	For Win32, GTK, Mac OS and Photon: >
+ 	For Win32, GTK, Motif, Mac OS and Photon: >
  	    :set guifont=*
  <	will bring up a font requester, where you can pick the font you want.
  
@@@ -4622,7 -4625,7 +4625,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)
@@@ -5912,8 -5915,12 +5915,12 @@@
  			{not available when compiled without the  |+linebreak|
  			feature}
  	String to put at the start of lines that have been wrapped.  Useful
- 	values are "> " or "+++ ".
- 	Only printable single-cell characters are allowed, excluding <Tab> and
+ 	values are "> " or "+++ ": >
+ 		:set showbreak=>\ 
+ <	Note the backslash to escape the trailing space.  It's easier like
+ 	this: >
+ 		:let &showbreak = '+++ ' 
+ <	Only printable single-cell characters are allowed, excluding <Tab> and
  	comma (in a future version the comma might be used to separate the
  	part that is shown at the end and at the start of a line).
  	The characters are highlighted according to the '@' flag in
diff --combined runtime/filetype.vim
index d988f58,5665cc2..6a1542c
--- 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:	2009 Sep 18
+ " Last Change:	2009 Dec 24
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -710,9 -710,9 +710,9 @@@ au BufNewFile,BufRead *.mo,*.gdmo		set
  au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
  
  " Git
- autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG    setf gitcommit
- autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
- autocmd BufNewFile,BufRead git-rebase-todo         setf gitrebase
+ autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
+ autocmd BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
+ autocmd BufNewFile,BufRead git-rebase-todo      setf gitrebase
  autocmd BufNewFile,BufRead .msg.[0-9]*
        \ if getline(1) =~ '^From.*# This line is ignored.$' |
        \   setf gitsendemail |
@@@ -1593,7 -1593,7 +1593,7 @@@ au BufNewFile,BufRead *.builder,*.rxml,
  " Rantfile and Rakefile is like Ruby
  au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
  
- " S-lang (or shader language!)
+ " S-lang (or shader language, or SmallLisp)
  au BufNewFile,BufRead *.sl			setf slang
  
  " Samba config
@@@ -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)
diff --combined runtime/scripts.vim
index 1639e0d,0b3b135..d250b45
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@@ -1,7 -1,7 +1,7 @@@
  " Vim support file to detect file types in scripts
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
- " Last change:	2008 Sep 05
+ " Last change:	2009 Dec 24
  
  " This file is called by an autocommand for every file that has just been
  " loaded into a buffer.  It checks if the type of file can be recognized by
@@@ -317,16 -317,8 +317,16 @@@ els
    elseif s:line1 =~ 'exec\s\+\S*scheme' || s:line2 =~ 'exec\s\+\S*scheme'
      set ft=scheme
  
 +  " rst files
 +  elseif s:line1 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line2 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line3 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line4 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line5 =~ '^\.\.\s\|^\s*restindex\s*$'
 +    set ft=rst
 +
    " Git output
-   elseif s:line1 =~ '^\(commit\|tree\|object\) \x\{40\}$\|^tag \S\+$'
+   elseif s:line1 =~ '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
      set ft=git
  
    " CVS diff
diff --combined runtime/syntax/tex.vim
index a34dbeb,ff171d3..6898834
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@@ -1,8 -1,8 +1,8 @@@
  " Vim syntax file
  " Language:	TeX
  " Maintainer:	Dr. Charles E. Campbell, Jr. <NdrchipO at ScampbellPfamily.AbizM>
- " Last Change:	Feb 05, 2009
- " Version:	45
+ " Last Change:	Dec 28, 2009
+ " Version:	46
  " URL:		http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
  "
  " Notes: {{{1
@@@ -180,12 -180,12 +180,12 @@@ syn match texLigature		"\\\([ijolL]\|ae
  
  " \begin{}/\end{} section markers: {{{1
  syn match  texSectionMarker	"\\begin\>\|\\end\>" nextgroup=texSectionName
- syn region texSectionName	matchgroup=Delimiter start="{" end="}"  contained nextgroup=texSectionModifier
- syn region texSectionModifier	matchgroup=Delimiter start="\[" end="]" contained
+ syn region texSectionName	matchgroup=Delimiter start="{" end="}"  contained	nextgroup=texSectionModifier	contains=texComment
+ syn region texSectionModifier	matchgroup=Delimiter start="\[" end="]" contained	contains=texComment
  
  " \documentclass, \documentstyle, \usepackage: {{{1
  syn match  texDocType		"\\documentclass\>\|\\documentstyle\>\|\\usepackage\>"	nextgroup=texSectionName,texDocTypeArgs
- syn region texDocTypeArgs	matchgroup=Delimiter start="\[" end="]"			contained	nextgroup=texSectionName
+ syn region texDocTypeArgs	matchgroup=Delimiter start="\[" end="]"			contained	nextgroup=texSectionName	contains=texComment
  
  " Preamble syntax-based folding support: {{{1
  if g:tex_fold_enabled && has("folding")
@@@ -194,10 -194,10 +194,10 @@@ endi
  
  " TeX input: {{{1
  syn match texInput		"\\input\s\+[a-zA-Z/.0-9_^]\+"hs=s+7				contains=texStatement
- syn match texInputFile		"\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}"	contains=texStatement,texInputCurlies
+ syn match texInputFile		"\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}"	contains=texStatement,texInputCurlies,texInputFileOpt
  syn match texInputFile		"\\\(epsfig\|input\|usepackage\)\s*\(\[.*\]\)\={.\{-}}"		contains=texStatement,texInputCurlies,texInputFileOpt
  syn match texInputCurlies	"[{}]"								contained
- syn region texInputFileOpt	matchgroup=Delimiter start="\[" end="\]"			contained
+ syn region texInputFileOpt	matchgroup=Delimiter start="\[" end="\]"			contained	contains=texComment
  
  " Type Styles (LaTeX 2.09): {{{1
  syn match texTypeStyle		"\\rm\>"
@@@ -400,13 -400,13 +400,13 @@@ endi
  " Separate lines used for verb` and verb# so that the end conditions {{{1
  " will appropriately terminate.  Ideally vim would let me save a
  " character from the start pattern and re-use it in the end-pattern.
 -syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"	contains=@Spell
 +syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"
  " listings package:
  syn region texZone		start="\\begin{lstlisting}"		end="\\end{lstlisting}\|%stopzone\>"	contains=@Spell
  " moreverb package:
 -syn region texZone		start="\\begin{verbatimtab}"		end="\\end{verbatimtab}\|%stopzone\>"	contains=@Spell
 -syn region texZone		start="\\begin{verbatimwrite}"		end="\\end{verbatimwrite}\|%stopzone\>"	contains=@Spell
 -syn region texZone		start="\\begin{boxedverbatim}"		end="\\end{boxedverbatim}\|%stopzone\>"	contains=@Spell
 +syn region texZone		start="\\begin{verbatimtab}"		end="\\end{verbatimtab}\|%stopzone\>"
 +syn region texZone		start="\\begin{verbatimwrite}"		end="\\end{verbatimwrite}\|%stopzone\>"
 +syn region texZone		start="\\begin{boxedverbatim}"		end="\\end{boxedverbatim}\|%stopzone\>"
  if version < 600
   syn region texZone		start="\\verb\*\=`"			end="`\|%stopzone\>"
   syn region texZone		start="\\verb\*\=#"			end="#\|%stopzone\>"

-- 
Vim packaging

More information about the pkg-vim-maintainers mailing list