[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-155-g9950138

James Vega jamessan at debian.org
Mon Jul 14 05:35:24 UTC 2008 

The following commit has been merged in the deb/runtime branch:
commit 99501382881773ec5fc0f89173469344c841a5b1
Merge: 56a6d59305596834009497f44cf1a6ccd93bd0f6 d777c34db572c2064ff658e12696b8657445f33a
Author: James Vega <jamessan at debian.org>
Date:   Mon Jul 14 01:21:35 2008 -0400

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

diff --combined runtime/doc/options.txt
index 37a4ee2,22c0419..9326373
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1,4 -1,4 +1,4 @@@
- *options.txt*	For Vim version 7.2a.  Last change: 2008 Jun 24
+ *options.txt*	For Vim version 7.2b.  Last change: 2008 Jul 05
  
  
  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@@ -1280,7 -1280,8 +1280,8 @@@ A jump table for the options with a sho
  			|+file_in_path| feature}
  	This is a list of directories which will be searched when using the
  	|:cd| and |:lcd| commands, provided that the directory being searched
- 	for has a relative path (not starting with "/", "./" or "../").
+ 	for has a relative path, not an absolute part starting with "/", "./"
+ 	or "../", the 'cdpath' option is not used then.
  	The 'cdpath' option's value has the same form and semantics as
  	|'path'|.  Also see |file-searching|.
  	The default value is taken from $CDPATH, with a "," prepended to look
@@@ -4586,7 -4587,7 +4587,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)
@@@ -5011,9 -5012,10 +5012,10 @@@
  			global or local to buffer |global-local|
  			{not in Vi}
  	This is a list of directories which will be searched when using the
- 	|gf|, [f, ]f, ^Wf, |:find| and other commands, provided that the file
- 	being searched for has a relative path (not starting with '/').  The
- 	directories in the 'path' option may be relative or absolute.
+ 	|gf|, [f, ]f, ^Wf, |:find|, |:sfind|, |:tabfind| and other commands,
+ 	provided that the file being searched for has a relative path (not
+ 	starting with "/", "./" or "../").  The directories in the 'path'
+ 	option may be relative or absolute.
  	- Use commas to separate directory names: >
  		:set path=.,/usr/local/include,/usr/include
  <	- Spaces can also be used to separate directory names (for backwards
@@@ -5032,19 -5034,8 +5034,8 @@@
  	- Environment variables are expanded |:set_env|.
  	- When using |netrw.vim| URLs can be used.  For example, adding
  	  "http://www.vim.org" will make ":find index.html" work.
- 	- Search upwards and downwards in a directory tree:
- 	  1) "*" matches a sequence of characters, e.g.: >
- 		:set path=/usr/include/*
- <	     means all subdirectories in /usr/include (but not /usr/include
- 	     itself). >
- 		:set path=/usr/*c
- <	     matches /usr/doc and /usr/src.
- 	  2) "**" matches a subtree, up to 100 directories deep.  Example: >
- 		:set path=/home/user_x/src/**
- <	     means search in the whole subtree under "/home/usr_x/src".
- 	  3) If the path ends with a ';', this path is the startpoint
- 	     for upward search.
- 	  See |file-searching| for more info and exact syntax.
+ 	- Search upwards and downwards in a directory tree using "*", "**" and
+ 	  ";".  See |file-searching| for info and syntax.
  	  {not available when compiled without the |+path_extra| feature}
  	- Careful with '\' characters, type two to get one in the option: >
  		:set path=.,c:\\include
diff --combined runtime/filetype.vim
index 2223893,2ba2bfe..c808fe9
--- 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 Jun 20
+ " Last Change:	2008 Jul 08
  
  " Listen very carefully, I will say this only once
  if exists("did_load_filetypes")
@@@ -17,7 -17,7 +17,7 @@@ augroup filetypedetec
  
  " Ignored extensions
  if exists("*fnameescape")
- au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-{dist,old},?\+.rpmsave,?\+.rpmnew
+ au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.rpmsave,?\+.rpmnew
  	\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
  au BufNewFile,BufRead *~
  	\ let s:name = expand("<afile>") |
@@@ -111,7 -111,7 +111,7 @@@ au BufNewFile,BufRead proftpd.conf*		ca
  
  " 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 httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/apache2/conf.*/*,/etc/apache2/sites-*/*,/etc/apache2/mods-*/* call s:StarSetf('apache')
  
  " XA65 MOS6510 cross assembler
  au BufNewFile,BufRead *.a65			setf a65
@@@ -633,7 -633,7 +633,7 @@@ func! s:FTe(
  endfunc
  
  " ERicsson LANGuage; Yaws is erlang too
- au BufNewFile,BufRead *.erl,*.yaws		setf erlang
+ au BufNewFile,BufRead *.erl,*.hrl,*.yaws	setf erlang
  
  " Elm Filter Rules file
  au BufNewFile,BufRead filter-rules		setf elmfilt
@@@ -739,11 -739,14 +739,14 @@@ au BufNewFile,BufRead *.groovy			setf g
  au BufNewFile,BufRead *.gsp			setf gsp
  
  " Group file
- au BufNewFile,BufRead /etc/group{-,.edit,},/etc/gshadow{-,.edit,},/var/backups/{group,gshadow}.bak setf group
+ au BufNewFile,BufRead /etc/group,/etc/group-,/etc/group.edit,/etc/gshadow,/etc/gshadow-,/etc/gshadow.edit,/var/backups/group.bak,/var/backups/gshadow.bak		setf group
  
  " GTK RC
  au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
  
+ " Haml
+ au BufNewFile,BufRead *.haml			setf haml
+ 
  " Hamster Classic | Playground files
  au BufNewFile,BufRead *.hsc,*.hsm		setf hamster
  
@@@ -754,6 -757,7 +757,7 @@@ au BufNewFile,BufRead *.chs			setf chas
  
  " Haste
  au BufNewFile,BufRead *.ht			setf haste
+ au BufNewFile,BufRead *.htpp			setf hastepreproc
  
  " Hercules
  au BufNewFile,BufRead *.vc,*.ev,*.rs,*.sum,*.errsum	setf hercules
@@@ -1229,7 -1233,7 +1233,7 @@@ au BufNewFile,BufRead /etc/pam.conf		se
  au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
  
  " Password file
- au BufNewFile,BufRead /etc/passwd{-,.edit,},/etc/shadow{-,.edit,},/var/backups/{passwd,shadow}.bak setf passwd
+ au BufNewFile,BufRead /etc/passwd,/etc/passwd-,/etc/passwd.edit,/etc/shadow,/etc/shadow-,/var/backups/passwd.bak,/var/backups/shadow.bak setf passwd
  
  " Pascal (also *.p)
  au BufNewFile,BufRead *.pas			setf pascal
@@@ -1459,9 -1463,6 +1463,9 @@@ au BufNewFile,BufRead *.pyx,*.pxd		set
  " Python
  au BufNewFile,BufRead *.py,*.pyw		setf python
  
 +" Quixote (Python-based web framework)
 +au BufNewFile,BufRead *.ptl			setf python
 +
  " Radiance
  au BufNewFile,BufRead *.rad,*.mat		setf radiance
  
@@@ -1578,6 -1579,9 +1582,9 @@@ au BufNewFile,BufRead smb.conf			setf s
  " SAS script
  au BufNewFile,BufRead *.sas			setf sas
  
+ " Sass
+ au BufNewFile,BufRead *.sass			setf sass
+ 
  " Sather
  au BufNewFile,BufRead *.sa			setf sather
  
@@@ -1959,7 -1963,7 +1966,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)
@@@ -2263,6 -2267,9 +2270,9 @@@ au StdinReadPost * if !did_filetype() 
  " Most of these should call s:StarSetf() to avoid names ending in .gz and the
  " like are used.
  
+ " More Apache files.
+ au BufNewFile,BufRead /etc/apache2/conf.*/*,/etc/apache2/sites-*/*,/etc/apache2/mods-*/*		call s:StarSetf('apache')
+ 
  " Asterisk config file
  au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
  au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
@@@ -2282,7 -2289,7 +2292,7 @@@ au BufNewFile,BufRead [cC]hange[lL]og
  	\|endif
  
  " Crontab
- au BufNewFile,BufRead crontab,crontab.*,/etc/cron.d/*	call s:StarSetf('crontab')
+ au BufNewFile,BufRead crontab,crontab.*,/etc/cron.d/*		call s:StarSetf('crontab')
  
  " Debian Sources.list
  au BufNewFile,BufRead /etc/apt/sources.list.d/*	call s:StarSetf('debsources')
diff --combined runtime/scripts.vim
index a876e11,201c375..936925e
--- 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 Apr 28
+ " Last change:	2008 Jun 30
  
  " 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
@@@ -168,7 -168,7 +168,7 @@@ els
      set ft=zsh
  
    " ELM Mail files
-   elseif s:line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .*[12][09]\d\d$'
+   elseif s:line1 =~ '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
      set ft=mail
  
      " Mason
@@@ -275,7 -275,7 +275,7 @@@
      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
  
      " VSE JCL
@@@ -313,14 -313,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 8b8e52f,602e3ea..e61a160
--- a/src/po/de.po
+++ b/src/po/de.po
@@@ -566,13 -566,13 +566,13 @@@ msgstr "(Ungültig)
  msgid "E677: Error writing temp file"
  msgstr "E677: Fehler beim Schreiben einer temporären Datei"
  
- msgid "E703: Using a Funcref as a number"
+ msgid "E703: Using a Funcref as a Number"
  msgstr "E703: Funktionsreferenz als Zahl verwendet"
  
- msgid "E745: Using a List as a number"
+ msgid "E745: Using a List as a Number"
  msgstr "E745: Liste als Zahl verwendet"
  
- msgid "E728: Using a Dictionary as a number"
+ msgid "E728: Using a Dictionary as a Number"
  msgstr "E728: Wörterbuch als Zahl verwendet"
  
  msgid "E729: using Funcref as a String"
@@@ -1509,7 -1509,7 +1509,7 @@@ msgstr "E203: Autokommandos haben den z
  msgid "E204: Autocommand changed number of lines in unexpected way"
  msgstr "E204: Autokommandos haben die Anzahl der Zeilen in unerwarteter Weise verändert"
  
- msgid "NetBeans dissallows writes of unmodified buffers"
+ msgid "NetBeans disallows writes of unmodified buffers"
  msgstr "NetBeans verweigert das Schreiben von unveränderten Puffern"
  
  msgid "Partial writes disallowed for NetBeans buffers"
@@@ -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\""
@@@ -5290,14 -5290,14 +5290,14 @@@ msgstr "E440: Wiederherstellungszeile f
  #. Only MS VC 4.1 and earlier can do Win32s
  msgid ""
  "\n"
- "MS-Windows 16/32 bit GUI version"
+ "MS-Windows 16/32-bit GUI version"
  msgstr ""
  "\n"
  "MS-Windows 16/32 Bit GUI Version"
  
  msgid ""
  "\n"
- "MS-Windows 32 bit GUI version"
+ "MS-Windows 32-bit GUI version"
  msgstr ""
  "\n"
  "MS-Windows 32 Bit GUI Version"
@@@ -5310,28 -5310,28 +5310,28 @@@ msgstr " mit OLE-Unterstützung
  
  msgid ""
  "\n"
- "MS-Windows 32 bit console version"
+ "MS-Windows 32-bit console version"
  msgstr ""
  "\n"
  "MS-Windows 32 Bit Konsolen-Version"
  
  msgid ""
  "\n"
- "MS-Windows 16 bit version"
+ "MS-Windows 16-bit version"
  msgstr ""
  "\n"
  "MS-Windows 16 Bit Version"
  
  msgid ""
  "\n"
- "32 bit MS-DOS version"
+ "32-bit MS-DOS version"
  msgstr ""
  "\n"
  "32 Bit MS-DOS Version"
  
  msgid ""
  "\n"
- "16 bit MS-DOS version"
+ "16-bit MS-DOS version"
  msgstr ""
  "\n"
  "16 Bit MS-DOS Version"

-- 
Vim packaging

More information about the pkg-vim-maintainers mailing list