[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.1.285-124-g9e083de
James Vega
jamessan at debian.org
Thu Jun 26 19:13:15 UTC 2008
The following commit has been merged in the deb/runtime branch:
commit be5cbc8f74d0800949058aea9375ebd2da875390
Merge: b033ed762ae7a2cd22fc39214dc299a62c176c18 a3b6aa54a54bc00ca89f9db7931b01fea149e742
Author: James Vega <jamessan at debian.org>
Date: Tue Jun 24 19:06:07 2008 -0400
Merge branch 'upstream-runtime' into deb/runtime
Conflicts:
runtime/filetype.vim
Signed-off-by: James Vega <jamessan at debian.org>
diff --combined runtime/doc/options.txt
index e92b79a,568dab6..37a4ee2
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1,4 -1,4 +1,4 @@@
- *options.txt* For Vim version 7.1. Last change: 2008 Feb 24
+ *options.txt* For Vim version 7.2a. Last change: 2008 Jun 24
VIM REFERENCE MANUAL by Bram Moolenaar
@@@ -111,19 -111,31 +111,31 @@@ and the following arguments will be ign
When 'verbose' is non-zero, displaying an option value will also tell where it
was last set. Example: >
:verbose set shiftwidth cindent?
- shiftwidth=4
- Last set from modeline
- cindent
- Last set from /usr/local/share/vim/vim60/ftplugin/c.vim
- This is only done when specific option values are requested, not for ":set
- all" or ":set" without an argument.
- When the option was set by hand there is no "Last set" message. There is only
- one value for all local options with the same name. Thus the message applies
- to the option name, not necessarily its value.
+ < shiftwidth=4 ~
+ Last set from modeline ~
+ cindent ~
+ Last set from /usr/local/share/vim/vim60/ftplugin/c.vim ~
+ This is only done when specific option values are requested, not for ":verbose
+ set all" or ":verbose set" without an argument.
+ When the option was set by hand there is no "Last set" message.
When the option was set while executing a function, user command or
autocommand, the script in which it was defined is reported.
Note that an option may also have been set as a side effect of setting
'compatible'.
+ A few special texts:
+ Last set from modeline ~
+ Option was set in a |modeline|.
+ Last set from --cmd argument ~
+ Option was set with command line argument |--cmd| or +.
+ Last set from -c argument ~
+ Option was set with command line argument |-c|, +, |-S| or
+ |-q|.
+ Last set from environment variable ~
+ Option was set from an environment variable, $VIMINIT,
+ $GVIMINIT or $EXINIT.
+ Last set from error handler ~
+ Option was cleared when evaluating it resulted in an error.
+
{not available when compiled without the +eval feature}
*:set-termcap* *E522*
@@@ -265,7 -277,10 +277,10 @@@ You will not get back the 'list' value
Without argument: Display all local option's local
values which are different from the default.
When displaying a specific local option, show the
- local value. For a global option the global value is
+ local value. For a global/local boolean option, when
+ the global value is being used, "--" is displayed
+ before the option name.
+ For a global option the global value is
shown (but that might change in the future).
{not in Vi}
@@@ -797,7 -812,7 +812,7 @@@ 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.
+ change. *g:colors_name*
When a color scheme is loaded (the "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.
@@@ -1148,9 -1163,11 +1163,11 @@@
*'browsedir'* *'bsdir'*
'browsedir' 'bsdir' string (default: "last")
global
- {not in Vi} {only for Motif and Win32 GUI}
+ {not in Vi} {only for Motif, Athena, GTK, Mac and
+ Win32 GUI}
Which directory to use for the file browser:
- last Use same directory as with last file browser.
+ last Use same directory as with last file browser, where a
+ file was opened or saved.
buffer Use the directory of the related buffer.
current Use the current directory.
{path} Use the specified directory
@@@ -1343,7 -1360,7 +1360,7 @@@
{not in Vi}
{not available when compiled without the |+cindent|
feature}
- Enables automatic C program indenting See 'cinkeys' to set the keys
+ Enables automatic C program indenting. See 'cinkeys' to set the keys
that trigger reindenting in insert mode and 'cinoptions' to set your
preferred indent style.
If 'indentexpr' is not empty, it overrules 'cindent'.
@@@ -1711,7 -1728,8 +1728,8 @@@
tabs followed by spaces as required (unless |'expandtab'| is enabled,
in which case only spaces are used). Enabling this option makes the
new line copy whatever characters were used for indenting on the
- existing line. If the new indent is greater than on the existing
+ existing line. 'expandtab' has no effect on these characters, a Tab
+ remains a Tab. If the new indent is greater than on the existing
line, the remaining space is filled in the normal manner.
NOTE: 'copyindent' is reset when 'compatible' is set.
Also see 'preserveindent'.
@@@ -2423,8 -2441,8 +2441,8 @@@
global or local to buffer |global-local|
{not in Vi}
External program to use for "=" command. When this option is empty
- the internal formatting functions are used ('lisp', 'cindent' or
- 'indentexpr').
+ the internal formatting functions are used; either 'lisp', 'cindent'
+ or 'indentexpr'.
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
@@@ -3362,7 -3380,7 +3380,7 @@@
'guitablabel' can be used to change the text in the labels.
When 'e' is missing a non-GUI tab pages line may be used.
The GUI tabs are only supported on some systems, currently
- GTK, Motif and MS-Windows.
+ GTK, Motif, Mac OS/X and MS-Windows.
*'go-f'*
'f' Foreground: Don't use fork() to detach the GUI from the shell
where it was started. Use this for programs that wait for the
@@@ -3618,7 -3636,7 +3636,7 @@@
When you get bored looking at the highlighted matches, you can turn it
off with |:nohlsearch|. As soon as you use a search command, the
highlighting comes back.
- 'redrawtime' specifies the maximum time spend on finding matches.
+ 'redrawtime' specifies the maximum time spent on finding matches.
When the search pattern can match an end-of-line, Vim will try to
highlight all of the matched text. However, this depends on where the
search starts. This will be the first line in the window or the first
@@@ -3917,12 -3935,13 +3935,13 @@@
local to buffer
{not in Vi}
When doing keyword completion in insert mode |ins-completion|, and
- 'ignorecase' is also on, the case of the match is adjusted. If the
- typed text contains a lowercase letter where the match has an upper
- case letter, the completed part is made lowercase. If the typed text
- has no lowercase letters and the match has a lowercase letter where
- the typed text has an uppercase letter, and there is a letter before
- it, the completed part is made uppercase.
+ 'ignorecase' is also on, the case of the match is adjusted depending
+ on the typed text. If the typed text contains a lowercase letter
+ where the match has an upper case letter, the completed part is made
+ lowercase. If the typed text has no lowercase letters and the match
+ has a lowercase letter where the typed text has an uppercase letter,
+ and there is a letter before it, the completed part is made uppercase.
+ With 'noinfercase' the match is used as-is.
*'insertmode'* *'im'* *'noinsertmode'* *'noim'*
'insertmode' 'im' boolean (default off)
@@@ -3967,6 -3986,10 +3986,10 @@@
Multi-byte characters 256 and above are always included, only the
characters up to 255 are specified with this option.
For UTF-8 the characters 0xa0 to 0xff are included as well.
+ Think twice before adding white space to this option. Although a
+ space may appear inside a file name, the effect will be that Vim
+ doesn't know where a file name starts or ends when doing completion.
+ It most likely works better without a space in 'isfname'.
Note that on systems using a backslash as path separator, Vim tries to
do its best to make it work as you would expect. That is a bit
@@@ -3993,7 -4016,7 +4016,7 @@@
are included. Normally these are the characters a to z and A to Z,
plus accented characters. To include '@' itself use "@-@". Examples:
"@,^a-z" All alphabetic characters, excluding lower
- case letters.
+ case ASCII letters.
"a-z,A-Z, at -@" All letters plus the '@' character.
A comma can be included by using it where a character number is
expected. Example:
@@@ -4563,7 -4586,7 +4586,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)
@@@ -4617,8 -4640,9 +4640,9 @@@
global
{not in Vi}
Enable the use of the mouse. Only works for certain terminals
- (xterm, MS-DOS, Win32 |win32-mouse|, QNX pterm, and Linux console
- with gpm). For using the mouse in the GUI, see |gui-mouse|.
+ (xterm, MS-DOS, Win32 |win32-mouse|, QNX pterm, *BSD console with
+ sysmouse and Linux console with gpm). For using the mouse in the
+ GUI, see |gui-mouse|.
The mouse can be enabled for different modes:
n Normal mode
v Visual mode
@@@ -4948,6 -4972,7 +4972,7 @@@
Note that typing <F10> in paste mode inserts "<F10>", since in paste
mode everything is inserted literally, except the 'pastetoggle' key
sequence.
+ When the value has several bytes 'ttimeoutlen' applies.
*'pex'* *'patchexpr'*
'patchexpr' 'pex' string (default "")
@@@ -5054,6 -5079,8 +5079,8 @@@
enabled, in which case only spaces are used). Enabling this option
means the indent will preserve as many existing characters as possible
for indenting, and only add additional tabs or spaces as required.
+ 'expandtab' does not apply to the preserved white space, a Tab remains
+ a Tab.
NOTE: When using ">>" multiple times the resulting indent is a mix of
tabs and spaces. You might not like this.
NOTE: 'preserveindent' is reset when 'compatible' is set.
@@@ -5894,6 -5921,9 +5921,9 @@@
pattern (if there is one) as possible matches. Thus, if you have
matched a C function, you can see a template for what arguments are
required (coding style permitting).
+ Note that this doesn't work well together with having "longest" in
+ 'completeopt', because the completion from the search pattern may not
+ match the typed text.
*'showmatch'* *'sm'* *'noshowmatch'* *'nosm'*
'showmatch' 'sm' boolean (default off)
@@@ -6478,6 -6508,8 +6508,8 @@@
split If included, split the current window before loading
a buffer. Otherwise: do not split, use current window.
Supported in |quickfix| commands that display errors.
+ newtab Like "split", but open a new tab page. Overrules
+ "split" when both are present.
*'synmaxcol'* *'smc'*
'synmaxcol' 'smc' number (default 3000)
@@@ -6602,7 -6634,7 +6634,7 @@@
Linear searching is done anyway, for one file, when Vim finds a line
at the start of the file indicating that it's not sorted: >
- !_TAG_FILE_SORTED 0 /some command/
+ !_TAG_FILE_SORTED 0 /some comment/
< [The whitespace before and after the '0' must be a single <Tab>]
When a binary search was done and no match was found in any of the
@@@ -7089,7 -7121,7 +7121,7 @@@
"xterm", when the terminal name doesn't start with "xterm", but it can
handle xterm mouse codes.
The "xterm2" value will be set if the xterm version is reported to be
- 95 of higher. This only works when compiled with the |+termresponse|
+ 95 or higher. This only works when compiled with the |+termresponse|
feature and if |t_RV| is set to the escape sequence to request the
xterm version number. Otherwise "xterm2" must be set explicitly.
If you do not want 'ttymouse' to be set to "xterm2" automatically, set
@@@ -7424,6 -7456,7 +7456,7 @@@
{not in Vi}
Character you have to type to start wildcard expansion in the
command-line, as specified with 'wildmode'.
+ More info here: |cmdline-completion|.
The character is not recognized when used inside a macro. See
'wildcharm' for that.
Although 'wc' is a number option, you can set it to a special key: >
@@@ -7441,7 -7474,7 +7474,7 @@@
you'll never actually type 'wildcharm', just use it in mappings that
automatically invoke completion mode, e.g.: >
:set wcm=<C-Z>
- :cmap ss so $vim/sessions/*.vim<C-Z>
+ :cnoremap ss so $vim/sessions/*.vim<C-Z>
< Then after typing :ss you can use CTRL-P & CTRL-N.
*'wildignore'* *'wig'*
@@@ -7536,6 -7569,7 +7569,7 @@@
< List all matches without completing, then each full match >
:set wildmode=longest,list
< Complete longest common string, then list alternatives.
+ More info here: |cmdline-completion|.
*'wildoptions'* *'wop'*
'wildoptions' 'wop' string (default "")
@@@ -7596,13 -7630,17 +7630,17 @@@
feature}
Minimal number of lines for the current window. This is not a hard
minimum, Vim will use fewer lines if there is not enough room. If the
- current window is smaller, its size is increased, at the cost of the
- height of other windows. Set it to 999 to make the current window
- always fill the screen (although this has the drawback that ":all"
- will create only two windows). Set it to a small number for normal
- editing.
- Minimum value is 1.
- The height is not adjusted after one of the commands to change the
+ focus goes to a window that is smaller, its size is increased, at the
+ cost of the height of other windows.
+ Set 'winheight' to a small number for normal editing.
+ Set it to 999 to make the current window fill most of the screen.
+ Other windows will be only 'winminheight' high. This has the drawback
+ that ":all" will create only two windows. To avoid "vim -o 1 2 3 4"
+ to create only two windows, set the option after startup is done,
+ using the |VimEnter| event: >
+ au VimEnter * set winheight=999
+ < Minimum value is 1.
+ The height is not adjusted after one of the commands that change the
height of the current window.
'winheight' applies to the current window. Use 'winminheight' to set
the minimal height for other windows.
diff --combined runtime/filetype.vim
index 0022c85,89af04c..9717688
--- 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: 2007 May 15
+ " Last Change: 2008 Jun 20
" 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,?\+.rpmsave,?\+.rpmnew
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-{dist,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
@@@ -320,6 -320,9 +320,9 @@@ au BufNewFile,BufRead *.cs setf c
" Cdrdao TOC
au BufNewFile,BufRead *.toc setf cdrtoc
+ " Cdrdao config
+ au BufNewFile,BufRead etc/cdrdao.conf,etc/defaults/cdrdao,etc/default/cdrdao,~/.cdrdao setf cdrdaoconf
+
" Cfengine
au BufNewFile,BufRead cfengine.conf setf cfengine
@@@ -349,12 -352,22 +352,22 @@@ els
au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl setf cpp
endif
- " .h files can be C, Ch or C++, set c_syntax_for_h if you want C,
- " ch_syntax_for_h if you want Ch.
- au BufNewFile,BufRead *.h
- \ if exists("c_syntax_for_h") | setf c |
- \ elseif exists("ch_syntax_for_h") | setf ch |
- \ else | setf cpp | endif
+ " .h files can be C, Ch C++, ObjC or ObjC++.
+ " Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
+ " detected automatically.
+ au BufNewFile,BufRead *.h call s:FTheader()
+
+ func! s:FTheader()
+ if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
+ setf objc
+ elseif exists("c_syntax_for_h")
+ setf c
+ elseif exists("ch_syntax_for_h")
+ setf ch
+ else
+ setf cpp
+ endif
+ endfunc
" Ch (CHscript)
au BufNewFile,BufRead *.chf setf ch
@@@ -476,12 -489,18 +489,18 @@@ au BufNewFile,BufRead *.cp
\ setf cobol |
\ endif
+ " Coco/R
+ au BufNewFile,BufRead *.atg setf coco
+
" Cold Fusion
au BufNewFile,BufRead *.cfm,*.cfi,*.cfc setf cf
" Configure scripts
au BufNewFile,BufRead configure.in,configure.ac setf config
+ " CUDA Cumpute Unified Device Architecture
+ au BufNewFile,BufRead *.cu setf cuda
+
" WildPackets EtherPeek Decoder
au BufNewFile,BufRead *.dcd setf dcd
@@@ -513,20 -532,31 +532,36 @@@ au BufNewFile,BufRead *.si setf cupls
" Debian Control
au BufNewFile,BufRead */debian/control setf debcontrol
+ au BufNewFile,BufRead control
+ \ if getline(1) =~ '^Source:'
+ \| setf debcontrol
+ \| endif
+au BufNewFile,BufRead control
+ \ if getline(1) =~ '^Source:'
+ \| setf debcontrol
+ \| endif
+
" Debian Sources.list
au BufNewFile,BufRead /etc/apt/sources.list setf debsources
+ " Deny hosts
+ au BufNewFile,BufRead denyhosts.conf setf denyhosts
+
" ROCKLinux package description
au BufNewFile,BufRead *.desc setf desc
- " the D language
- au BufNewFile,BufRead *.d setf d
+ " the D language or dtrace
+ au BufNewFile,BufRead *.d call s:DtraceCheck()
+
+ func! s:DtraceCheck()
+ let lines = getline(1, min([line("$"), 100]))
+ if match(lines, '^#!\S\+dtrace\|#pragma\s\+D\s\+option\|:\S\{-}:\S\{-}:') > -1
+ setf dtrace
+ else
+ setf d
+ endif
+ endfunc
" Desktop files
au BufNewFile,BufRead *.desktop,.directory setf desktop
@@@ -602,8 -632,8 +637,8 @@@ func! s:FTe(
setf eiffel
endfunc
- " ERicsson LANGuage
- au BufNewFile,BufRead *.erl setf erlang
+ " ERicsson LANGuage; Yaws is erlang too
+ au BufNewFile,BufRead *.erl,*.yaws setf erlang
" Elm Filter Rules file
au BufNewFile,BufRead filter-rules setf elmfilt
@@@ -648,11 -678,14 +683,14 @@@ au BufNewFile,BufRead *.mas,*.master s
" Forth
au BufNewFile,BufRead *.fs,*.ft setf forth
+ " Reva Forth
+ au BufNewFile,BufRead *.frt setf reva
+
" Fortran
if has("fname_case")
au BufNewFile,BufRead *.F,*.FOR,*.FPP,*.FTN,*.F77,*.F90,*.F95 setf fortran
endif
- au BufNewFile,BufRead *.f,*.for,*.fpp,*.ftn,*.f77,*.f90,*.f95 setf fortran
+ au BufNewFile,BufRead *.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95 setf fortran
" FStab
au BufNewFile,BufRead fstab,mtab setf fstab
@@@ -706,7 -739,7 +744,7 @@@ au BufNewFile,BufRead *.groovy setf g
au BufNewFile,BufRead *.gsp setf gsp
" Group file
-au BufNewFile,BufRead /etc/group setf group
+au BufNewFile,BufRead /etc/group{-,.edit,},/etc/gshadow{-,.edit,},/var/backups/{group,gshadow}.bak setf group
" GTK RC
au BufNewFile,BufRead .gtkrc,gtkrc setf gtkrc
@@@ -719,6 -752,9 +757,9 @@@ au BufNewFile,BufRead *.hs setf haske
au BufNewFile,BufRead *.lhs setf lhaskell
au BufNewFile,BufRead *.chs setf chaskell
+ " Haste
+ au BufNewFile,BufRead *.ht setf haste
+
" Hercules
au BufNewFile,BufRead *.vc,*.ev,*.rs,*.sum,*.errsum setf hercules
@@@ -757,6 -793,9 +798,9 @@@ au BufNewFile,BufRead *.html.m4 setf
" HTML Cheetah template
au BufNewFile,BufRead *.tmpl setf htmlcheetah
+ " Host config
+ au BufNewFile,BufRead /etc/host.conf setf hostconf
+
" Hyper Builder
au BufNewFile,BufRead *.hb setf hb
@@@ -940,6 -979,9 +984,9 @@@ au BufNewFile,BufRead *.lou,*.lout set
" Lua
au BufNewFile,BufRead *.lua setf lua
+ " Linden Scripting Language (Second Life)
+ au BufNewFile,BufRead *.lsl setf lsl
+
" Lynx style file (or LotusScript!)
au BufNewFile,BufRead *.lss setf lss
@@@ -951,7 -993,7 +998,7 @@@ au BufNewFile,BufRead *.m
au BufNewFile,BufRead *.mgp setf mgp
" Mail (for Elm, trn, mutt, muttng, rn, slrn)
- au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]._-]\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
+ au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
" Mail aliases
au BufNewFile,BufRead /etc/mail/aliases,/etc/aliases setf mailaliases
@@@ -974,9 -1016,6 +1021,9 @@@ au BufNewFile,BufRead /etc/man.conf,man
" Maple V
au BufNewFile,BufRead *.mv,*.mpl,*.mws setf maple
+" Map (UMN mapserver config file)
+au BufNewFile,BufRead *.map setf map
+
" Mason
au BufNewFile,BufRead *.mason,*.mhtml setf mason
@@@ -1008,6 -1047,9 +1055,9 @@@ func! s:FTm(
endif
endfunc
+ " Mathematica notebook
+ au BufNewFile,BufRead *.nb setf mma
+
" Maya Extension Language
au BufNewFile,BufRead *.mel setf mel
@@@ -1026,6 -1068,9 +1076,9 @@@ au BufNewFile,BufRead *.mgl setf mg
" MMIX or VMS makefile
au BufNewFile,BufRead *.mms call s:FTmms()
+ " Symbian meta-makefile definition (MMP)
+ au BufNewFile,BufRead *.mmp setf mmp
+
func! s:FTmms()
let n = 1
while n < 10
@@@ -1096,8 -1141,7 +1149,7 @@@ au BufRead,BufNewFile *.mu setf mupa
au BufNewFile,BufRead *.mush setf mush
" Mutt setup file (also for Muttng)
- au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
- au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
+ au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
" Nano
au BufNewFile,BufRead /etc/nanorc,.nanorc setf nanorc
@@@ -1182,7 -1226,7 +1234,7 @@@ au BufNewFile,BufRead /etc/pam.conf se
au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
" Password file
-au BufNewFile,BufRead /etc/passwd,/etc/shadow,/etc/shadow- setf passwd
+au BufNewFile,BufRead /etc/passwd{-,.edit,},/etc/shadow{-,.edit,},/var/backups/{passwd,shadow}.bak setf passwd
" Pascal (also *.p)
au BufNewFile,BufRead *.pas setf pascal
@@@ -1190,6 -1234,9 +1242,9 @@@
" Delphi project file
au BufNewFile,BufRead *.dpr setf pascal
+ " PDF
+ au BufNewFile,BufRead *.pdf setf pdf
+
" Perl
if has("fname_case")
au BufNewFile,BufRead *.pl,*.PL call s:FTpl()
@@@ -1227,10 -1274,9 +1282,9 @@@ au BufNewFile,BufRead *.p
au BufNewFile,BufRead *.pod setf pod
" Php, php3, php4, etc.
- au BufNewFile,BufRead *.php,*.php\d setf php
-
- " Phtml
- au BufNewFile,BufRead *.phtml setf phtml
+ " Also Phtml (was used for PHP 2 in the past)
+ " Also .ctp for Cake template file
+ au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp setf php
" Pike
au BufNewFile,BufRead *.pike,*.lpc,*.ulpc,*.pmod setf pike
@@@ -1398,6 -1444,9 +1452,9 @@@ au BufNewFile,BufRead INDEX,INF
" Prolog
au BufNewFile,BufRead *.pdb setf prolog
+ " Promela
+ au BufNewFile,BufRead *.pml setf promela
+
" Protocols
au BufNewFile,BufRead /etc/protocols setf protocols
@@@ -1427,7 -1476,7 +1484,7 @@@ au BufNewFile,BufRead *.re
au BufNewFile,BufRead *.rib setf rib
" Rexx
- au BufNewFile,BufRead *.rexx,*.rex setf rexx
+ au BufNewFile,BufRead *.rexx,*.rex,*.jrexx,*.rxj,*.orx setf rexx
" R (Splus)
if has("fname_case")
@@@ -1458,7 -1507,7 +1515,7 @@@ func! s:FTr(
for n in range(1, max)
" Rebol is easy to recognize, check for that first
- if getline(n) =~ '\<REBOL\>'
+ if getline(n) =~? '\<REBOL\>'
setf rebol
return
endif
@@@ -1544,8 -1593,24 +1601,24 @@@ au BufNewFile,BufRead *.siv setf siev
" Sendmail
au BufNewFile,BufRead sendmail.cf setf sm
- " Sendmail .mc files are actually m4
- au BufNewFile,BufRead *.mc setf m4
+ " Sendmail .mc files are actually m4. Could also be MS Message text file.
+ au BufNewFile,BufRead *.mc call s:McSetf()
+
+ func! s:McSetf()
+ " Rely on the file to start with a comment.
+ " MS message text files use ';', Sendmail files use '#' or 'dnl'
+ for lnum in range(1, min([line("$"), 20]))
+ let line = getline(lnum)
+ if line =~ '^\s*\(#\|dnl\)'
+ setf m4 " Sendmail .mc file
+ return
+ elseif line =~ '^\s*;'
+ setf msmessages " MS Message text file
+ return
+ endif
+ endfor
+ setf m4 " Default: Sendmail .mc file
+ endfunc
" Services
au BufNewFile,BufRead /etc/services setf services
@@@ -1731,7 -1796,7 +1804,7 @@@ 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.d'
- if expand('<amatch>:p') =~ '^/etc/udev/rules\.d/.*\.rules$'
++ if expand('<amatch>:p') =~ '^/etc/udev.d\|^/etc/udev/rules\.d/.*\.rules$'
setf udevrules
return
endif
@@@ -1741,11 -1806,11 +1814,11 @@@
setf hog
return
endtry
+ let dir = expand('<amatch>:p:h')
for line in config_lines
if line =~ s:ft_rules_udev_rules_pattern
let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
- let amatch_dirname = substitute(expand('<amatch>'), '^\(.*\)/[^/]\+$', '\1', "")
- if amatch_dirname == udev_rules
+ if dir == udev_rules
setf udevrules
endif
break
@@@ -1811,6 -1876,9 +1884,9 @@@ au BufNewFile,BufRead *.stp setf st
" Standard ML
au BufNewFile,BufRead *.sml setf sml
+ " Sratus VOS command macro
+ au BufNewFile,BufRead *.cm setf voscm
+
" Sysctl
au BufNewFile,BufRead /etc/sysctl.conf setf sysctl
@@@ -1885,7 -1953,7 +1961,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)
@@@ -1917,8 -1985,8 +1993,8 @@@
return
endfunc
- " Context
- au BufNewFile,BufRead tex/context/*/*.tex setf context
+ " ConTeXt
+ au BufNewFile,BufRead tex/context/*/*.tex,*.mkii,*.mkiv setf context
" Texinfo
au BufNewFile,BufRead *.texinfo,*.texi,*.txi setf texinfo
@@@ -1953,9 -2021,6 +2029,6 @@@ au BufNewFile,BufRead *.uit,*.uil set
" Udev conf
au BufNewFile,BufRead /etc/udev/udev.conf setf udevconf
- " Udev rules
- au BufNewFile,BufRead /etc/udev/rules.d/*.rules setf udevrules
-
" Udev permissions
au BufNewFile,BufRead /etc/udev/permissions.d/*.permissions setf udevperm
"
@@@ -2074,14 -2139,26 +2147,26 @@@ au BufNewFile,BufRead *.msc,*.msf set
au BufNewFile,BufRead *.ms
\ if !s:FTnroff() | setf xmath | endif
- " XML
- au BufNewFile,BufRead *.xml
- \ if getline(1) . getline(2) . getline(3) =~ '<!DOCTYPE.*DocBook' |
- \ let b:docbk_type="xml" |
- \ setf docbk |
- \ else |
- \ setf xml |
- \ endif
+ " XML specific variants: docbk and xbl
+ au BufNewFile,BufRead *.xml call s:FTxml()
+
+ func! s:FTxml()
+ let n = 1
+ while n < 100 && n < line("$")
+ let line = getline(n)
+ if line =~ '<!DOCTYPE.*DocBook'
+ let b:docbk_type = "xml"
+ setf docbk
+ return
+ endif
+ if line =~ 'xmlns:xbl="http://www.mozilla.org/xbl"'
+ setf xbl
+ return
+ endif
+ let n += 1
+ endwhile
+ setf xml
+ endfunc
" XMI (holding UML models) is also XML
au BufNewFile,BufRead *.xmi setf xml
@@@ -2098,6 -2175,16 +2183,16 @@@ au BufNewFile,BufRead *.tpm setf xm
" Xdg menus
au BufNewFile,BufRead /etc/xdg/menus/*.menu setf xml
+ " ATI graphics driver configuration
+ au BufNewFile,BufRead fglrxrc setf xml
+
+ " XLIFF (XML Localisation Interchange File Format) is also XML
+ au BufNewFile,BufRead *.xlf setf xml
+ au BufNewFile,BufRead *.xliff setf xml
+
+ " X11 xmodmap (also see below)
+ au BufNewFile,BufRead *Xmodmap setf xmodmap
+
" Xquery
au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy setf xquery
@@@ -2189,7 -2276,7 +2284,7 @@@ au BufNewFile,BufRead [cC]hange[lL]og
\|endif
" Crontab
-au BufNewFile,BufRead crontab,crontab.* 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')
@@@ -2226,13 -2313,17 +2321,17 @@@ au BufNewFile,BufRead Kconfig.* call
" Makefile
au BufNewFile,BufRead [mM]akefile* call s:StarSetf('make')
- " Modconf
- au BufNewFile,BufRead /etc/modprobe.* call s:StarSetf('modconf')
-
" Ruby Makefile
au BufNewFile,BufRead [rR]akefile* call s:StarSetf('ruby')
+ " Mail (also matches muttrc.vim, so this is below the other checks)
+ au BufNewFile,BufRead mutt[[:alnum:]._-]\{6\} setf mail
+
+ " Modconf
+ au BufNewFile,BufRead /etc/modprobe.* call s:StarSetf('modconf')
+
" Mutt setup file
+ au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc* call s:StarSetf('muttrc')
" Nroff macros
diff --combined runtime/ftplugin/perl.vim
index 896ffea,3f3e570..bf77bcb
--- 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: 2005 Dec 16
+ " Last Change: 2007 Nov 30
" URL: http://mywebpage.netscape.com/sharppeople/vim/ftplugin
if exists("b:did_ftplugin") | finish | endif
@@@ -39,18 -39,19 +39,22 @@@ 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")
+ try
if &shellxquote != '"'
let perlpath = system('perl -e "print join(q/,/, at INC)"')
else
let perlpath = system("perl -e 'print join(q/,/, at INC)'")
endif
let perlpath = substitute(perlpath,',.$',',,','')
+ catch /E145:/
+ let perlpath = ".,,"
+ endtry
else
" If we can't call perl to get its path, just default to using the
" current directory and the directory of the current file.
diff --combined runtime/indent/ruby.vim
index 4d26741,b3f43a2..fbf576f
--- a/runtime/indent/ruby.vim
+++ b/runtime/indent/ruby.vim
@@@ -78,7 -78,7 +78,7 @@@ let s:end_end_regex = '\%(^\|[^.:@$]\)\
" Expression used for searchpair() call for finding match for 'end' keyword.
let s:end_skip_expr = s:skip_expr .
\ ' || (expand("<cword>") == "do"' .
- \ ' && getline(".") =~ "^\\s*\\<while\\|until\\|for\\>")'
+ \ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\)\\>")'
" Regex that defines continuation lines, not including (, {, or [.
let s:continuation_regex = '\%([\\*+/.,=:-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
@@@ -370,4 -370,4 +370,4 @@@ endfunctio
let &cpo = s:cpo_save
unlet s:cpo_save
- " vim:set sw=2 sts=2 ts=8 noet ff=unix:
+ " vim:set sw=2 sts=2 ts=8 noet:
diff --combined runtime/scripts.vim
index 4b4d7f9,936f508..a876e11
--- 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: 2007 Apr 29
+ " Last change: 2008 Apr 28
" 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\.=-]*\(@[^ ]*\)\=\|-\) .*[12][09]\d\d$'
set ft=mail
" Mason
@@@ -234,6 -234,10 +234,10 @@@
elseif s:line1 =~ '\<DTD\s\+XHTML\s'
set ft=xhtml
+ " PDF
+ elseif s:line1 =~ '^%PDF-'
+ set ft=pdf
+
" XXD output
elseif s:line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
set ft=xxd
@@@ -271,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
@@@ -309,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 runtime/syntax/po.vim
index 2e70765,124d524..1a3e670
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@@ -1,7 -1,10 +1,10 @@@
" Vim syntax file
" Language: po (gettext)
" Maintainer: Dwayne Bailey <dwayne at translate.org.za>
- " Last Change: 2004 Nov 13
+ " Last Change: 2008 Jan 08
+ " Contributors: Dwayne Bailey (Most advanced syntax highlighting)
+ " Leonardo Fontenelle (Spell checking)
+ " Nam SungHyun <namsh at kldp.org> (Original maintainer)
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@@ -11,32 -14,33 +14,36 @@@ elseif exists("b:current_syntax"
finish
endif
+let s:cpo_save = &cpo
+set cpo-=C " Allow line continuations
+
syn sync minlines=10
" Identifiers
+ syn match poStatementMsgCTxt "^msgctxt"
syn match poStatementMsgidplural "^msgid_plural" contained
syn match poPluralCaseN "[0-9]" contained
syn match poStatementMsgstr "^msgstr\(\[[0-9]\]\)" contains=poPluralCaseN
" Simple HTML and XML highlighting
- syn match poHtml "<[^<>]\+>" contains=poHtmlTranslatables
+ syn match poHtml "<\_[^<>]\+>" contains=poHtmlTranslatables,poLineBreak
syn match poHtmlNot +"<[^<]\+>"+ms=s+1,me=e-1
- syn region poHtmlTranslatables start=+alt=\\"+ms=e-1 end=+\\"+ contained
+ syn region poHtmlTranslatables start=+\(abbr\|alt\|content\|summary\|standby\|title\)=\\"+ms=e-1 end=+\\"+ contained contains=@Spell
+ syn match poLineBreak +"\n"+ contained
" Translation blocks
+ syn region poMsgCTxt matchgroup=poStatementMsgCTxt start=+^msgctxt "+rs=e-1 matchgroup=poStringCTxt end=+^msgid "+me=s-1 contains=poStringCTxt
syn region poMsgID matchgroup=poStatementMsgid start=+^msgid "+rs=e-1 matchgroup=poStringID end=+^msgstr\(\|\[[\]0\[]\]\) "+me=s-1 contains=poStringID,poStatementMsgidplural,poStatementMsgid
syn region poMsgSTR matchgroup=poStatementMsgstr start=+^msgstr\(\|\[[\]0\[]\]\) "+rs=e-1 matchgroup=poStringSTR end=+\n\n+me=s-1 contains=poStringSTR,poStatementMsgstr
+ syn region poStringCTxt start=+"+ skip=+\\\\\|\\"+ end=+"+
syn region poStringID start=+"+ skip=+\\\\\|\\"+ end=+"+ contained
- \ contains=poSpecial,poFormat,poCommentKDE,poPluralKDE,poKDEdesktopFile,poHtml,poAccelerator,poHtmlNot,poVariable
+ \ contains=poSpecial,poFormat,poCommentKDE,poPluralKDE,poKDEdesktopFile,poHtml,poAcceleratorId,poHtmlNot,poVariable
syn region poStringSTR start=+"+ skip=+\\\\\|\\"+ end=+"+ contained
- \ contains=poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAccelerator,poHtmlNot,poVariable
+ \ contains=@Spell,poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAcceleratorStr,poHtmlNot,poVariable
" Header and Copyright
syn match poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained
- syn match poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL at ADDRESS>\|LANGUAGE <LL at li.org>\|text/plain; charset=CHARSET\|ENCODING\)" contained
+ syn match poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL at ADDRESS>\|LANGUAGE <LL at li.org>\|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained
syn match poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR <EMAIL at ADDRESS>, YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained
" Translation comment block including: translator comment, automatic coments, flags and locations
@@@ -66,7 -70,8 +73,8 @@@ syn match poObsolete "^#\~.*$
syn match poKDEdesktopFile "\"\(Name\|Comment\|GenericName\|Description\|Keywords\|About\)="ms=s+1,me=e-1
" Accelerator keys - this messes up if the preceding or following char is a multibyte unicode char
- syn match poAccelerator contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1
+ syn match poAcceleratorId contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1
+ syn match poAcceleratorStr contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1 contains=@Spell
" Variables simple
syn match poVariable contained "%\d"
@@@ -94,8 -99,10 +102,10 @@@ if version >= 508 || !exists("did_po_sy
HiLink poStatementMsgid Statement
HiLink poStatementMsgstr Statement
HiLink poStatementMsgidplural Statement
+ HiLink poStatementMsgCTxt Statement
HiLink poPluralCaseN Constant
+ HiLink poStringCTxt Comment
HiLink poStringID String
HiLink poStringSTR String
HiLink poCommentKDE Comment
@@@ -109,11 -116,13 +119,13 @@@
HiLink poHtml Identifier
HiLink poHtmlNot String
HiLink poHtmlTranslatables String
+ HiLink poLineBreak String
HiLink poFormat poSpecial
HiLink poSpecial Special
- HiLink poAccelerator Special
- HiLink poVariable Special
+ HiLink poAcceleratorId Special
+ HiLink poAcceleratorStr Special
+ HiLink poVariable Special
HiLink poMsguniqError Special
HiLink poMsguniqErrorMarkers Comment
@@@ -121,7 -130,6 +133,7 @@@
delcommand HiLink
endif
+let &cpo = s:cpo_save
let b:current_syntax = "po"
" vim:set ts=8 sts=2 sw=2 noet:
diff --combined runtime/syntax/tex.vim
index b1c157e,1393a58..b8982b7
--- 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: Oct 10, 2007
- " Version: 39
+ " Last Change: Jun 03, 2008
+ " Version: 41
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
"
" Notes: {{{1
@@@ -96,13 -96,13 +96,13 @@@ endi
" Clusters: {{{1
" --------
-syn cluster texCmdGroup contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSectionMarker,texSectionName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle
+syn cluster texCmdGroup contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSectionMarker,texSectionName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texURLZone,texAcroZone
if !exists("g:tex_no_error")
syn cluster texCmdGroup add=texMathError
endif
syn cluster texEnvGroup contains=texMatcher,texMathDelim,texSpecialChar,texStatement
-syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone, at texMathZones,texTitle,texAbstract
-syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption, at Spell
+syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone, at texMathZones,texTitle,texAbstract,texURLZone,texAcroZone
+syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texURLZone,texAcroZone, at Spell
syn cluster texRefGroup contains=texMatcher,texComment,texDelimiter
if !exists("tex_no_math")
syn cluster texMathZones contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ
@@@ -125,8 -125,6 +125,8 @@@
syn cluster texSubSubSectionGroup contains=texParaZone
syn cluster texParaGroup contains=texSubParaZone
endif
+syn cluster texURLGroup contains=texMatcher, at NoSpell
+syn cluster texAcroGroup contains=texMatcher, at NoSpell
" Try to flag {} and () mismatches: {{{1
if !exists("g:tex_no_error")
@@@ -263,27 -261,27 +263,27 @@@ syn match texSpaceCodeChar "`\\\=.\(
" Sections, subsections, etc: {{{1
if g:tex_fold_enabled && has("folding")
- syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' fold contains=@texFoldGroup, at texDocGroup, at Spell
- syn region texPartZone matchgroup=texSection start='\\part\>' end='\ze\n\s*\\part\>' fold contains=@texFoldGroup, at texPartGroup, at Spell
- syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\ze\n\s*\\\%(chapter\|part\)\>' fold contains=@texFoldGroup, at texChapterGroup, at Spell
- syn region texSectionZone matchgroup=texSection start='\\section\>' end='\ze\n\s*\\\%(section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texSectionGroup, at Spell
- syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\ze\n\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texSubSectionGroup, at Spell
- syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\ze\n\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
- syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\ze\n\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at texParaGroup, at Spell
- syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\ze\n\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' fold contains=@texFoldGroup, at Spell
- syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' fold contains=@texFoldGroup, at Spell
- syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' fold contains=@texFoldGroup, at Spell
+ syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' fold contains=@texFoldGroup, at texDocGroup, at Spell
+ syn region texPartZone matchgroup=texSection start='\\part\>' end='\ze\s*\\\%(part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at texPartGroup, at Spell
+ syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\ze\s*\\\%(chapter\>\|part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at texChapterGroup, at Spell
+ syn region texSectionZone matchgroup=texSection start='\\section\>' end='\ze\s*\\\%(section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at texSectionGroup, at Spell
+ syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\ze\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at texSubSectionGroup, at Spell
+ syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\ze\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
+ syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\ze\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at texParaGroup, at Spell
+ syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\ze\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' fold contains=@texFoldGroup, at Spell
+ syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' fold contains=@texFoldGroup, at Spell
+ syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' fold contains=@texFoldGroup, at Spell
else
- syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' contains=@texFoldGroup, at texDocGroup, at Spell
- syn region texPartZone matchgroup=texSection start='\\part\>' end='\ze\n\s*\\part\>' contains=@texFoldGroup, at texPartGroup, at Spell
- syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\ze\n\s*\\\%(chapter\|part\)\>' contains=@texFoldGroup, at texChapterGroup, at Spell
- syn region texSectionZone matchgroup=texSection start='\\section\>' end='\ze\n\s*\\\%(section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texSectionGroup, at Spell
- syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\ze\n\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texSubSectionGroup, at Spell
- syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\ze\n\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
- syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\ze\n\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at texParaGroup, at Spell
- syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\ze\n\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end{document}\)' contains=@texFoldGroup, at Spell
- syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' contains=@texFoldGroup, at Spell
- syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' contains=@texFoldGroup, at Spell
+ syn region texDocZone matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}' contains=@texFoldGroup, at texDocGroup, at Spell
+ syn region texPartZone matchgroup=texSection start='\\part\>' end='\ze\s*\\\%(part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at texPartGroup, at Spell
+ syn region texChapterZone matchgroup=texSection start='\\chapter\>' end='\ze\s*\\\%(chapter\>\|part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at texChapterGroup, at Spell
+ syn region texSectionZone matchgroup=texSection start='\\section\>' end='\ze\s*\\\%(section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at texSectionGroup, at Spell
+ syn region texSubSectionZone matchgroup=texSection start='\\subsection\>' end='\ze\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at texSubSectionGroup, at Spell
+ syn region texSubSubSectionZone matchgroup=texSection start='\\subsubsection\>' end='\ze\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at texSubSubSectionGroup, at Spell
+ syn region texParaZone matchgroup=texSection start='\\paragraph\>' end='\ze\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at texParaGroup, at Spell
+ syn region texSubParaZone matchgroup=texSection start='\\subparagraph\>' end='\ze\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)' contains=@texFoldGroup, at Spell
+ syn region texTitle matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}' contains=@texFoldGroup, at Spell
+ syn region texAbstract matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}' contains=@texFoldGroup, at Spell
endif
" Bad Math (mismatched): {{{1
@@@ -376,7 -374,11 +376,11 @@@ syn match texSpecialChar "\^\^[0-9a-f]\
" Comments: {{{1
" Normal TeX LaTeX : %....
" Documented TeX Format: ^^A... -and- leading %s (only)
- syn cluster texCommentGroup contains=texTodo, at Spell
+ if !exists("g:tex_comment_nospell") || !g:tex_comment_nospell
+ syn cluster texCommentGroup contains=texTodo, at Spell
+ else
+ syn cluster texCommentGroup contains=texTodo, at NoSpell
+ endif
syn case ignore
syn keyword texTodo contained combak fixme todo xxx
syn case match
@@@ -397,17 -399,13 +401,17 @@@ 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{verbatim}" end="\\end{verbatim}\|%stopzone\>" contains=@Spell
+if version < 600
+ syn region texZone start="\\begin{verbatim}" end="\\end{verbatim}\|%stopzone\>"
+ " moreverb package:
+ 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\>"
+else
+ syn region texZone start="\\begin{\z(boxedverbatim\|verbatim\%(tab\|write\)\=\)}" end="\\end{\z1}\|%stopzone\>"
+endif
" 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
if version < 600
syn region texZone start="\\verb\*\=`" end="`\|%stopzone\>"
syn region texZone start="\\verb\*\=#" end="#\|%stopzone\>"
@@@ -427,10 -425,8 +431,10 @@@ syn region texRefZone matchgroup=texSt
syn region texRefZone matchgroup=texStatement start="\\\(page\|eq\)ref{" end="}\|%stopzone\>" contains=@texRefGroup
syn region texRefZone matchgroup=texStatement start="\\v\=ref{" end="}\|%stopzone\>" contains=@texRefGroup
syn match texRefZone '\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite
+syn match texRefZone '\\citetext' nextgroup=texRefOption,texFreeCite
syn region texRefOption contained matchgroup=Delimiter start='\[' end=']' contains=@texRefGroup nextgroup=texRefOption,texCite
syn region texCite contained matchgroup=Delimiter start='{' end='}' contains=@texRefGroup
+syn region texFreeCite contained matchgroup=Delimiter start='{'rs=s+1 skip="\\\\\|\\[{}]" end='}' contains=@texMatchGroup
" Handle newcommand, newenvironment : {{{1
syn match texNewCmd "\\newcommand\>" nextgroup=texCmdName skipwhite skipnl
@@@ -454,15 -450,6 +458,15 @@@ endi
syn match texDefParms contained "#[^{]*" contains=texDefParm nextgroup=texCmdBody skipwhite skipnl
syn match texDefParm contained "#\d\+"
+" Tex URL Zones: {{{1
+syn region texURLZone matchgroup=texURLZone start="\\\%(url\|href\){" end="}\|%stopzone\>" contains=@texURLGroup
+syn region texURLZone matchgroup=texURLZone start="\\burl\%(alt\)\={" end="}\|%stopzone\>" contains=@texURLGroup
+syn region texURLZone matchgroup=texURLZone start="\\\%(link\|email\){" end="}\|%stopzone\>" contains=@texURLGroup
+
+" Tex Acronym Zones: {{{1
+syn region texAcroZone matchgroup=texAcroZone start="\\ac\%(fi\|[fls]\=p\=\)\*\={" end="}\|%stopzone\>" contains=@texAcroGroup
+syn region texAcroZone matchgroup=texAcroZone start="\\ac\%(used\|[ls]u\*\=\){" end="}\|%stopzone\>" contains=@texAcroGroup
+
" TeX Lengths: {{{1
syn match texLength "\<\d\+\([.,]\d\+\)\=\s*\(true\)\=\s*\(bp\|cc\|cm\|dd\|em\|ex\|in\|mm\|pc\|pt\|sp\)\>"
@@@ -523,6 -510,7 +527,7 @@@ if did_tex_syntax_inits ==
HiLink texMathZoneW texMath
HiLink texMathZoneX texMath
HiLink texMathZoneY texMath
+ HiLink texMathZoneV texMath
HiLink texMathZoneZ texMath
endif
HiLink texSectionMarker texCmdName
@@@ -532,7 -520,6 +537,7 @@@
HiLink texTypeStyle texType
" Basic TeX highlighting groups
+ HiLink texAcroZone Special
HiLink texCmdArgs Number
HiLink texCmdName Statement
HiLink texComment Comment
@@@ -556,7 -543,6 +561,7 @@@
HiLink texString String
HiLink texTodo Todo
HiLink texType Type
+ HiLink texURLZone Special
HiLink texZone PreCondit
delcommand HiLink
diff --combined src/po/de.po
index 43a8e63,3a897f2..8b8e52f
--- a/src/po/de.po
+++ b/src/po/de.po
@@@ -11,8 -11,8 +11,8 @@@ msgid "
msgstr ""
"Project-Id-Version: Vim(deutsch)\n"
"POT-Creation-Date: 2006-04-02 11:30+0200\n"
- "PO-Revision-Date: 2006-06-18 12:34+0200\n"
- "Last-Translator: Georg Dahn <gorgyd at yahoo.co.uk>\n"
+ "PO-Revision-Date: 2008-05-24 17:26+0200\n"
+ "Last-Translator: Georg Dahn <georg.dahn at gmail.com>\n"
"Language-Team: German <de at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO_8859-1\n"
@@@ -25,20 -25,20 +25,20 @@@ msgid "E83: Cannot allocate buffer, usi
msgstr "E83: Kann den Puffer nicht zuweisen; benutze einen anderen..."
msgid "E515: No buffers were unloaded"
- msgstr "E515: Keine Puffer wurden ausgeladen"
+ msgstr "E515: Keine Puffer wurden entladen"
msgid "E516: No buffers were deleted"
- msgstr "E516: Keine Puffer wurden gelöscht"
+ msgstr "E516: Keine Puffer wurden vollständig gelöscht"
msgid "E517: No buffers were wiped out"
- msgstr "E517: Keine Puffer wurden gelöscht"
+ msgstr "E517: Keine Puffer wurden vollständig gelöscht"
msgid "1 buffer unloaded"
- msgstr "ein Puffer ausgeladen"
+ msgstr "ein Puffer entladen"
#, c-format
msgid "%d buffers unloaded"
- msgstr "%d Puffer ausgeladen"
+ msgstr "%d Puffer entladen"
msgid "1 buffer deleted"
msgstr "ein Puffer gelöscht"
@@@ -48,11 -48,11 +48,11 @@@ msgid "%d buffers deleted
msgstr "%d Puffer gelöscht"
msgid "1 buffer wiped out"
- msgstr "ein Puffer gelöscht"
+ msgstr "ein Puffer vollständig gelöscht"
#, c-format
msgid "%d buffers wiped out"
- msgstr "%d Puffer gelöscht"
+ msgstr "%d Puffer vollständig gelöscht"
msgid "E84: No modified buffer found"
msgstr "E84: Kein veränderter Puffer gefunden"
@@@ -87,11 -87,11 +87,11 @@@ msgstr "E92: Kein Puffer %ld gefunden
#, c-format
msgid "E93: More than one match for %s"
- msgstr "E93: Mehr als eine Möglichkeit für %s"
+ msgstr "E93: Mehr als ein Treffer für %s"
#, c-format
msgid "E94: No matching buffer for %s"
- msgstr "E94: Kein Puffer passt zu %s"
+ msgstr "E94: Kein übereinstimmender Puffer für %s"
#, c-format
msgid "line %ld"
@@@ -334,16 -334,16 +334,16 @@@ msgstr "E686: Argument von %s muss ein
#, c-format
msgid "E712: Argument of %s must be a List or Dictionary"
- msgstr "E712: Argument von %s muss eine Liste oder ein Dictionary"
+ msgstr "E712: Argument von %s muss eine Liste oder ein Wörterbuch"
msgid "E713: Cannot use empty key for Dictionary"
- msgstr "E713: Der Schlüssel für das Dictionary darf nicht leer sein"
+ msgstr "E713: Der Schlüssel für das Wörterbuch darf nicht leer sein"
msgid "E714: List required"
msgstr "E714: Liste benötigt"
msgid "E715: Dictionary required"
- msgstr "E715: Dictionary benötigt"
+ msgstr "E715: Wörterbuch benötigt"
#, c-format
msgid "E118: Too many arguments for function: %s"
@@@ -351,20 -351,20 +351,20 @@@ msgstr "E118: Zu viele Argumente für Fu
#, c-format
msgid "E716: Key not present in Dictionary: %s"
- msgstr "E716: Schlüssel nicht vorhanden im Dictionary: %s"
+ msgstr "E716: Schlüssel nicht vorhanden im Wörterbuch: %s"
#, c-format
msgid "E122: Function %s already exists, add ! to replace it"
msgstr "E122: Funktion %s existiert bereits; zum Ersetzen ! hinzufügen"
msgid "E717: Dictionary entry already exists"
- msgstr "E717: Dictionary-Eintrag existiert bereits"
+ msgstr "E717: Wörterbuch-Eintrag existiert bereits"
msgid "E718: Funcref required"
- msgstr "E718: Funcref benötigt"
+ msgstr "E718: Funktionsreferenz benötigt"
msgid "E719: Cannot use [:] with a Dictionary"
- msgstr "E719: Kann [:] nicht mit einem Dictionary verwenden"
+ msgstr "E719: Kann [:] nicht mit einem Wörterbuch verwenden"
#, c-format
msgid "E734: Wrong variable type for %s="
@@@ -392,7 -392,7 +392,7 @@@ msgid "E738: Can't list variables for %
msgstr "E738: Kann Variablen nicht auflisten: %s"
msgid "E689: Can only index a List or Dictionary"
- msgstr "E689: Kann nur Listen und Dictionarys indizieren"
+ msgstr "E689: Kann nur Listen und Wörterbücher indizieren"
msgid "E708: [:] must come last"
msgstr "E708: [:] muss am Schluss kommen"
@@@ -430,22 -430,22 +430,22 @@@ msgid "E692: Invalid operation for List
msgstr "E692: Unzulässige Operation für Listen"
msgid "E735: Can only compare Dictionary with Dictionary"
- msgstr "E735: Kann nur ein Dictionary mit einem Dictionary vergleichen"
+ msgstr "E735: Kann nur ein Wörterbuch mit einem Wörterbuch vergleichen"
msgid "E736: Invalid operation for Dictionary"
- msgstr "E736: Unzulässige Operation für ein Dictionary"
+ msgstr "E736: Unzulässige Operation für ein Wörterbuch"
msgid "E693: Can only compare Funcref with Funcref"
- msgstr "E693: Kann nur eine Funcref mit einer Funcref vergleichen"
+ msgstr "E693: Kann nur eine Funktionsreferenz mit einer Funktionsreferenz vergleichen"
msgid "E694: Invalid operation for Funcrefs"
- msgstr "E694: Unzulässige Operation für Funcrefs"
+ msgstr "E694: Unzulässige Operation für Funktionsreferenzen"
msgid "E110: Missing ')'"
msgstr "E110: Fehlende ')'"
msgid "E695: Cannot index a Funcref"
- msgstr "E695: Kann keine Funcref indizieren"
+ msgstr "E695: Kann keine Funktionsreferenz indizieren"
#, c-format
msgid "E112: Option name missing: %s"
@@@ -473,19 -473,19 +473,19 @@@ msgstr "E697: Fehlendes Ende der Liste
#, c-format
msgid "E720: Missing colon in Dictionary: %s"
- msgstr "E720: Fehlender Doppelpunkt im Dictionary: %s"
+ msgstr "E720: Fehlender Doppelpunkt im Wörterbuch: %s"
#, c-format
msgid "E721: Duplicate key in Dictionary: \"%s\""
- msgstr "E721: Doppelter Schlüssel im Dictionary: \"%s\""
+ msgstr "E721: Doppelter Schlüssel im Wörterbuch: \"%s\""
#, c-format
msgid "E722: Missing comma in Dictionary: %s"
- msgstr "E722: Fehlendes Komma im Dictionary: %s"
+ msgstr "E722: Fehlendes Komma im Wörterbuch: %s"
#, c-format
msgid "E723: Missing end of Dictionary '}': %s"
- msgstr "E723: Fehlendes Ende des Dictionarys '}': %s"
+ msgstr "E723: Fehlendes Ende des Wörterbuchs '}': %s"
msgid "E724: variable nested too deep for displaying"
msgstr "E724: Variable ist zu tief verschachtelt für die Anzeige"
@@@ -494,7 -494,7 +494,7 @@@ msgid "E699: Too many arguments
msgstr "E699: Zu viele Argumente"
msgid "E785: complete() can only be used in Insert mode"
- msgstr "E785: complete() kann nur im Insert Modus verwendet werden"
+ msgstr "E785: complete() kann nur im Einfüge-Modus verwendet werden"
#.
#. * Yes this is ugly, I don't particularly like it either. But doing it
@@@ -567,26 -567,26 +567,26 @@@ msgid "E677: Error writing temp file
msgstr "E677: Fehler beim Schreiben einer temporären Datei"
msgid "E703: Using a Funcref as a number"
- msgstr "E703: Funcref als Zahl verwendet"
+ msgstr "E703: Funktionsreferenz als Zahl verwendet"
msgid "E745: Using a List as a number"
msgstr "E745: Liste als Zahl verwendet"
msgid "E728: Using a Dictionary as a number"
- msgstr "E728: Dictionary als Zahl verwendet"
+ msgstr "E728: Wörterbuch als Zahl verwendet"
msgid "E729: using Funcref as a String"
- msgstr "E729: Funcref als String verwendet"
+ msgstr "E729: Funktionsreferenz als String verwendet"
msgid "E730: using List as a String"
msgstr "E730: Liste als String verwendet"
msgid "E731: using Dictionary as a String"
- msgstr "E731: Dictionary als String verwendet"
+ msgstr "E731: Wörterbuch als String verwendet"
#, c-format
msgid "E704: Funcref variable name must start with a capital: %s"
- msgstr "E704: Funcref Variable muss mit einem Großbuchstaben beginnen: %s"
+ msgstr "E704: Funktionsreferenz-Variable muss mit einem Großbuchstaben beginnen: %s"
#, c-format
msgid "E705: Variable name conflicts with existing function: %s"
@@@ -623,7 -623,7 +623,7 @@@ msgstr "E126: Fehlendes :endfunction
#, c-format
msgid "E746: Function name does not match script file name: %s"
- msgstr "E746: Funktionsname stimmt nicht mit dem Namen der Skript-Datei überein: %s"
+ msgstr "E746: Funktionsname stimmt mit dem Namen der Skript-Datei nicht überein: %s"
msgid "E129: Function name required"
msgstr "E129: Funktionsname wird verlangt"
@@@ -1170,7 -1170,7 +1170,7 @@@ msgstr "E467: Eigene Vervollständigung
#, c-format
msgid "E185: Cannot find color scheme %s"
- msgstr "E185: Zeile %s kann nicht gefunden werden"
+ msgstr "E185: Kann Farbschema %s nicht finden"
msgid "Greetings, Vim user!"
msgstr "Herzliche Grüße, Vim Benutzer!"
@@@ -1269,7 -1269,7 +1269,7 @@@ msgid "E195: Cannot open viminfo file f
msgstr "E195: viminfo kann nicht zum Lesen geöffnet werden"
msgid "E196: No digraphs in this version"
- msgstr "E196 Keine Digraphen in dieser Version"
+ msgstr "E196: Keine Digraphen in dieser Version"
msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
msgstr "E608: Kann nicht :throw Exceptions mit 'Vim' Präfix"
@@@ -1504,7 -1504,7 +1504,7 @@@ msgid "E676: No matching autocommands f
msgstr "E676: Keine übereinstimmenden Autokommandos für acwrite Puffer"
msgid "E203: Autocommands deleted or unloaded buffer to be written"
- msgstr "E203: Autokommandos haben den zu schreibenden Puffer gelöscht oder heraus geladen"
+ msgstr "E203: Autokommandos haben den zu schreibenden Puffer gelöscht oder entladen"
msgid "E204: Autocommand changed number of lines in unexpected way"
msgstr "E204: Autokommandos haben die Anzahl der Zeilen in unerwarteter Weise verändert"
@@@ -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\""
@@@ -1894,21 -1894,21 +1894,21 @@@ msgstr "Ersetzen mit:
#. whole word only button
msgid "Match whole word only"
- msgstr "Übereinstimmung nur mit ganzen Wörtern"
+ msgstr "Nur ganzes Wort suchen"
#. match case button
msgid "Match case"
- msgstr "Klein-/Großschreibung beachten"
+ msgstr "Groß-/Kleinschreibung"
msgid "Direction"
msgstr "Richtung"
#. 'Up' and 'Down' buttons
msgid "Up"
- msgstr "Auf"
+ msgstr "Aufwärts"
msgid "Down"
- msgstr "Ab"
+ msgstr "Abwärts"
msgid "Find Next"
msgstr "Suche Nächstes"
@@@ -2268,7 -2268,7 +2268,7 @@@ msgstr "E567: Keine cscope Verbindungen
#, c-format
msgid "E259: no matches found for cscope query %s of %s"
- msgstr "E259: keine Treffer gefunden für cscope Anfragen %s aus %s"
+ msgstr "E259: keine Übereinstimmungen gefunden für cscope Abfrage %s aus %s"
#, c-format
msgid "E469: invalid cscopequickfix flag %c for %c"
@@@ -2790,7 -2790,7 +2790,7 @@@ msgid "-V[N]\t\tVerbose level
msgstr "-V[N]\t\tVerbose Stufe"
msgid "-D\t\t\tDebugging mode"
- msgstr "-D\t\t\tDebug Modus"
+ msgstr "-D\t\t\tDebug-Modus"
msgid "-n\t\t\tNo swap file, use memory only"
msgstr "-n\t\t\tKeine Auslagerungsdatei, verwende nur Speicher"
@@@ -3383,7 -3383,7 +3383,7 @@@ msgstr "E315: ml_get: unzulässige lnum
#, c-format
msgid "E316: ml_get: cannot find line %ld"
- msgstr "E316: ml_get: Zeile %ld kann nicht gefunden werden"
+ msgstr "E316: ml_get: kann Zeile %ld nicht finden"
msgid "E317: pointer block id wrong 3"
msgstr "E317: Zeiger Block id falsch 3"
@@@ -3402,7 -3402,7 +3402,7 @@@ msgstr "Block 1 gelöscht?
#, c-format
msgid "E320: Cannot find line %ld"
- msgstr "E320: Zeile %ld kann nicht gefunden werden"
+ msgstr "E320: Kann Zeile %ld nicht finden"
msgid "E317: pointer block id wrong"
msgstr "E317: Zeiger Block id ist falsch"
@@@ -3748,11 -3748,11 +3748,11 @@@ msgstr "
#, c-format
msgid "E344: Can't find directory \"%s\" in cdpath"
- msgstr "E344: Verzeichnis \"%s\" kann im 'cdpath' nicht gefunden werden"
+ msgstr "E344: Kann Verzeichnis \"%s\" nicht im 'cdpath' finden"
#, c-format
msgid "E345: Can't find file \"%s\" in path"
- msgstr "E345: Datei \"%s\" kann im Pfad nicht gefunden werden"
+ msgstr "E345: Kann Datei \"%s\" nicht im Pfad finden"
#, c-format
msgid "E346: No more directory \"%s\" found in cdpath"
@@@ -3784,7 -3784,7 +3784,7 @@@ msgid "E505:
msgstr "E505: "
msgid "E774: 'operatorfunc' is empty"
- msgstr "E775: 'operatorfunc' is empty"
+ msgstr "E774: 'operatorfunc' is empty"
msgid "E775: Eval feature not available"
msgstr "E775: Evaluierungsfunktion nicht verfügbar"
@@@ -4388,19 -4388,19 +4388,19 @@@ msgid "E51: Too many %s(
msgstr "E51: Zu viele %s("
msgid "E52: Unmatched \\z("
- msgstr "E52: \\z( ohne Übereinstimmung"
+ msgstr "E52: \\z( ohne Gegenstück"
#, c-format
msgid "E53: Unmatched %s%%("
- msgstr "E53: %s%%( ohne Übereinstimmung"
+ msgstr "E53: %s%%( ohne Gegenstück"
#, c-format
msgid "E54: Unmatched %s("
- msgstr "E54: %s( ohne Übereinstimmung"
+ msgstr "E54: %s( ohne Gegenstück"
#, c-format
msgid "E55: Unmatched %s)"
- msgstr "E55: %s) ohne Übereinstimmung"
+ msgstr "E55: %s) ohne Gegenstück"
#, c-format
msgid "E59: invalid character after %s@"
@@@ -4554,32 -4554,32 +4554,32 @@@ msgstr " NICHT GEFUNDEN
#, c-format
msgid "Scanning included file: %s"
- msgstr "Scanne eingefügte Datei: %s"
+ msgstr "Durchsuche inkludierte Datei: %s"
#, c-format
msgid "Searching included file %s"
- msgstr "Suche eingefügte Datei %s"
+ msgstr "Suche inkludierte Datei %s"
msgid "E387: Match is on current line"
msgstr "E387: Treffer ist auf der momentanen Zeile"
msgid "All included files were found"
- msgstr "Alle eingefügten Dateien wurden gefunden"
+ msgstr "Alle inkludierten Dateien wurden gefunden"
msgid "No included files"
- msgstr "Keine eingefügten Dateien"
+ msgstr "Keine inkludierten Dateien"
msgid "E388: Couldn't find definition"
- msgstr "E388: Definition konnte nicht gefunden werden"
+ msgstr "E388: Konnte Definition nicht finden"
msgid "E389: Couldn't find pattern"
- msgstr "E389: Muster konnte nicht gefunden werden"
+ msgstr "E389: Konnte Muster nicht finden"
msgid "E759: Format error in spell file"
msgstr "E759: Format-Fehler im Rechtschreibwörterbuch"
msgid "E758: Truncated spell file"
- msgstr "E758 Abgeschnittenes Rechtschreibwörterbuch"
+ msgstr "E758: Abgeschnittenes Rechtschreibwörterbuch"
#, c-format
msgid "Trailing text in %s line %d: %s"
@@@ -4610,16 -4610,16 +4610,16 @@@ msgid "Reading spell file \"%s\"
msgstr "Lese Rechtschreibwörterbuch \"%s\" ein"
msgid "E757: This does not look like a spell file"
- msgstr "E757: Das sieht nicht nach einem Wörterbuch für die Rechtschreibprüfung aus"
+ msgstr "E757: Das sieht nicht nach einem Rechtschreibwörterbuch aus"
msgid "E771: Old spell file, needs to be updated"
- msgstr "E771: Altes Wörterbuch für die Rechtschreibprüfung, benötigt Aktualisierung"
+ msgstr "E771: Altes Rechtschreibwörterbuch, benötigt Aktualisierung"
msgid "E772: Spell file is for newer version of Vim"
- msgstr "E772: Wörterbuch für die Rechtschreibprüfung ist für eine neuere Version von Vim"
+ msgstr "E772: Rechtschreibwörterbuch ist für eine neuere Version von Vim"
msgid "E770: Unsupported section in spell file"
- msgstr "E770: Nicht unterstützter Abschnitt im Wörterbuch für die Rechtschreibprüfung"
+ msgstr "E770: Nicht unterstützter Abschnitt im Rechtschreibwörterbuch"
#, c-format
msgid "Warning: region %s not supported"
@@@ -4987,7 -4987,7 +4987,7 @@@ msgstr "E393: \"group[t]here\" ist an d
#, c-format
msgid "E394: Didn't find region item for %s"
- msgstr "E394: \"region\"-Element für \"%s\" konnte nicht gefunden werden"
+ msgstr "E394: Konnte kein \"region\"-Element für \"%s\" finden"
msgid "E395: contains argument not accepted here"
msgstr "E395: \"contains\"-Argument ist an dieser Stelle ungültig"
@@@ -5065,10 -5065,10 +5065,10 @@@ msgstr "E412: Nicht ausreichend viele A
#, c-format
msgid "E413: Too many arguments: \":highlight link %s\""
- msgstr "E412: Zu viele Argumente: \":highlight link %s\""
+ msgstr "E413: Zu viele Argumente: \":highlight link %s\""
msgid "E414: group has settings, highlight link ignored"
- msgstr "E414: Gruppe hat Einstellungen, Unterstreichung Link ignoriert"
+ msgstr "E414: Gruppe hat Einstellungen, highlight link ignorieren"
#, c-format
msgid "E415: unexpected equal sign: %s"
@@@ -5124,7 -5124,7 +5124,7 @@@ msgstr "E425: Kann nicht vor den erste
#, c-format
msgid "E426: tag not found: %s"
- msgstr "E426: Tag \"%s\" konnte nicht gefunden werden"
+ msgstr "E426: Konnte Tag \"%s\" nicht finden"
msgid " # pri kind tag"
msgstr " # pri verw. tag"
@@@ -5190,10 -5190,10 +5190,10 @@@ msgid "E433: No tags file
msgstr "E433: Keine Tag-Datei"
msgid "E434: Can't find tag pattern"
- msgstr "E434: Tag-Muster kann nicht gefunden werden"
+ msgstr "E434: Kann Tag-Muster nicht finden"
msgid "E435: Couldn't find tag, just guessing!"
- msgstr "E435: Tag konnte nicht gefunden werden, das ist nur eine Vermutung!"
+ msgstr "E435: Konnte Tag möglicherweise nicht finden!"
msgid "' not known. Available builtin terminals are:"
msgstr "' nicht bekannt. Die folgenden eingebauten Terminals stehen zur Verfügung:"
@@@ -5205,14 -5205,14 +5205,14 @@@ msgid "E557: Cannot open termcap file
msgstr "E557: Termcap-Datei kann nicht geöffnet werden"
msgid "E558: Terminal entry not found in terminfo"
- msgstr "E558: Terminal-Eintrag konnte in der Terminfo-Datenbank nicht gefunden werden"
+ msgstr "E558: Kein Terminal-Eintrag in der Terminfo-Datenbank gefunden"
msgid "E559: Terminal entry not found in termcap"
- msgstr "E559: Terminaleintrag konnte in der Termcap-Datei nicht gefunden werden"
+ msgstr "E559: Kein Terminal-Eintrag in der Termcap-Datei gefunden"
#, c-format
msgid "E436: No \"%s\" entry in termcap"
- msgstr "E436: Kein \"%s\" Eintrag in termcap"
+ msgstr "E436: Kein \"%s\" Eintrag in der Termcap-Datei"
msgid "E437: terminal capability \"cm\" required"
msgstr "E437: Terminalfähigkeit \"cm\" wird benötigt"
@@@ -5232,7 -5232,7 +5232,7 @@@ msgid "Vim: Error reading input, exitin
msgstr "Vim: Fehler beim Lesen der Eingabe, Abbruch...\n"
msgid "No undo possible; continue anyway"
- msgstr "Wiederherstellung nicht möglich; setze trotz dem fort"
+ msgstr "Wiederherstellung nicht möglich; setze trotzdem fort"
msgid "Already at oldest change"
msgstr "Bereits bei der ältesten Änderung"
@@@ -5615,11 -5615,11 +5615,11 @@@ msgstr "E446: Kein Dateiname unter dem
#, c-format
msgid "E447: Can't find file \"%s\" in path"
- msgstr "E447: Datei \"%s\" kann im Pfad nicht gefunden werden"
+ msgstr "E447: Kann Datei \"%s\" nicht im Pfad finden"
#, c-format
msgid "E370: Could not load library %s"
- msgstr "E370: Bibliothek %s konnte nicht geladen werden"
+ msgstr "E370: Konnte Bibliothek %s nicht laden"
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr "Dieser Befehl ist nicht verfügbar, da die Perl-Bibliothek nicht geladen werden konnte"
@@@ -5734,7 -5734,7 +5734,7 @@@ msgid "E21: Cannot make changes, 'modif
msgstr "E21: Kann keine Änderungen machen, 'modifiable' ist aus"
msgid "E22: Scripts nested too deep"
- msgstr "E22: Skript-Schachtelung zu tief"
+ msgstr "E22: Skript ist zu tief verschachtelt"
msgid "E23: No alternate file"
msgstr "E23: Keine alternative Datei"
@@@ -5875,7 -5875,7 +5875,7 @@@ msgid "E523: Not allowed here
msgstr "E523: Hier nicht erlaubt"
msgid "E359: Screen mode setting not supported"
- msgstr "E359: Bildschirm Modus wird nicht unterstützt"
+ msgstr "E359: Bildschirm-Modus wird nicht unterstützt"
msgid "E49: Invalid scroll size"
msgstr "E49: Ungültige Scroll-Größe"
@@@ -6013,7 -6013,7 +6013,7 @@@ msgstr "E120: <SID> wurde nicht in eine
#, c-format
msgid "E725: Calling dict function without Dictionary: %s"
- msgstr "E725: Aufruf der 'dict' Funktion ohne Dictionary: %s"
+ msgstr "E725: Aufruf der 'dict' Funktion ohne Wörterbuch: %s"
msgid "E786: Range not allowed"
msgstr "E786: Bereich nicht erlaubt"
--
Vim packaging
More information about the pkg-vim-maintainers
mailing list