[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2b.001-132-g9b03294

James Vega jamessan at debian.org
Wed Aug 6 22:34:42 UTC 2008


The following commit has been merged in the deb/runtime branch:
commit 9b03294677c722b87dfc55704ff699a1fe7b49db
Merge: ea866d1d2d61e2ddfe0bf1d62cff1871287d93bd d3775ea640d5e31c72af0e2a5635b3a784ee5798
Author: James Vega <jamessan at debian.org>
Date:   Wed Aug 6 18:32:36 2008 -0400

    Merge branch 'upstream-runtime' into deb/runtime
    
    Conflicts:
    
    	runtime/scripts.vim
    	runtime/syntax/zsh.vim
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --combined runtime/doc/options.txt
index 9326373,1302f16..fcc9622
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1,4 -1,4 +1,4 @@@
- *options.txt*	For Vim version 7.2b.  Last change: 2008 Jul 05
+ *options.txt*	For Vim version 7.2c.  Last change: 2008 Aug 06
  
  
  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@@ -2292,6 -2292,8 +2292,8 @@@ A jump table for the options with a sho
  	  or "\\", the swap file name will be built from the complete path to
  	  the file with all path separators substituted to percent '%' signs.
  	  This will ensure file name uniqueness in the preserve directory.
+ 	  On Win32, when a separating comma is following, you must use "//",
+ 	  since "\\" will include the comma in the file name.
  	- Spaces after the comma are ignored, other spaces are considered part
  	  of the directory name.  To have a space at the start of a directory
  	  name, precede it with a backslash.
@@@ -4587,7 -4589,7 +4589,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)
@@@ -4898,7 -4900,7 +4900,7 @@@
  	name, datestamp and permissions.  This option contains the extra
  	information, the nature of which will vary between systems.
  	The value of this option is usually set when the file is loaded, and
- 	use to set the file type when file is written.
+ 	is used to set the operating system file type when file is written.
  	It can affect the pattern matching of the automatic commands.
  	|autocmd-osfiletypes|
  
@@@ -6306,15 -6308,15 +6308,15 @@@
  	      directory.
  	F S   Full path to the file in the buffer.
  	t S   File name (tail) of file in the buffer.
- 	m F   Modified flag, text is " [+]"; " [-]" if 'modifiable' is off.
+ 	m F   Modified flag, text is "[+]"; "[-]" if 'modifiable' is off.
  	M F   Modified flag, text is ",+" or ",-".
- 	r F   Readonly flag, text is " [RO]".
+ 	r F   Readonly flag, text is "[RO]".
  	R F   Readonly flag, text is ",RO".
- 	h F   Help buffer flag, text is " [help]".
+ 	h F   Help buffer flag, text is "[help]".
  	H F   Help buffer flag, text is ",HLP".
- 	w F   Preview window flag, text is " [Preview]".
+ 	w F   Preview window flag, text is "[Preview]".
  	W F   Preview window flag, text is ",PRV".
- 	y F   Type of file in the buffer, e.g., " [vim]".  See 'filetype'.
+ 	y F   Type of file in the buffer, e.g., "[vim]".  See 'filetype'.
  	Y F   Type of file in the buffer, e.g., ",VIM".  See 'filetype'.
  	      {not available when compiled without |+autocmd| feature}
  	k S   Value of "b:keymap_name" or 'keymap' when |:lmap| mappings are
@@@ -6361,14 -6363,9 +6363,9 @@@
  	      to StatusLineNC for the statusline of non-current windows.
  	      The number N must be between 1 and 9.  See |hl-User1..9|
  
- 	Display of flags are controlled by the following heuristic:
- 	If a flag text starts with comma it is assumed that it wants to
- 	separate itself from anything but preceding plaintext.  If it starts
- 	with a space it is assumed that it wants to separate itself from
- 	anything but other flags.  That is: A leading comma is removed if the
- 	preceding character stems from plaintext.  A leading space is removed
- 	if the preceding character stems from another active flag.  This will
- 	make a nice display when flags are used like in the examples below.
+ 	When displaying a flag, Vim removes the leading comma, if any, when
+ 	that flag comes right after plaintext.  This will make a nice display
+ 	when flags are used like in the examples below.
  
  	When all items in a group becomes an empty string (i.e. flags that are
  	not set) and a minwid is not set for the group, the whole group will
diff --combined runtime/filetype.vim
index 9fb5722,a8e6261..4d9413f
--- 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 Jul 17
+ " Last Change:	2008 Aug 03
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -25,7 -25,7 +25,7 @@@ au BufNewFile,BufRead *
  	\ if s:name != s:short && s:short != "" |
  	\   exe "doau filetypedetect BufRead " . fnameescape(s:short) |
  	\ endif |
- 	\ unlet s:name s:short
+ 	\ unlet! s:name s:short
  au BufNewFile,BufRead ?\+.in
  	\ if expand("<afile>:t") != "configure.in" |
  	\   exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r")) |
@@@ -181,7 -181,7 +181,7 @@@ func! s:FTasm(
      endif
    endif
  
-   exe "setf " . b:asmsyntax
+   exe "setf " . fnameescape(b:asmsyntax)
  endfunc
  
  func! s:FTasmsyntax()
@@@ -189,8 -189,9 +189,9 @@@
    " b:asmsyntax appropriately
    let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
  	\" ".getline(5)." "
-   if head =~ '\sasmsyntax=\S\+\s'
-     let b:asmsyntax = substitute(head, '.*\sasmsyntax=\([a-zA-Z0-9]\+\)\s.*','\1', "")
+   let match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
+   if match != ''
+     let b:asmsyntax = match
    elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
      let b:asmsyntax = "vmasm"
    endif
@@@ -690,6 -691,9 +691,9 @@@ if has("fname_case"
  endif
  au BufNewFile,BufRead   *.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95  setf fortran
  
+ " Framescript
+ au BufNewFile,BufRead *.fsl			setf framescript
+ 
  " FStab
  au BufNewFile,BufRead fstab,mtab		setf fstab
  
@@@ -1347,7 -1351,7 +1351,7 @@@ func! s:FTinc(
      else
        call s:FTasmsyntax()
        if exists("b:asmsyntax")
- 	exe "setf " . b:asmsyntax
+ 	exe "setf " . fnameescape(b:asmsyntax)
        else
  	setf pov
        endif
@@@ -1751,6 -1755,7 +1755,7 @@@ endfun
  " Z-Shell script
  au BufNewFile,BufRead .zprofile,/etc/zprofile,.zfbfmarks  setf zsh
  au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
+ au BufNewFile,BufRead *.zsh 			setf zsh
  
  " Scheme
  au BufNewFile,BufRead *.scm,*.ss		setf scheme
@@@ -1975,7 -1980,7 +1980,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/ftplugin/perl.vim
index bf77bcb,3771005..1f7fcc0
--- a/runtime/ftplugin/perl.vim
+++ b/runtime/ftplugin/perl.vim
@@@ -1,7 -1,7 +1,7 @@@
  " Vim filetype plugin file
  " Language:	Perl
  " Maintainer:	Dan Sharp <dwsharp at hotmail dot com>
- " Last Change:  2007 Nov 30
+ " Last Change:  17 Jul 2008
  " URL:		http://mywebpage.netscape.com/sharppeople/vim/ftplugin
  
  if exists("b:did_ftplugin") | finish | endif
@@@ -13,6 -13,7 +13,7 @@@ let s:save_cpo = &cp
  set cpo-=C
  
  setlocal formatoptions+=crq
+ setlocal keywordprg=perldoc\ -f
  
  setlocal comments=:#
  setlocal commentstring=#%s
@@@ -39,9 -40,6 +40,9 @@@ setlocal define=[^A-Za-z_
  set isfname+=:
  "setlocal iskeyword=48-57,_,A-Z,a-z,:
  
 +" Debian patch: use perldoc for keyword lookup
 +setlocal keywordprg=perldoc\ -f
 +
  " Set this once, globally.
  if !exists("perlpath")
      if executable("perl")
@@@ -66,7 -64,7 +67,7 @@@ let &l:path=perlpat
  "---------------------------------------------
  
  " Undo the stuff we changed.
- let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf<" .
+ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp<" .
  	    \	      " | unlet! b:browsefilter"
  
  " Restore the saved compatibility options.
diff --combined runtime/scripts.vim
index 936925e,a586920..dc95633
--- 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 Jun 30
+ " Last change:	2008 Jul 17
  
  " 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
@@@ -275,6 -275,7 +275,6 @@@ els
      set ft=virata
  
      " Strace
 -  elseif s:line1 =~ '^[0-9]* *execve('
    elseif s:line1 =~ '^\(\[pid \d\+\] \)\=[0-9:.]* *execve(' || s:line1 =~ '^__libc_start_main'
      set ft=strace
  
@@@ -313,14 -314,6 +313,14 @@@
    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\+$'
      set ft=git
diff --combined src/po/de.po
index e61a160,1b3a0d7..0b10504
--- a/src/po/de.po
+++ b/src/po/de.po
@@@ -1700,7 -1700,7 +1700,7 @@@ msgid "
  "&Load File"
  msgstr ""
  "&OK\n"
 -"&Lese Datei"
 +"&Lies Datei"
  
  #, c-format
  msgid "E462: Could not prepare for reloading \"%s\""
@@@ -4722,7 -4722,7 +4722,7 @@@ msgstr "Zu viele zurück gestellte Präfi
  msgid "Too many compound flags"
  msgstr "Zu viele zusammengesetzte Flags"
  
- msgid "Too many posponed prefixes and/or compound flags"
+ msgid "Too many postponed prefixes and/or compound flags"
  msgstr "Zu viele zurück gestellte Präfixe und/oder zusammengesetzte Flags"
  
  #, c-format

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list