adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated runtime files.

Browse Source
This commit is contained in:
Bram Moolenaar
2012-03-28 20:51:51 +02:00
parent 913077c37c
commit 61d35bd020
18 changed files with 315 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/doc/editing.txt
View File

@ -1,4 +1,4 @@
*editing.txt* For Vim version 7.3. Last change: 2011 Feb 26 *editing.txt* For Vim version 7.3. Last change: 2012 Mar 23
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -1159,8 +1159,10 @@ MULTIPLE WINDOWS AND BUFFERS *window-exit*
*:confirm* *:conf* *:confirm* *:conf*
:conf[irm] {command} Execute {command}, and use a dialog when an :conf[irm] {command} Execute {command}, and use a dialog when an
operation has to be confirmed. Can be used on the operation has to be confirmed. Can be used on the
":q", ":qa" and ":w" commands (the latter to over-ride |:q|, |:qa| and |:w| commands (the latter to override
a read-only setting). a read-only setting), and any other command that can
fail in such a way, such as |:only|, |:buffer|,
|:bdelete|, etc.
Examples: > Examples: >
:confirm w foo :confirm w foo

11
runtime/doc/eval.txt
View File

@ -1,4 +1,4 @@
*eval.txt* For Vim version 7.3. Last change: 2012 Mar 07 *eval.txt* For Vim version 7.3. Last change: 2012 Mar 28
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -3473,7 +3473,8 @@ glob({expr} [, {nosuf} [, {list}]]) *glob()*
matches, they are separated by <NL> characters. matches, they are separated by <NL> characters.
If the expansion fails, the result is an empty String or List. If the expansion fails, the result is an empty String or List.
A name for a non-existing file is not included. A name for a non-existing file is not included. A symbolic
link is only included if it points to an existing file.
For most systems backticks can be used to get files names from For most systems backticks can be used to get files names from
any external command. Example: > any external command. Example: >
@ -5779,9 +5780,9 @@ tabpagebuflist([{arg}]) *tabpagebuflist()*
omitted the current tab page is used. omitted the current tab page is used.
When {arg} is invalid the number zero is returned. When {arg} is invalid the number zero is returned.
To get a list of all buffers in all tabs use this: > To get a list of all buffers in all tabs use this: >
tablist = [] let buflist = []
for i in range(tabpagenr('$')) for i in range(tabpagenr('$'))
call extend(tablist, tabpagebuflist(i + 1)) call extend(buflist, tabpagebuflist(i + 1))
endfor endfor
< Note that a buffer may appear in more than one window. < Note that a buffer may appear in more than one window.
@ -6003,7 +6004,7 @@ virtcol({expr}) *virtcol()*
would be of unlimited width. When there is a <Tab> at the would be of unlimited width. When there is a <Tab> at the
position, the returned Number will be the column at the end of position, the returned Number will be the column at the end of
the <Tab>. For example, for a <Tab> in column 1, with 'ts' the <Tab>. For example, for a <Tab> in column 1, with 'ts'
set to 8, it returns 8. set to 8, it returns 8. |conceal| is ignored.
For the byte position use |col()|. For the byte position use |col()|.
For the use of {expr} see |col()|. For the use of {expr} see |col()|.
When 'virtualedit' is used {expr} can be [lnum, col, off], where When 'virtualedit' is used {expr} can be [lnum, col, off], where

19
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 7.3. Last change: 2012 Feb 22 *options.txt* For Vim version 7.3. Last change: 2012 Mar 28
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -3772,9 +3772,10 @@ A jump table for the options with a short description can be found at |Q_op|.
'highlight' 'hl' string (default (as a single string): 'highlight' 'hl' string (default (as a single string):
"8:SpecialKey,@:NonText,d:Directory, "8:SpecialKey,@:NonText,d:Directory,
e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg, e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,
M:ModeMsg,n:LineNr,r:Question, M:ModeMsg,n:LineNr,N:CursorLineNr,
s:StatusLine,S:StatusLineNC,c:VertSplit, r:Question,s:StatusLine,S:StatusLineNC,
t:Title,v:Visual,w:WarningMsg,W:WildMenu, c:VertSplit, t:Title,v:Visual,
w:WarningMsg,W:WildMenu,
f:Folded,F:FoldColumn,A:DiffAdd, f:Folded,F:FoldColumn,A:DiffAdd,
C:DiffChange,D:DiffDelete,T:DiffText, C:DiffChange,D:DiffDelete,T:DiffText,
>:SignColumn,B:SpellBad,P:SpellCap, >:SignColumn,B:SpellBad,P:SpellCap,
@ -3800,6 +3801,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|hl-ModeMsg| M Mode (e.g., "-- INSERT --") |hl-ModeMsg| M Mode (e.g., "-- INSERT --")
|hl-LineNr| n line number for ":number" and ":#" commands, and |hl-LineNr| n line number for ":number" and ":#" commands, and
when 'number' or 'relativenumber' option is set. when 'number' or 'relativenumber' option is set.
|hl-CursorLineNr| N like n for when 'cursorline' is set.
|hl-Question| r |hit-enter| prompt and yes/no questions |hl-Question| r |hit-enter| prompt and yes/no questions
|hl-StatusLine| s status line of current window |status-line| |hl-StatusLine| s status line of current window |status-line|
|hl-StatusLineNC| S status lines of not-current windows |hl-StatusLineNC| S status lines of not-current windows
@ -5078,7 +5080,8 @@ A jump table for the options with a short description can be found at |Q_op|.
number. number.
When a long, wrapped line doesn't start with the first character, '-' When a long, wrapped line doesn't start with the first character, '-'
characters are put before the number. characters are put before the number.
See |hl-LineNr| for the highlighting used for the number. See |hl-LineNr| and |hl-CursorLineNr| for the highlighting used for
the number.
When setting this option, 'relativenumber' is reset. When setting this option, 'relativenumber' is reset.
*'numberwidth'* *'nuw'* *'numberwidth'* *'nuw'*
@ -5477,7 +5480,8 @@ A jump table for the options with a short description can be found at |Q_op|.
number. number.
When a long, wrapped line doesn't start with the first character, '-' When a long, wrapped line doesn't start with the first character, '-'
characters are put before the number. characters are put before the number.
See |hl-LineNr| for the highlighting used for the number. See |hl-LineNr| and |hl-CursorLineNr| for the highlighting used for
the number.
When setting this option, 'number' is reset. When setting this option, 'number' is reset.
*'remap'* *'noremap'* *'remap'* *'noremap'*
@ -6563,6 +6567,9 @@ A jump table for the options with a short description can be found at |Q_op|.
evaluated and the result is used as the option value. Example: > evaluated and the result is used as the option value. Example: >
:set statusline=%!MyStatusLine() :set statusline=%!MyStatusLine()
< The result can contain %{} items that will be evaluated too. < The result can contain %{} items that will be evaluated too.
Note that the "%!" expression is evaluated in the context of the
current window and buffer, while %{} items are evaluated in the
context of the window that the statusline belongs to.
When there is error while evaluating the option then it will be made When there is error while evaluating the option then it will be made
empty to avoid further errors. Otherwise screen updating would loop. empty to avoid further errors. Otherwise screen updating would loop.

8
runtime/doc/repeat.txt
View File

@ -1,4 +1,4 @@
*repeat.txt* For Vim version 7.3. Last change: 2011 Jan 06 *repeat.txt* For Vim version 7.3. Last change: 2012 Mar 23
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -109,7 +109,7 @@ q Stops recording. (Implementation note: The 'q' that
it was the result of a mapping) {Vi: no recording} it was the result of a mapping) {Vi: no recording}
*@* *@*
@{0-9a-z".=*} Execute the contents of register {0-9a-z".=*} [count] @{0-9a-z".=*+} Execute the contents of register {0-9a-z".=*+} [count]
times. Note that register '%' (name of the current times. Note that register '%' (name of the current
file) and '#' (name of the alternate file) cannot be file) and '#' (name of the alternate file) cannot be
used. used.
@ -123,8 +123,8 @@ q Stops recording. (Implementation note: The 'q' that
*@@* *E748* *@@* *E748*
@@ Repeat the previous @{0-9a-z":*} [count] times. @@ Repeat the previous @{0-9a-z":*} [count] times.
:[addr]*{0-9a-z".=} *:@* *:star* :[addr]*{0-9a-z".=+} *:@* *:star*
:[addr]@{0-9a-z".=*} Execute the contents of register {0-9a-z".=*} as an Ex :[addr]@{0-9a-z".=*+} Execute the contents of register {0-9a-z".=*+} as an Ex
command. First set cursor at line [addr] (default is command. First set cursor at line [addr] (default is
current line). When the last line in the register does current line). When the last line in the register does
not have a <CR> it will be added automatically when not have a <CR> it will be added automatically when

5
runtime/doc/starting.txt
View File

@ -1,4 +1,4 @@
*starting.txt* For Vim version 7.3. Last change: 2011 Jul 22 *starting.txt* For Vim version 7.3. Last change: 2012 Mar 16
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -248,7 +248,8 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
{not in Vi} {not in Vi}
*-g* *-g*
-g Start Vim in GUI mode. See |gui|. {not in Vi} -g Start Vim in GUI mode. See |gui|. For the opposite see |-v|.
{not in Vi}
*-v* *-v*
-v Start Ex in Vi mode. Only makes a difference when the -v Start Ex in Vi mode. Only makes a difference when the

10
runtime/doc/syntax.txt
View File

@ -1,4 +1,4 @@
*syntax.txt* For Vim version 7.3. Last change: 2012 Feb 11 *syntax.txt* For Vim version 7.3. Last change: 2012 Mar 28
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -199,7 +199,8 @@ REPLACING AN EXISTING SYNTAX FILE *mysyntaxfile-replace*
If you don't like a distributed syntax file, or you have downloaded a new If you don't like a distributed syntax file, or you have downloaded a new
version, follow the same steps as for |mysyntaxfile| above. Just make sure version, follow the same steps as for |mysyntaxfile| above. Just make sure
that you write the syntax file in a directory that is early in 'runtimepath'. that you write the syntax file in a directory that is early in 'runtimepath'.
Vim will only load the first syntax file found. Vim will only load the first syntax file found, assuming that it sets
b:current_syntax.
NAMING CONVENTIONS *group-name* *{group-name}* *E669* *W18* NAMING CONVENTIONS *group-name* *{group-name}* *E669* *W18*
@ -754,7 +755,8 @@ c_no_ansi don't do standard ANSI types and constants
c_ansi_typedefs ... but do standard ANSI types c_ansi_typedefs ... but do standard ANSI types
c_ansi_constants ... but do standard ANSI constants c_ansi_constants ... but do standard ANSI constants
c_no_utf don't highlight \u and \U in strings c_no_utf don't highlight \u and \U in strings
c_syntax_for_h use C syntax for *.h files, instead of C++ c_syntax_for_h for *.h files use C syntax instead of C++ and use objc
syntax instead of objcpp
c_no_if0 don't highlight "#if 0" blocks as comments c_no_if0 don't highlight "#if 0" blocks as comments
c_no_cformat don't highlight %-formats in strings c_no_cformat don't highlight %-formats in strings
c_no_c99 don't highlight C99 standard items c_no_c99 don't highlight C99 standard items
@ -4421,6 +4423,8 @@ IncSearch 'incsearch' highlighting; also used for the text replaced with
*hl-LineNr* *hl-LineNr*
LineNr Line number for ":number" and ":#" commands, and when 'number' LineNr Line number for ":number" and ":#" commands, and when 'number'
or 'relativenumber' option is set. or 'relativenumber' option is set.
*hl-CursorLineNr*
CursorLineNr Like LineNr when 'cursorline' is set for the cursor line.
*hl-MatchParen* *hl-MatchParen*
MatchParen The character under the cursor or just before it, if it MatchParen The character under the cursor or just before it, if it
is a paired bracket, and its match. |pi_paren.txt| is a paired bracket, and its match. |pi_paren.txt|

26
runtime/doc/todo.txt
View File

@ -1,4 +1,4 @@
*todo.txt* For Vim version 7.3. Last change: 2012 Mar 07 *todo.txt* For Vim version 7.3. Last change: 2012 Mar 28
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -34,6 +34,8 @@ not be repeated below, unless there is extra information.
*known-bugs* *known-bugs*
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
Go through list of maintainers that didn't respond. (Thilo Six, Mar 19)
Go through more coverity reports. Go through more coverity reports.
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10) Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
@ -63,11 +65,8 @@ Win32: When the taskbar is at the top of the screen creating the tabbar causes
the window to move unnecessarily. (William E. Skeith III, 2012 Jan 12) the window to move unnecessarily. (William E. Skeith III, 2012 Jan 12)
Patch: 2012 Jan 13 Needs more work (2012 Feb 2) Patch: 2012 Jan 13 Needs more work (2012 Feb 2)
Patch to highlight cursor line number. (Howard Buchholz (lhb), 2011 Oct 18)
URXVT: URXVT:
- will get stuck if byte sequence does not containe expected semicolon. - will get stuck if byte sequence does not containe expected semicolon.
- Patch for urxvt mouse support after shell command. (Issue 31)
- Use urxvt mouse support also in xterm. Explanations: - Use urxvt mouse support also in xterm. Explanations:
http://www.midnight-commander.org/ticket/2662 http://www.midnight-commander.org/ticket/2662
@ -79,15 +78,6 @@ When exiting with unsaved changes, selecting an existing file in the file
dialog, there is no dialog to ask whether the existing file should be dialog, there is no dialog to ask whether the existing file should be
overwritten. (Felipe G. Nievinski, 2011 Dec 22) overwritten. (Felipe G. Nievinski, 2011 Dec 22)
Patch for improved ":qa" behavior. (Hirohito Higashi, 2012 Feb 18)
Recognize objcpp. (Austin Ziegler, 2012 Feb 15)
7 Setting an option always sets "w_set_curswant", while this is only
required for a few options. Only do it for those options to avoid the
side effect.
Patch by Kana Natsuno, 2011 Nov 12.
Using Ctrl-] in a mapping does not expand abbreviations. Patch by Christian Using Ctrl-] in a mapping does not expand abbreviations. Patch by Christian
Brabandt, 2012 Mar 2. Brabandt, 2012 Mar 2.
@ -99,8 +89,6 @@ Patch for option in 'cino' to specify more indent for continued conditions.
(Lech Lorens, 2011 Nov 27) (Lech Lorens, 2011 Nov 27)
Isn't this already possible? Update 2012 Feb 15. Isn't this already possible? Update 2012 Feb 15.
Patch for using objcpp file type for headers files. Issue 44.
Docs fix for v:register. (Ingo Karkat, 2011 Sep 26, 27) Docs fix for v:register. (Ingo Karkat, 2011 Sep 26, 27)
v:register doesn't work exactly as expected. (David Fishburn, 2011 Sep 20) v:register doesn't work exactly as expected. (David Fishburn, 2011 Sep 20)
@ -123,6 +111,9 @@ Matsumoto, 2012 Jan 30)
Patch to add completion for :history command. (Dominique Pelle, 2012 Feb 26) Patch to add completion for :history command. (Dominique Pelle, 2012 Feb 26)
Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope,
2012 Mar 21)
Use a count before "v" and "V" to select that many characters or lines? Use a count before "v" and "V" to select that many characters or lines?
(Kikyous) (Kikyous)
@ -195,6 +186,9 @@ Sep 17) Asked for feedback from others.
Win32: Cannot cd into a directory that starts with a space. (Andy Wokula, 2012 Win32: Cannot cd into a directory that starts with a space. (Andy Wokula, 2012
Jan 19) Jan 19)
Win32: default for 'backupcopy' is wrong for a symbolic link. (mklink one
two). (Benjamin Fritz, 2012 Mar 15)
Need to escape $HOME on Windows? (ZyX, 2011 Jul 21) Need to escape $HOME on Windows? (ZyX, 2011 Jul 21)
"2" in 'formatopions' not working in comments. (Christian Corneliussen, 2011 "2" in 'formatopions' not working in comments. (Christian Corneliussen, 2011
@ -511,6 +505,8 @@ path.
Test 51 fails when language set to German. (Marco, 2011 Jan 9) Test 51 fails when language set to German. (Marco, 2011 Jan 9)
Dominique can't reproduc it. Dominique can't reproduc it.
'ambiwidth' should be global-local.
":function f(x) keepjumps" creates a function where every command is executed ":function f(x) keepjumps" creates a function where every command is executed
like it has ":keepjumps" before it. like it has ":keepjumps" before it.

4
runtime/doc/usr_41.txt
View File

@ -1,4 +1,4 @@
*usr_41.txt* For Vim version 7.3. Last change: 2011 Dec 15 *usr_41.txt* For Vim version 7.3. Last change: 2012 Mar 16
VIM USER MANUAL - by Bram Moolenaar VIM USER MANUAL - by Bram Moolenaar
@ -1710,6 +1710,7 @@ make the script work for most people. It is done like this: >
12 set cpo&vim 12 set cpo&vim
.. ..
42 let &cpo = s:save_cpo 42 let &cpo = s:save_cpo
43 unlet s:save_cpo
We first store the old value of 'cpoptions' in the s:save_cpo variable. At We first store the old value of 'cpoptions' in the s:save_cpo variable. At
the end of the plugin this value is restored. the end of the plugin this value is restored.
@ -1956,6 +1957,7 @@ Here is the resulting complete example: >
40 endif 40 endif
41 41
42 let &cpo = s:save_cpo 42 let &cpo = s:save_cpo
43 unlet s:save_cpo
Line 33 wasn't explained yet. It applies the new correction to the word under Line 33 wasn't explained yet. It applies the new correction to the word under
the cursor. The |:normal| command is used to use the new abbreviation. Note the cursor. The |:normal| command is used to use the new abbreviation. Note

8
runtime/filetype.vim
View File

@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2012 Feb 24 " Last Change: 2012 Mar 28
" Listen very carefully, I will say this only once " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")
@ -367,7 +367,11 @@ au BufNewFile,BufRead *.h call s:FTheader()
func! s:FTheader() func! s:FTheader()
if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1 if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
setf objc if exists("g:c_syntax_for_h")
setf objc
else
setf objcpp
endif
elseif exists("g:c_syntax_for_h") elseif exists("g:c_syntax_for_h")
setf c setf c
elseif exists("g:ch_syntax_for_h") elseif exists("g:ch_syntax_for_h")

6
runtime/ftplugin/falcon.vim
View File

@ -1,7 +1,7 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Falcon " Language: Falcon
" Author: Steven Oliver <oliver.steven@gmail.com> " Author: Steven Oliver <oliver.steven@gmail.com>
" Copyright: Copyright (c) 2009, 2010, 2011 Steven Oliver " Copyright: Copyright (c) 2009, 2010, 2011, 2012 Steven Oliver
" License: You may redistribute this under the same terms as Vim itself " License: You may redistribute this under the same terms as Vim itself
" -------------------------------------------------------------------------- " --------------------------------------------------------------------------
" GetLatestVimScripts: 2762 1 :AutoInstall: falcon.vim " GetLatestVimScripts: 2762 1 :AutoInstall: falcon.vim
@ -40,6 +40,10 @@ if has("gui_win32") && !exists("b:browsefilter")
\ "All Files (*.*)\t*.*\n" \ "All Files (*.*)\t*.*\n"
endif endif
let b:undo_ftplugin = "setlocal tabstop< shiftwidth< expandtab< fileencoding<"
\ . " suffixesadd< comments<"
\ . "| unlet! b:browsefiler"
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save

10
runtime/ftplugin/kwt.vim
View File

@ -1,7 +1,7 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Kimwitu++ " Language: Kimwitu++
" Maintainer: Michael Piefel <entwurf@piefel.de> " Maintainer: Michael Piefel <entwurf@piefel.de>
" Last Change: 10 December 2011 " Last Change: 10 March 2012
" Behaves almost like C++ " Behaves almost like C++
runtime! ftplugin/cpp.vim ftplugin/cpp_*.vim ftplugin/cpp/*.vim runtime! ftplugin/cpp.vim ftplugin/cpp_*.vim ftplugin/cpp/*.vim
@ -20,5 +20,13 @@ endif
" Set the errorformat for the Kimwitu++ compiler " Set the errorformat for the Kimwitu++ compiler
set efm+=kc%.%#:\ error\ at\ %f:%l:\ %m set efm+=kc%.%#:\ error\ at\ %f:%l:\ %m
if exists("b:undo_ftplugin")
let b:undo_ftplugin = b:undo_ftplugin . " | setlocal efm<"
\ . "| unlet! b:browsefiler"
else
let b:undo_ftplugin = "setlocal efm<"
\ . "| unlet! b:browsefiler"
endif
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save

6
runtime/ftplugin/vim.vim
View File

@ -1,7 +1,7 @@
" Vim filetype plugin " Vim filetype plugin
" Language: Vim " Language: Vim
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2009 Jan 22 " Last Change: 2012 Mar 21
" Only do this when not done yet for this buffer " Only do this when not done yet for this buffer
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
@ -21,6 +21,10 @@ let b:undo_ftplugin = "setl fo< isk< com< tw< commentstring<"
" and insert the comment leader when hitting <CR> or using "o". " and insert the comment leader when hitting <CR> or using "o".
setlocal fo-=t fo+=croql setlocal fo-=t fo+=croql
" To make syntax highlighting of 'vimVar's work correctly we need the colon to
" be part of keywords. This needs to be done prior to the 'isk+=#' below.
setlocal isk+=:
" To allow tag lookup via CTRL-] for autoload functions, '#' must be a " To allow tag lookup via CTRL-] for autoload functions, '#' must be a
" keyword character. E.g., for netrw#Nread(). " keyword character. E.g., for netrw#Nread().
setlocal isk+=# setlocal isk+=#

1
runtime/indent/dtd.vim
View File

@ -322,3 +322,4 @@ function GetDTDIndent()
endfunction endfunction
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save

155
runtime/indent/tex.vim
View File

@ -1,33 +1,54 @@
" Vim indent file " Vim indent file
" Language: LaTeX " Language: LaTeX
" Maintainer: Zhou YiChao <broken.zhou@gmail.com> " Maintainer: Zhou YiChao <broken.zhou AT gmail.com>
" Created: Sat, 16 Feb 2002 16:50:19 +0100 " Created: Sat, 16 Feb 2002 16:50:19 +0100
" Last Change: 2011 Dec 24 " Last Change: 2012 Mar 18 19:19:50
" Last Update: 25th Sep 2002, by LH : " Version: 0.7
" Please email me if you found something we can do. Bug report and
" feature request is welcome.
" Last Update: {{{
" 25th Sep 2002, by LH :
" (*) better support for the option " (*) better support for the option
" (*) use some regex instead of several '||'. " (*) use some regex instead of several '||'.
" Oct 9th, 2003, by JT: " Oct 9th, 2003, by JT:
" (*) don't change indentation of lines starting with '%' " (*) don't change indentation of lines starting with '%'
" 2005/06/15, Moshe Kaminsky <kaminsky@math.huji.ac.il> " 2005/06/15, Moshe Kaminsky <kaminsky AT math.huji.ac.il>
" (*) New variables: " (*) New variables:
" g:tex_items, g:tex_itemize_env, g:tex_noindent_env " g:tex_items, g:tex_itemize_env, g:tex_noindent_env
" 2011/3/6, by Zhou YiChao <broken.zhou@gmail.com> " 2011/3/6, by Zhou YiChao <broken.zhou AT gmail.com>
" (*) Don't change indentation of lines starting with '%' " (*) Don't change indentation of lines starting with '%'
" I don't see any code with '%' and it doesn't work properly " I don't see any code with '%' and it doesn't work properly
" so I add some code. " so I add some code.
" (*) New features: Add smartindent-like indent for "{}" and "[]". " (*) New features: Add smartindent-like indent for "{}" and "[]".
" (*) New variables: g:tex_indent_brace " (*) New variables: g:tex_indent_brace
" 2011/9/25, by Zhou Yichao <broken.zhou@gmail.com> " 2011/9/25, by Zhou Yichao <broken.zhou AT gmail.com>
" (*) Bug fix: smartindent-like indent for "[]" " (*) Bug fix: smartindent-like indent for "[]"
" (*) New features: Align with "&". " (*) New features: Align with "&".
" (*) New variable: g:tex_indent_and " (*) New variable: g:tex_indent_and.
" 2011/10/23 by Zhou Yichao <broken.zhou@gmail.com> " 2011/10/23 by Zhou Yichao <broken.zhou AT gmail.com>
" (*) Bug fix: improve the smartindent-like indent for "{}" and " (*) Bug fix: improve the smartindent-like indent for "{}" and
" "[]". " "[]".
" " 2012/02/27 by Zhou Yichao <broken.zhou AT gmail.com>
" Version: 0.62 " (*) Bug fix: support default folding marker.
" (*) Indent with "&" is not very handy. Make it not enable by
" default.
" 2012/03/06 by Zhou Yichao <broken.zhou AT gmail.com>
" (*) Modify "&" behavior and make it default again. Now "&"
" won't align when there are more then one "&" in the previous
" line.
" (*) Add indent "\left(" and "\right)"
" (*) Trust user when in "verbatim" and "lstlisting"
" 2012/03/11 by Zhou Yichao <broken.zhou AT gmail.com>
" (*) Modify "&" so that only indent when current line start with
" "&".
" 2012/03/12 by Zhou Yichao <broken.zhou AT gmail.com>
" (*) Modify indentkeys.
" 2012/03/18 by Zhou Yichao <broken.zhou AT gmail.com>
" (*) Add &cpo
" }}}
" Options: {{{ " Document: {{{
" "
" To set the following options (ok, currently it's just one), add a line like " To set the following options (ok, currently it's just one), add a line like
" let g:tex_indent_items = 1 " let g:tex_indent_items = 1
@ -37,42 +58,42 @@
" "
" If this variable is unset or non-zero, it will use smartindent-like style " If this variable is unset or non-zero, it will use smartindent-like style
" for "{}" and "[]" " for "{}" and "[]"
" "
" * g:tex_indent_items " * g:tex_indent_items
" "
" If this variable is set, item-environments are indented like Emacs does " If this variable is set, item-environments are indented like Emacs does
" it, i.e., continuation lines are indented with a shiftwidth. " it, i.e., continuation lines are indented with a shiftwidth.
" "
" NOTE: I've already set the variable below; delete the corresponding line " NOTE: I've already set the variable below; delete the corresponding line
" if you don't like this behaviour. " if you don't like this behaviour.
" "
" Per default, it is unset. " Per default, it is unset.
" "
" set unset " set unset
" ---------------------------------------------------------------- " ----------------------------------------------------------------
" \begin{itemize} \begin{itemize} " \begin{itemize} \begin{itemize}
" \item blablabla \item blablabla " \item blablabla \item blablabla
" bla bla bla bla bla bla " bla bla bla bla bla bla
" \item blablabla \item blablabla " \item blablabla \item blablabla
" bla bla bla bla bla bla " bla bla bla bla bla bla
" \end{itemize} \end{itemize} " \end{itemize} \end{itemize}
" "
" "
" * g:tex_items " * g:tex_items
" "
" A list of tokens to be considered as commands for the beginning of an item " A list of tokens to be considered as commands for the beginning of an item
" command. The tokens should be separated with '\|'. The initial '\' should " command. The tokens should be separated with '\|'. The initial '\' should
" be escaped. The default is '\\bibitem\|\\item'. " be escaped. The default is '\\bibitem\|\\item'.
" "
" * g:tex_itemize_env " * g:tex_itemize_env
" "
" A list of environment names, separated with '\|', where the items (item " A list of environment names, separated with '\|', where the items (item
" commands matching g:tex_items) may appear. The default is " commands matching g:tex_items) may appear. The default is
" 'itemize\|description\|enumerate\|thebibliography'. " 'itemize\|description\|enumerate\|thebibliography'.
" "
" * g:tex_noindent_env " * g:tex_noindent_env
" "
" A list of environment names. separated with '\|', where no indentation is " A list of environment names. separated with '\|', where no indentation is
" required. The default is 'document\|verbatim'. " required. The default is 'document\|verbatim'.
" "
" * g:tex_indent_and " * g:tex_indent_and
@ -82,14 +103,24 @@
" Note that this feature need to search back some line, so vim may become " Note that this feature need to search back some line, so vim may become
" a little slow. " a little slow.
" "
" }}} " }}}
" Only define the function once
if exists("*GetTeXIndent")
finish
endif
if exists("b:did_indent") if exists("b:did_indent")
finish finish
endif endif
let s:cpo_save = &cpo
set cpo&vim
" Define global variable {{{
let b:did_indent = 1 let b:did_indent = 1
" Delete the next line to avoid the special indention of items
if !exists("g:tex_indent_items") if !exists("g:tex_indent_items")
let g:tex_indent_items = 1 let g:tex_indent_items = 1
endif endif
@ -104,31 +135,30 @@ if g:tex_indent_items
let g:tex_itemize_env = 'itemize\|description\|enumerate\|thebibliography' let g:tex_itemize_env = 'itemize\|description\|enumerate\|thebibliography'
endif endif
if !exists('g:tex_items') if !exists('g:tex_items')
let g:tex_items = '\\bibitem\|\\item' let g:tex_items = '\\bibitem\|\\item'
endif endif
else else
let g:tex_items = '' let g:tex_items = ''
endif endif
if !exists("g:tex_noindent_env") if !exists("g:tex_indent_paretheses")
let g:tex_noindent_env = 'document\|verbatim\|lstlisting' let g:tex_indent_paretheses = 1
endif endif
if !exists("g:tex_noindent_env")
let g:tex_noindent_env = 'document\|verbatim\|lstlisting'
endif "}}}
" VIM Setting " {{{
setlocal autoindent setlocal autoindent
setlocal nosmartindent setlocal nosmartindent
setlocal indentexpr=GetTeXIndent() setlocal indentexpr=GetTeXIndent()
exec 'setlocal indentkeys+=},],\&' . substitute(g:tex_items, '^\|\(\\|\)', ',=', 'g') setlocal indentkeys&
let g:tex_items = '^\s*' . g:tex_items exec 'setlocal indentkeys+=[,(,{,),},],\&' . substitute(g:tex_items, '^\|\(\\|\)', ',=', 'g')
let g:tex_items = '^\s*' . substitute(g:tex_items, '^\(\^\\s\*\)*', '', '')
" }}}
function GetTeXIndent() " {{{
" Only define the function once
if exists("*GetTeXIndent") | finish
endif
let s:cpo_save = &cpo
set cpo&vim
function GetTeXIndent()
" Find a non-blank line above the current line. " Find a non-blank line above the current line.
let lnum = prevnonblank(v:lnum - 1) let lnum = prevnonblank(v:lnum - 1)
@ -139,16 +169,25 @@ function GetTeXIndent()
" At the start of the file use zero indent. " At the start of the file use zero indent.
if lnum == 0 if lnum == 0
return 0 return 0
endif endif
let line = getline(lnum) " last line let line = substitute(getline(lnum), '%.*', ' ','g') " last line
let cline = getline(v:lnum) " current line let cline = substitute(getline(v:lnum), '%.*', ' ', 'g') " current line
" We are in verbatim, so do what our user what.
if synIDattr(synID(v:lnum, indent(v:lnum), 1), "name") == "texZone"
if empty(cline)
return indent(lnum)
else
return indent(v:lnum)
end
endif
" You want to align with "&" " You want to align with "&"
if g:tex_indent_and if g:tex_indent_and
" Align with last line if last line has a "&" " Align only when current line start with "&"
if stridx(cline, "&") != -1 && stridx(line, "&") != -1 if line =~ '&.*\\\\' && cline =~ '^\s*&'
return indent(v:lnum) + stridx(line, "&") - stridx(cline, "&") return indent(v:lnum) + stridx(line, "&") - stridx(cline, "&")
endif endif
@ -161,7 +200,7 @@ function GetTeXIndent()
if lnum == 0 if lnum == 0
return 0 return 0
endif endif
let ind = indent(lnum) let ind = indent(lnum)
@ -173,12 +212,10 @@ function GetTeXIndent()
" Add a 'shiftwidth' after beginning of environments. " Add a 'shiftwidth' after beginning of environments.
" Don't add it for \begin{document} and \begin{verbatim} " Don't add it for \begin{document} and \begin{verbatim}
""if line =~ '^\s*\\begin{\(.*\)}' && line !~ 'verbatim' ""if line =~ '^\s*\\begin{\(.*\)}' && line !~ 'verbatim'
" LH modification : \begin does not always start a line " LH modification : \begin does not always start a line
" ZYC modification : \end after \begin won't cause wrong indent anymore " ZYC modification : \end after \begin won't cause wrong indent anymore
if line =~ '\\begin{.*}' && line !~ g:tex_noindent_env if line =~ '\\begin{.*}' && line !~ g:tex_noindent_env
\ && line !~ '\\begin{.\{-}}.*\\end{.*}'
let ind = ind + &sw let ind = ind + &sw
if g:tex_indent_items if g:tex_indent_items
@ -189,9 +226,8 @@ function GetTeXIndent()
endif endif
endif endif
" Subtract a 'shiftwidth' when an environment ends " Subtract a 'shiftwidth' when an environment ends
if cline =~ '^\s*\\end' && cline !~ g:tex_noindent_env if cline =~ '\\end{.*}' && cline !~ g:tex_noindent_env
if g:tex_indent_items if g:tex_indent_items
" Remove another sw for item-environments " Remove another sw for item-environments
@ -204,23 +240,26 @@ function GetTeXIndent()
endif endif
if g:tex_indent_brace if g:tex_indent_brace
" Add a 'shiftwidth' after a "{" or "[".
let sum1 = 0 let sum1 = 0
for i in range(0, strlen(line)-1) for i in range(0, strlen(line)-1)
if line[i] == "}" || line[i] == "]" if line[i] == "}" || line[i] == "]" ||
\ strpart(line, i, 7) == '\right)'
let sum1 = max([0, sum1-1]) let sum1 = max([0, sum1-1])
endif endif
if line[i] == "{" || line[i] == "[" if line[i] == "{" || line[i] == "[" ||
\ strpart(line, i, 6) == '\left('
let sum1 += 1 let sum1 += 1
endif endif
endfor endfor
let sum2 = 0 let sum2 = 0
for i in reverse(range(0, strlen(cline)-1)) for i in reverse(range(0, strlen(cline)-1))
if cline[i] == "{" || cline[i] == "[" if cline[i] == "{" || cline[i] == "[" ||
\ strpart(cline, i, 6) == '\left('
let sum2 = max([0, sum2-1]) let sum2 = max([0, sum2-1])
endif endif
if cline[i] == "}" || cline[i] == "]" if cline[i] == "}" || cline[i] == "]" ||
\ strpart(cline, i, 7) == '\right)'
let sum2 += 1 let sum2 += 1
endif endif
endfor endfor
@ -228,6 +267,8 @@ function GetTeXIndent()
let ind += (sum1 - sum2) * &sw let ind += (sum1 - sum2) * &sw
endif endif
if g:tex_indent_paretheses
endif
" Special treatment for 'item' " Special treatment for 'item'
" ---------------------------- " ----------------------------
@ -247,7 +288,7 @@ function GetTeXIndent()
endif endif
return ind return ind
endfunction endfunction "}}}
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save

1
runtime/macros/matchit.vim
View File

@ -808,5 +808,6 @@ fun! s:ParseSkip(str)
endfun endfun
let &cpo = s:save_cpo let &cpo = s:save_cpo
unlet s:save_cpo
" vim:sts=2:sw=2: " vim:sts=2:sw=2:

5
runtime/syntax/sh.vim
View File

@ -2,8 +2,8 @@
" Language: shell (sh) Korn shell (ksh) bash (sh) " Language: shell (sh) Korn shell (ksh) bash (sh)
" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
" Last Change: Dec 09, 2011 " Last Change: Mar 19, 2012
" Version: 121 " Version: 122
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
" For options and settings, please use: :help ft-sh-syntax " For options and settings, please use: :help ft-sh-syntax
" This file includes many ideas from ?ric Brunet (eric.brunet@ens.fr) " This file includes many ideas from ?ric Brunet (eric.brunet@ens.fr)
@ -263,6 +263,7 @@ syn match shEscape contained '\\.' contains=@shCommandSubList
if exists("b:is_kornshell") || exists("b:is_bash") if exists("b:is_kornshell") || exists("b:is_bash")
syn region shCommandSub matchgroup=shCmdSubRegion start="\$(" skip='\\\\\|\\.' end=")" contains=@shCommandSubList syn region shCommandSub matchgroup=shCmdSubRegion start="\$(" skip='\\\\\|\\.' end=")" contains=@shCommandSubList
syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList
syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList
syn match shSkipInitWS contained "^\s\+" syn match shSkipInitWS contained "^\s\+"
elseif !exists("g:sh_no_error") elseif !exists("g:sh_no_error")
syn region shCommandSub matchgroup=Error start="\$(" end=")" contains=@shCommandSubList syn region shCommandSub matchgroup=Error start="\$(" end=")" contains=@shCommandSubList

8
src/VisVim/README_VisVim.txt
View File

@ -17,12 +17,16 @@ own window.
VisVim is based upon VisEmacs by Christopher Payne VisVim is based upon VisEmacs by Christopher Payne
(Copyright (C) Christopher Payne 1997). (Copyright (C) Christopher Payne 1997).
Author: Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de> Author: Heiko Erhardt <heiko.erhardt@gmx.net>
Based upon: VisEmacs by Christopher Payne <payneca@sagian.com> Based upon: VisEmacs by Christopher Payne <payneca@sagian.com>
Version: 1.0 Version: 1.0
Created: 23 Oct 1997 Created: 23 Oct 1997
Date: 23 Oct 1997 Date: 23 Oct 1997
VisVim was originally GNU GPL licensed, as stated below. On March 21 2012
Heiko Erhardt declared this work to be relicensed under the Vim license, as
stated in ../../runtime/doc/uganda.txt (or ":help uganda" in Vim).
VisVim is free software; you can redistribute it and/or modify VisVim is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option) the Free Software Foundation; either version 2, or (at your option)
@ -318,5 +322,5 @@ Known Problems
Have fun! Have fun!
Heiko Erhardt Heiko Erhardt
Heiko.Erhardt@munich.netsurf.de heiko.erhardt@gmx.net

222
src/po/nl.po
View File

@ -9,12 +9,12 @@ msgstr ""
"Project-Id-Version: vim 7.3\n" "Project-Id-Version: vim 7.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-05-29 07:43+0200\n" "POT-Creation-Date: 2011-05-29 07:43+0200\n"
"PO-Revision-Date: 2012-02-25 18:01+0100\n" "PO-Revision-Date: 2012-03-28 08:07+0200\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n" "Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
"Language-Team: Dutch <vertaling@vrijschrift.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.nl>\n"
"Language: nl\n" "Language: nl\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@ -105,12 +105,12 @@ msgstr "E87: kan niet voorbij het laatste buffer komen"
#: buffer.c:1021 #: buffer.c:1021
msgid "E88: Cannot go before first buffer" msgid "E88: Cannot go before first buffer"
msgstr "E88: kan niet voor het eerste buffer komen" msgstr "E88: kan niet vóór het eerste buffer komen"
#: buffer.c:1063 #: buffer.c:1063
#, c-format #, c-format
msgid "E89: No write since last change for buffer %ld (add ! to override)" msgid "E89: No write since last change for buffer %ld (add ! to override)"
msgstr "E89: niets opgeslagen sinds laatste wijziging van buffer %ld (voeg ! toe om dit te negeren)" msgstr "E89: niets opgeslagen sinds laatste wijziging van buffer %ld (voeg ! toe om te forceren)"
#: buffer.c:1080 #: buffer.c:1080
msgid "E90: Cannot unload last buffer" msgid "E90: Cannot unload last buffer"
@ -209,7 +209,7 @@ msgstr "Alles"
#: buffer.c:4188 #: buffer.c:4188
msgid "Bot" msgid "Bot"
msgstr "Bod" msgstr "Bodem"
#: buffer.c:4191 #: buffer.c:4191
msgid "Top" msgid "Top"
@ -1657,11 +1657,11 @@ msgstr "Gegroet, Vim-gebruiker!"
#: ex_docmd.c:6492 #: ex_docmd.c:6492
msgid "E784: Cannot close last tab page" msgid "E784: Cannot close last tab page"
msgstr "E784: laatste tab-pagina kan niet afgesloten worden" msgstr "E784: laatste tabpagina kan niet afgesloten worden"
#: ex_docmd.c:6534 #: ex_docmd.c:6534
msgid "Already only one tab page" msgid "Already only one tab page"
msgstr "Reeds beperkt tot één tab-pagina" msgstr "Reeds beperkt tot één tabpagina"
#: ex_docmd.c:7221 #: ex_docmd.c:7221
msgid "Edit File in new window" msgid "Edit File in new window"
@ -1670,7 +1670,7 @@ msgstr "Bestand in nieuw venster bewerken"
#: ex_docmd.c:7347 #: ex_docmd.c:7347
#, c-format #, c-format
msgid "Tab page %d" msgid "Tab page %d"
msgstr "Tab-pagina %d" msgstr "Tabpagina %d"
#: ex_docmd.c:7739 #: ex_docmd.c:7739
msgid "No swap file" msgid "No swap file"
@ -1694,7 +1694,7 @@ msgstr "E187: onbekend"
#: ex_docmd.c:8128 #: ex_docmd.c:8128
msgid "E465: :winsize requires two number arguments" msgid "E465: :winsize requires two number arguments"
msgstr "E465: :winsize vereist twee getalsargumenten" msgstr "E465: :winsize vereist twee getallen als argument"
#: ex_docmd.c:8190 #: ex_docmd.c:8190
#, c-format #, c-format
@ -1703,11 +1703,11 @@ msgstr "Vensterpositie: X %d, Y %d"
#: ex_docmd.c:8195 #: ex_docmd.c:8195
msgid "E188: Obtaining window position not implemented for this platform" msgid "E188: Obtaining window position not implemented for this platform"
msgstr "E188: verkrijgen van vensterpositie is voor dit platform niet geïmplementeerd" msgstr "E188: verkrijgen van vensterpositie is voor dit platform niet geïmplementeerd"
#: ex_docmd.c:8205 #: ex_docmd.c:8205
msgid "E466: :winpos requires two number arguments" msgid "E466: :winpos requires two number arguments"
msgstr "E466: :winpos vereist twee getalsargumenten" msgstr "E466: :winpos vereist twee getallen als argument"
#: ex_docmd.c:8565 #: ex_docmd.c:8565
msgid "Save Redirection" msgid "Save Redirection"
@ -3873,7 +3873,7 @@ msgstr "-unregister\t\tgvim afmelden voor OLE"
#: main.c:3101 #: main.c:3101
msgid "-g\t\t\tRun using GUI (like \"gvim\")" msgid "-g\t\t\tRun using GUI (like \"gvim\")"
msgstr "-g\t\t\tmet GUI opstarten (zoals \"gvim\")" msgstr "-g\t\t\tMet GUI opstarten (zoals \"gvim\")"
#: main.c:3102 #: main.c:3102
msgid "-f or --nofork\tForeground: Don't fork when starting GUI" msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
@ -3913,7 +3913,7 @@ msgstr "-m\t\t\tAanpassingen (bestanden opslaan) niet toegestaan"
#: main.c:3114 #: main.c:3114
msgid "-M\t\t\tModifications in text not allowed" msgid "-M\t\t\tModifications in text not allowed"
msgstr "-M\t\t\tTektuele aanpassingen niet toegestaan" msgstr "-M\t\t\tTekstuele aanpassingen niet toegestaan"
#: main.c:3115 #: main.c:3115
msgid "-b\t\t\tBinary mode" msgid "-b\t\t\tBinary mode"
@ -3933,51 +3933,51 @@ msgstr "-N\t\t\tNiet volledig met Vi uitwisselbaar: 'nocompatible'"
#: main.c:3121 #: main.c:3121
msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]" msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
msgstr "-V[N][fname]\t\twees uitbundig [niveau N] [schrijf berichten naar fname]" msgstr "-V[N][fname]\t\tWees uitbundig [niveau N] [schrijf berichten naar fname]"
#: main.c:3123 #: main.c:3123
msgid "-D\t\t\tDebugging mode" msgid "-D\t\t\tDebugging mode"
msgstr "-D\t\t\tfoutopspoormodus" msgstr "-D\t\t\tFoutopspoormodus"
#: main.c:3125 #: main.c:3125
msgid "-n\t\t\tNo swap file, use memory only" msgid "-n\t\t\tNo swap file, use memory only"
msgstr "-n\t\t\tgeen wisselbestand, alleen geheugen gebruiken" msgstr "-n\t\t\tGeen wisselbestand, alleen geheugen gebruiken"
#: main.c:3126 #: main.c:3126
msgid "-r\t\t\tList swap files and exit" msgid "-r\t\t\tList swap files and exit"
msgstr "-r\t\t\twisselbestanden tonen en stoppen" msgstr "-r\t\t\tWisselbestanden tonen en stoppen"
#: main.c:3127 #: main.c:3127
msgid "-r (with file name)\tRecover crashed session" msgid "-r (with file name)\tRecover crashed session"
msgstr "-r (met bestandsnaam)\therstel ontspoorde sessie" msgstr "-r (bestandsnaam)\tHerstel ontspoorde sessie"
#: main.c:3128 #: main.c:3128
msgid "-L\t\t\tSame as -r" msgid "-L\t\t\tSame as -r"
msgstr "-L\t\t\tgelijk aan -r" msgstr "-L\t\t\tGelijk aan -r"
#: main.c:3130 #: main.c:3130
msgid "-f\t\t\tDon't use newcli to open window" msgid "-f\t\t\tDon't use newcli to open window"
msgstr "-f\t\t\tgebruik geen newcli om venster te openen" msgstr "-f\t\t\tGebruik geen newcli om venster te openen"
#: main.c:3131 #: main.c:3131
msgid "-dev <device>\t\tUse <device> for I/O" msgid "-dev <device>\t\tUse <device> for I/O"
msgstr "-dev <device>\t\tgebruik <device> voor in- en uitvoer" msgstr "-dev <device>\t\tGebruik <device> voor in- en uitvoer"
#: main.c:3134 #: main.c:3134
msgid "-A\t\t\tstart in Arabic mode" msgid "-A\t\t\tstart in Arabic mode"
msgstr "" msgstr "-A\t\t\tIn Arabische modus starten"
#: main.c:3137 #: main.c:3137
msgid "-H\t\t\tStart in Hebrew mode" msgid "-H\t\t\tStart in Hebrew mode"
msgstr "" msgstr "-H\t\t\tIn Hebrewsche modus starten"
#: main.c:3140 #: main.c:3140
msgid "-F\t\t\tStart in Farsi mode" msgid "-F\t\t\tStart in Farsi mode"
msgstr "" msgstr "-F\t\t\tIn Perzische modus starten"
#: main.c:3142 #: main.c:3142
msgid "-T <terminal>\tSet terminal type to <terminal>" msgid "-T <terminal>\tSet terminal type to <terminal>"
msgstr "" msgstr "-T <terminal>\tTerminalsoort op <terminal> instellen"
#: main.c:3143 #: main.c:3143
msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc" msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
@ -3997,27 +3997,27 @@ msgstr "-p[N]\t\tN tabpagina's openen (standaard: 1 per bestand)"
#: main.c:3150 #: main.c:3150
msgid "-o[N]\t\tOpen N windows (default: one for each file)" msgid "-o[N]\t\tOpen N windows (default: one for each file)"
msgstr "" msgstr "-o[N]\t\tN vensters openen (standaard: 1 per bestand)"
#: main.c:3151 #: main.c:3151
msgid "-O[N]\t\tLike -o but split vertically" msgid "-O[N]\t\tLike -o but split vertically"
msgstr "" msgstr "-O[N]\t\tGelijk aan -o maar vertikaal gesplitst"
#: main.c:3153 #: main.c:3153
msgid "+\t\t\tStart at end of file" msgid "+\t\t\tStart at end of file"
msgstr "" msgstr "+\t\t\tAan einde van bestand beginnen"
#: main.c:3154 #: main.c:3154
msgid "+<lnum>\t\tStart at line <lnum>" msgid "+<lnum>\t\tStart at line <lnum>"
msgstr "" msgstr "+<lnum>\t\tOp regel <lnum> beginnen"
#: main.c:3155 #: main.c:3155
msgid "--cmd <command>\tExecute <command> before loading any vimrc file" msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
msgstr "" msgstr "--cmd <opdracht>\tOpdracht <opdracht> uitvoeren voor enige vimrc-bestand"
#: main.c:3156 #: main.c:3156
msgid "-c <command>\t\tExecute <command> after loading the first file" msgid "-c <command>\t\tExecute <command> after loading the first file"
msgstr "" msgstr "-c <opdracht>\t\tOpdracht <opdracht> uitvoeren na eerste bestand"
#: main.c:3157 #: main.c:3157
msgid "-S <session>\t\tSource file <session> after loading the first file" msgid "-S <session>\t\tSource file <session> after loading the first file"
@ -4552,124 +4552,139 @@ msgid ""
"You may want to delete the .swp file now.\n" "You may want to delete the .swp file now.\n"
"\n" "\n"
msgstr "" msgstr ""
"\n"
"Het .swp-bestand kan nu verwijderd worden.\n"
"\n"
#. use msg() to start the scrolling properly #. use msg() to start the scrolling properly
#: memline.c:1462 #: memline.c:1462
msgid "Swap files found:" msgid "Swap files found:"
msgstr "" msgstr "Gevonden wisselbestanden:"
#: memline.c:1649 #: memline.c:1649
msgid " In current directory:\n" msgid " In current directory:\n"
msgstr "" msgstr " In huidige map:\n"
#: memline.c:1651 #: memline.c:1651
msgid " Using specified name:\n" msgid " Using specified name:\n"
msgstr "" msgstr " Gebruikt opgegeven naam:\n"
#: memline.c:1655 #: memline.c:1655
msgid " In directory " msgid " In directory "
msgstr "" msgstr " In map "
#: memline.c:1673 #: memline.c:1673
msgid " -- none --\n" msgid " -- none --\n"
msgstr "" msgstr " -- geen --\n"
#: memline.c:1748 #: memline.c:1748
msgid " owned by: " msgid " owned by: "
msgstr "" msgstr " eigenaar: "
#: memline.c:1750 #: memline.c:1750
msgid " dated: " msgid " dated: "
msgstr "" msgstr " datum: "
#: memline.c:1754 #: memline.c:1754
#: memline.c:3794 #: memline.c:3794
msgid " dated: " msgid " dated: "
msgstr "" msgstr " datum: "
#: memline.c:1773 #: memline.c:1773
msgid " [from Vim version 3.0]" msgid " [from Vim version 3.0]"
msgstr "" msgstr " [van Vim-versie 3.0]"
#: memline.c:1777 #: memline.c:1777
msgid " [does not look like a Vim swap file]" msgid " [does not look like a Vim swap file]"
msgstr "" msgstr " [lijkt geen Vvim-wisselbestand te zijn]"
#: memline.c:1781 #: memline.c:1781
msgid " file name: " msgid " file name: "
msgstr "" msgstr " bestandsnaam: "
#: memline.c:1787 #: memline.c:1787
msgid "" msgid ""
"\n" "\n"
" modified: " " modified: "
msgstr "" msgstr ""
"\n"
" bewerkt: "
#: memline.c:1788 #: memline.c:1788
msgid "YES" msgid "YES"
msgstr "" msgstr "JA"
#: memline.c:1788 #: memline.c:1788
msgid "no" msgid "no"
msgstr "" msgstr "nee"
#: memline.c:1792 #: memline.c:1792
msgid "" msgid ""
"\n" "\n"
" user name: " " user name: "
msgstr "" msgstr ""
"\n"
" gebruikersnaam: "
#: memline.c:1799 #: memline.c:1799
msgid " host name: " msgid " host name: "
msgstr "" msgstr " host-naam:"
#: memline.c:1801 #: memline.c:1801
msgid "" msgid ""
"\n" "\n"
" host name: " " host name: "
msgstr "" msgstr ""
"\n"
" host-naam: "
#: memline.c:1807 #: memline.c:1807
msgid "" msgid ""
"\n" "\n"
" process ID: " " process ID: "
msgstr "" msgstr ""
"\n"
" proces-id: "
#: memline.c:1813 #: memline.c:1813
msgid " (still running)" msgid " (still running)"
msgstr "" msgstr " (nog actief)"
#: memline.c:1825 #: memline.c:1825
msgid "" msgid ""
"\n" "\n"
" [not usable with this version of Vim]" " [not usable with this version of Vim]"
msgstr "" msgstr ""
"\n"
" [onbruikbaar met deze versie van Vim]"
#: memline.c:1828 #: memline.c:1828
msgid "" msgid ""
"\n" "\n"
" [not usable on this computer]" " [not usable on this computer]"
msgstr "" msgstr ""
"\n"
" [onbruikbaar op deze computer]"
#: memline.c:1833 #: memline.c:1833
msgid " [cannot be read]" msgid " [cannot be read]"
msgstr "" msgstr " [lezen is onmogelijk]"
#: memline.c:1837 #: memline.c:1837
msgid " [cannot be opened]" msgid " [cannot be opened]"
msgstr "" msgstr " [openen is onmogelijk]"
#: memline.c:2027 #: memline.c:2027
msgid "E313: Cannot preserve, there is no swap file" msgid "E313: Cannot preserve, there is no swap file"
msgstr "" msgstr "E313: kan niet worden behouden, want er is geen wisselbestand"
#: memline.c:2080 #: memline.c:2080
msgid "File preserved" msgid "File preserved"
msgstr "" msgstr "Bestand behouden"
#: memline.c:2082 #: memline.c:2082
msgid "E314: Preserve failed" msgid "E314: Preserve failed"
msgstr "" msgstr "E314: behouden is mislukt"
#: memline.c:2159 #: memline.c:2159
#, c-format #, c-format
@ -4735,25 +4750,27 @@ msgstr ""
#: memline.c:3595 #: memline.c:3595
#, c-format #, c-format
msgid "E773: Symlink loop for \"%s\"" msgid "E773: Symlink loop for \"%s\""
msgstr "" msgstr "E773: Symbolische koppelingslus voor \"%s\""
#: memline.c:3784 #: memline.c:3784
msgid "E325: ATTENTION" msgid "E325: ATTENTION"
msgstr "" msgstr "E325: OPGELET"
#: memline.c:3785 #: memline.c:3785
msgid "" msgid ""
"\n" "\n"
"Found a swap file by the name \"" "Found a swap file by the name \""
msgstr "" msgstr ""
"\n"
"Er is een wisselbestand aangetroffen met de naam \""
#: memline.c:3789 #: memline.c:3789
msgid "While opening file \"" msgid "While opening file \""
msgstr "" msgstr "bij het openen van bestand \""
#: memline.c:3802 #: memline.c:3802
msgid " NEWER than swap file!\n" msgid " NEWER than swap file!\n"
msgstr "" msgstr " NIEUWER dan het wisselbestand!\n"
#. Some of these messages are long to allow translation to #. Some of these messages are long to allow translation to
#. * other languages. #. * other languages.
@ -4764,30 +4781,38 @@ msgid ""
" If this is the case, be careful not to end up with two\n" " If this is the case, be careful not to end up with two\n"
" different instances of the same file when making changes.\n" " different instances of the same file when making changes.\n"
msgstr "" msgstr ""
"\n"
"(1) Mogelijk wordt dit bestand met een ander programma bewerkt.\n"
" Als dit het geval is, pas dan op niet met twee verschillende\n"
" versies van hetzelfde bestand te eindigen bij het bewerken.\n"
#: memline.c:3807 #: memline.c:3807
msgid " Quit, or continue with caution.\n" msgid " Quit, or continue with caution.\n"
msgstr "" msgstr " Stop of ga aandachtig verder.\n"
#: memline.c:3808 #: memline.c:3808
msgid "" msgid ""
"\n" "\n"
"(2) An edit session for this file crashed.\n" "(2) An edit session for this file crashed.\n"
msgstr "" msgstr ""
"\n"
"(2) Een sessie waarin dit bestand werd bewerkt is onverhoeds gestopt.\n"
#: memline.c:3809 #: memline.c:3809
msgid " If this is the case, use \":recover\" or \"vim -r " msgid " If this is the case, use \":recover\" or \"vim -r "
msgstr "" msgstr " Als dit het geval is, gebruikt dan \":recover\" of \"vim -r "
#: memline.c:3811 #: memline.c:3811
msgid "" msgid ""
"\"\n" "\"\n"
" to recover the changes (see \":help recovery\").\n" " to recover the changes (see \":help recovery\").\n"
msgstr "" msgstr ""
"\"\n"
" om de aanpassingen te herstellen (zie \":help recovery\").\n"
#: memline.c:3812 #: memline.c:3812
msgid " If you did this already, delete the swap file \"" msgid " If you did this already, delete the swap file \""
msgstr "" msgstr " Als dit al gedaan is, verwijder dan het wisselbestand \""
#: memline.c:3814 #: memline.c:3814
msgid "" msgid ""
@ -4795,7 +4820,7 @@ msgid ""
" to avoid this message.\n" " to avoid this message.\n"
msgstr "" msgstr ""
"\"\n" "\"\n"
" om dit bericht te verkomen.\n" " om dit bericht te voorkomen.\n"
#: memline.c:4233 #: memline.c:4233
#: memline.c:4237 #: memline.c:4237
@ -4823,6 +4848,11 @@ msgid ""
"&Quit\n" "&Quit\n"
"&Abort" "&Abort"
msgstr "" msgstr ""
"Alleen-lezen &openen\n"
"Toch b&ewerken\n"
"He&rstellen\n"
"&Stoppen\n"
"&Afbreken"
#: memline.c:4251 #: memline.c:4251
msgid "" msgid ""
@ -4833,28 +4863,34 @@ msgid ""
"&Quit\n" "&Quit\n"
"&Abort" "&Abort"
msgstr "" msgstr ""
"Alleen-lezen &openen\n"
"Toch b&ewerken\n"
"He&rstellen\n"
"Verwij&deren\n"
"&Stoppen\n"
"&Afbreken"
#: memline.c:4322 #: memline.c:4322
msgid "E326: Too many swap files found" msgid "E326: Too many swap files found"
msgstr "" msgstr "E326: teveel wisselbestanden aangetroffen"
#: menu.c:67 #: menu.c:67
msgid "E327: Part of menu-item path is not sub-menu" msgid "E327: Part of menu-item path is not sub-menu"
msgstr "" msgstr "E327: deel van menu-itempad is geen submenu"
#: menu.c:68 #: menu.c:68
msgid "E328: Menu only exists in another mode" msgid "E328: Menu only exists in another mode"
msgstr "" msgstr "E328: menu bestaat alleen in andere modus"
#: menu.c:69 #: menu.c:69
#, c-format #, c-format
msgid "E329: No menu \"%s\"" msgid "E329: No menu \"%s\""
msgstr "" msgstr "E329: geen menu \"%s\""
#. Only a mnemonic or accelerator is not valid. #. Only a mnemonic or accelerator is not valid.
#: menu.c:480 #: menu.c:480
msgid "E792: Empty menu name" msgid "E792: Empty menu name"
msgstr "" msgstr "E792: menunaam is leeg"
#: menu.c:498 #: menu.c:498
msgid "E330: Menu path must not lead to a sub-menu" msgid "E330: Menu path must not lead to a sub-menu"
@ -5203,7 +5239,7 @@ msgstr "E663: einde van wijzigingslijst"
#: normal.c:8854 #: normal.c:8854
msgid "Type :quit<Enter> to exit Vim" msgid "Type :quit<Enter> to exit Vim"
msgstr "Typ :quit<Enter> om Vim te verlaten" msgstr "Typ :quit<Enter> om Vim te verlaten"
#: ops.c:293 #: ops.c:293
#, c-format #, c-format
@ -7571,7 +7607,7 @@ msgid "Running in Vi compatible mode"
msgstr "wordt uitgevoerd in Vi compatible-modus" msgstr "wordt uitgevoerd in Vi compatible-modus"
#: version.c:1119 #: version.c:1119
msgid "type :set nocp<Enter> for Vim defaults" msgid "type :set nocp<Enter> for Vim defaults"
msgstr "typ :set nocp<Enter> voor standaardinstellingen van Vim" msgstr "typ :set nocp<Enter> voor standaardinstellingen van Vim"
#: version.c:1120 #: version.c:1120
@ -7851,11 +7887,11 @@ msgstr ""
#: globals.h:1430 #: globals.h:1430
msgid "E19: Mark has invalid line number" msgid "E19: Mark has invalid line number"
msgstr "" msgstr "E19: markering heeft een ongeldig regelnummer"
#: globals.h:1431 #: globals.h:1431
msgid "E20: Mark not set" msgid "E20: Mark not set"
msgstr "" msgstr "E20: Markering is niet ingesteld"
#: globals.h:1432 #: globals.h:1432
msgid "E21: Cannot make changes, 'modifiable' is off" msgid "E21: Cannot make changes, 'modifiable' is off"
@ -7863,7 +7899,7 @@ msgstr "E21: kan geen veranderingen maken, 'modifiable' is uitgeschakeld"
#: globals.h:1433 #: globals.h:1433
msgid "E22: Scripts nested too deep" msgid "E22: Scripts nested too deep"
msgstr "" msgstr "E22: scripts "
#: globals.h:1434 #: globals.h:1434
msgid "E23: No alternate file" msgid "E23: No alternate file"
@ -7912,7 +7948,7 @@ msgstr ""
#: globals.h:1455 #: globals.h:1455
msgid "E479: No match" msgid "E479: No match"
msgstr "" msgstr "E479: geen overeenkomst"
#: globals.h:1456 #: globals.h:1456
#, c-format #, c-format
@ -7946,51 +7982,51 @@ msgstr "E36: onvoldoende ruimte"
#: globals.h:1466 #: globals.h:1466
#, c-format #, c-format
msgid "E247: no registered server named \"%s\"" msgid "E247: no registered server named \"%s\""
msgstr "" msgstr "E247: \"%s\" niet gevonden als geregistreerde server"
#: globals.h:1468 #: globals.h:1468
#, c-format #, c-format
msgid "E482: Can't create file %s" msgid "E482: Can't create file %s"
msgstr "" msgstr "E482: aanmaken bestand %s is mislukt"
#: globals.h:1469 #: globals.h:1469
msgid "E483: Can't get temp file name" msgid "E483: Can't get temp file name"
msgstr "" msgstr "E483: bepalen naam tijdelijk bestand is mislukt"
#: globals.h:1470 #: globals.h:1470
#, c-format #, c-format
msgid "E484: Can't open file %s" msgid "E484: Can't open file %s"
msgstr "" msgstr "E484: openen bestand %s is mislukt"
#: globals.h:1471 #: globals.h:1471
#, c-format #, c-format
msgid "E485: Can't read file %s" msgid "E485: Can't read file %s"
msgstr "" msgstr "E485: lezen bestand %s is mislukt"
#: globals.h:1472 #: globals.h:1472
msgid "E37: No write since last change (add ! to override)" msgid "E37: No write since last change (add ! to override)"
msgstr "E37: niets opgeslagen sinds laatste wijziging (voeg ! toe om dit te negeren)" msgstr "E37: niets opgeslagen sinds laatste wijziging (voeg ! toe om te forceren)"
#: globals.h:1473 #: globals.h:1473
msgid "E38: Null argument" msgid "E38: Null argument"
msgstr "" msgstr "E38: leeg argument (null)"
#: globals.h:1475 #: globals.h:1475
msgid "E39: Number expected" msgid "E39: Number expected"
msgstr "" msgstr "E39: getal verwacht"
#: globals.h:1478 #: globals.h:1478
#, c-format #, c-format
msgid "E40: Can't open errorfile %s" msgid "E40: Can't open errorfile %s"
msgstr "" msgstr "E40: openen foutenbestand %s is mislukt"
#: globals.h:1481 #: globals.h:1481
msgid "E233: cannot open display" msgid "E233: cannot open display"
msgstr "" msgstr "E233: openen scherm is mislukt"
#: globals.h:1483 #: globals.h:1483
msgid "E41: Out of memory!" msgid "E41: Out of memory!"
msgstr "" msgstr "E41: te weinig geheugen!"
#: globals.h:1485 #: globals.h:1485
msgid "Pattern not found" msgid "Pattern not found"
@ -8053,7 +8089,7 @@ msgstr "E523: hier niet toegestaan"
#: globals.h:1513 #: globals.h:1513
msgid "E359: Screen mode setting not supported" msgid "E359: Screen mode setting not supported"
msgstr "" msgstr "E359: instelling schermmodus niet ondersteund"
#: globals.h:1515 #: globals.h:1515
msgid "E49: Invalid scroll size" msgid "E49: Invalid scroll size"
@ -8101,39 +8137,39 @@ msgstr "E78: onbekende markering"
#: globals.h:1528 #: globals.h:1528
msgid "E79: Cannot expand wildcards" msgid "E79: Cannot expand wildcards"
msgstr "" msgstr "E79: vervangen jokertekens is mislukt"
#: globals.h:1530 #: globals.h:1530
msgid "E591: 'winheight' cannot be smaller than 'winminheight'" msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
msgstr "" msgstr "E591: 'winheight' kan niet kleiner zijn dan 'winminheight'"
#: globals.h:1532 #: globals.h:1532
msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'" msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
msgstr "" msgstr "E592: 'winwidth' kan niet kleiner zijn dan 'winminwidth'"
#: globals.h:1535 #: globals.h:1535
msgid "E80: Error while writing" msgid "E80: Error while writing"
msgstr "" msgstr "E80: opslaan is mislukt"
#: globals.h:1536 #: globals.h:1536
msgid "Zero count" msgid "Zero count"
msgstr "" msgstr "Aantal is nul"
#: globals.h:1538 #: globals.h:1538
msgid "E81: Using <SID> not in a script context" msgid "E81: Using <SID> not in a script context"
msgstr "" msgstr "E81: <SID> wordt buiten de scriptcontext gebruikt"
#: globals.h:1541 #: globals.h:1541
msgid "E449: Invalid expression received" msgid "E449: Invalid expression received"
msgstr "" msgstr "E449: ontvangen expressie is ongeldig"
#: globals.h:1544 #: globals.h:1544
msgid "E463: Region is guarded, cannot modify" msgid "E463: Region is guarded, cannot modify"
msgstr "" msgstr "E463: Regio is bescherm en kan niet worden veranderd"
#: globals.h:1545 #: globals.h:1545
msgid "E744: NetBeans does not allow changes in read-only files" msgid "E744: NetBeans does not allow changes in read-only files"
msgstr "" msgstr "E744: NetBeans staat geen veranderingen in alleen-lezenbestanden toe"
#: globals.h:1547 #: globals.h:1547
#, c-format #, c-format
@ -8142,7 +8178,7 @@ msgstr "E685: interne fout: %s"
#: globals.h:1548 #: globals.h:1548
msgid "E363: pattern uses more memory than 'maxmempattern'" msgid "E363: pattern uses more memory than 'maxmempattern'"
msgstr "" msgstr "E363: patroon gebruikt meer geheugen dan 'maxmempattern'"
#: globals.h:1549 #: globals.h:1549
msgid "E749: empty buffer" msgid "E749: empty buffer"