mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-17 03:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9172 from justinmk/vim-d473c8c10126

Browse Source
This commit is contained in:
Justin M. Keyes
2018-10-30 01:01:29 +01:00
committed by GitHub
parent f5406dfe77 18ce6c9063
commit 500345aea2
49 changed files with 4559 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
runtime/autoload/ccomplete.vim
View File

@@ -1,7 +1,7 @@
" Vim completion script " Vim completion script
" Language: C " Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2012 Jun 20 " Last Change: 2018 Aug 20
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
@@ -72,8 +72,10 @@ function! ccomplete#Complete(findstart, base)
" Split item in words, keep empty word after "." or "->". " Split item in words, keep empty word after "." or "->".
" "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc. " "aa" -> ['aa'], "aa." -> ['aa', ''], "aa.bb" -> ['aa', 'bb'], etc.
" We can't use split, because we need to skip nested [...]. " We can't use split, because we need to skip nested [...].
" "aa[...]" -> ['aa', '[...]'], "aa.bb[...]" -> ['aa', 'bb', '[...]'], etc.
let items = [] let items = []
let s = 0 let s = 0
let arrays = 0
while 1 while 1
let e = match(base, '\.\|->\|\[', s) let e = match(base, '\.\|->\|\[', s)
if e < 0 if e < 0
@@ -107,6 +109,7 @@ function! ccomplete#Complete(findstart, base)
endwhile endwhile
let e += 1 let e += 1
call add(items, strpart(base, s, e - s)) call add(items, strpart(base, s, e - s))
let arrays += 1
let s = e let s = e
endif endif
endwhile endwhile
@@ -161,15 +164,26 @@ function! ccomplete#Complete(findstart, base)
endif endif
endif endif
let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}] let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}]
elseif len(items) == arrays + 1
" Completing one word and it's a local array variable: build tagline
" from declaration line
let match = items[0]
let kind = 'v'
let tagline = "\t/^" . line . '$/'
let res = [{'match': match, 'tagline' : tagline, 'kind' : kind, 'info' : line}]
else else
" Completing "var.", "var.something", etc. " Completing "var.", "var.something", etc.
let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1) let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1)
endif endif
endif endif
if len(items) == 1 if len(items) == 1 || len(items) == arrays + 1
" Only one part, no "." or "->": complete from tags file. " Only one part, no "." or "->": complete from tags file.
let tags = taglist('^' . base) if len(items) == 1
let tags = taglist('^' . base)
else
let tags = taglist('^' . items[0] . '$')
endif
" Remove members, these can't appear without something in front. " Remove members, these can't appear without something in front.
call filter(tags, 'has_key(v:val, "kind") ? v:val["kind"] != "m" : 1') call filter(tags, 'has_key(v:val, "kind") ? v:val["kind"] != "m" : 1')
@@ -516,11 +530,24 @@ function! s:StructMembers(typename, items, all)
endif endif
endif endif
" Skip over [...] items
let idx = 0
while 1
if idx >= len(a:items)
let target = '' " No further items, matching all members
break
endif
if a:items[idx][0] != '['
let target = a:items[idx]
break
endif
let idx += 1
endwhile
" Put matching members in matches[]. " Put matching members in matches[].
let matches = [] let matches = []
for l in qflist for l in qflist
let memb = matchstr(l['text'], '[^\t]*') let memb = matchstr(l['text'], '[^\t]*')
if memb =~ '^' . a:items[0] if memb =~ '^' . target
" Skip matches local to another file. " Skip matches local to another file.
if match(l['text'], "\tfile:") < 0 || bufnr('%') == bufnr(matchstr(l['text'], '\t\zs[^\t]*')) if match(l['text'], "\tfile:") < 0 || bufnr('%') == bufnr(matchstr(l['text'], '\t\zs[^\t]*'))
let item = {'match': memb, 'tagline': l['text']} let item = {'match': memb, 'tagline': l['text']}
@@ -540,8 +567,8 @@ function! s:StructMembers(typename, items, all)
endfor endfor
if len(matches) > 0 if len(matches) > 0
" Skip over [...] items " Skip over next [...] items
let idx = 1 let idx += 1
while 1 while 1
if idx >= len(a:items) if idx >= len(a:items)
return matches " No further items, return the result. return matches " No further items, return the result.

2
runtime/autoload/dist/ft.vim vendored
View File

@@ -632,7 +632,7 @@ endfunc
" Choose context, plaintex, or tex (LaTeX) based on these rules: " Choose context, plaintex, or tex (LaTeX) based on these rules:
" 1. Check the first line of the file for "%&<format>". " 1. Check the first line of the file for "%&<format>".
" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords. " 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
" 3. Default to "latex" or to g:tex_flavor, can be set in user's vimrc. " 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
func dist#ft#FTtex() func dist#ft#FTtex()
let firstline = getline(1) let firstline = getline(1)
if firstline =~ '^%&\s*\a\+' if firstline =~ '^%&\s*\a\+'

3382
runtime/autoload/haskellcomplete.vim Normal file
View File

File diff suppressed because it is too large Load Diff

88
runtime/autoload/phpcomplete.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: Dávid Szabó ( complex857 AT gmail DOT com ) " Maintainer: Dávid Szabó ( complex857 AT gmail DOT com )
" Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl ) " Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
" URL: https://github.com/shawncplus/phpcomplete.vim " URL: https://github.com/shawncplus/phpcomplete.vim
" Last Change: 2016 Oct 10 " Last Change: 2018 Oct 10
" "
" OPTIONS: " OPTIONS:
" "
@@ -146,6 +146,8 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
end end
try try
let eventignore = &eventignore
let &eventignore = 'all'
let winheight = winheight(0) let winheight = winheight(0)
let winnr = winnr() let winnr = winnr()
@@ -216,6 +218,7 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
endif endif
finally finally
silent! exec winnr.'resize '.winheight silent! exec winnr.'resize '.winheight
let &eventignore = eventignore
endtry endtry
endfunction endfunction
" }}} " }}}
@@ -1393,23 +1396,28 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
for classstructure in classcontents for classstructure in classcontents
let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>' let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>'
let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern) let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern)
if doc_str != '' let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(split(classstructure.content, '\n'), 'function\s\+&\?'.method.'\>')
if doc_str != '' || return_type_hint != ''
break break
endif endif
endfor endfor
if doc_str != '' if doc_str != '' || return_type_hint != ''
let docblock = phpcomplete#ParseDocBlock(doc_str) let docblock = phpcomplete#ParseDocBlock(doc_str)
if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0 if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0 || return_type_hint != ''
let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : '' if return_type_hint == ''
let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : ''
if type == '' if type == ''
for property in docblock.properties for property in docblock.properties
if property.description =~? method if property.description =~? method
let type = property.type let type = property.type
break break
endif endif
endfor endfor
endif endif
else
let type = return_type_hint
end
" there's a namespace in the type, threat the type as FQCN " there's a namespace in the type, threat the type as FQCN
if type =~ '\\' if type =~ '\\'
@@ -1483,7 +1491,7 @@ function! phpcomplete#GetMethodStack(line) " {{{
continue continue
endif endif
" if it's looks like a string " if it looks like a string
if current_char == "'" || current_char == '"' if current_char == "'" || current_char == '"'
" and it is not escaped " and it is not escaped
if prev_char != '\' || (prev_char == '\' && prev_prev_char == '\') if prev_char != '\' || (prev_char == '\' && prev_prev_char == '\')
@@ -1587,9 +1595,11 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
elseif function_file != '' && filereadable(function_file) elseif function_file != '' && filereadable(function_file)
let file_lines = readfile(function_file) let file_lines = readfile(function_file)
let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>') let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(file_lines, 'function\s*&\?'.function_name.'\>')
let docblock = phpcomplete#ParseDocBlock(docblock_str) let docblock = phpcomplete#ParseDocBlock(docblock_str)
if has_key(docblock.return, 'type') let type = has_key(docblock.return, 'type') ? docblock.return.type : return_type_hint
let classname_candidate = docblock.return.type if type != ''
let classname_candidate = type
let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines) let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
" try to expand the classname of the returned type with the context got from the function's source file " try to expand the classname of the returned type with the context got from the function's source file
@@ -1821,9 +1831,11 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
elseif function_file != '' && filereadable(function_file) elseif function_file != '' && filereadable(function_file)
let file_lines = readfile(function_file) let file_lines = readfile(function_file)
let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>') let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
let return_type_hint = phpcomplete#GetFunctionReturnTypeHint(file_lines, 'function\s*&\?'.function_name.'\>')
let docblock = phpcomplete#ParseDocBlock(docblock_str) let docblock = phpcomplete#ParseDocBlock(docblock_str)
if has_key(docblock.return, 'type') let type = has_key(docblock.return, 'type') ? docblock.return.type : return_type_hint
let classname_candidate = docblock.return.type if type != ''
let classname_candidate = type
let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines) let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
" try to expand the classname of the returned type with the context got from the function's source file " try to expand the classname of the returned type with the context got from the function's source file
let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports) let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
@@ -2413,6 +2425,44 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
endfunction endfunction
" }}} " }}}
function! phpcomplete#GetFunctionReturnTypeHint(sccontent, search)
let i = 0
let l = 0
let function_line_start = -1
let function_line_end = -1
let sccontent_len = len(a:sccontent)
let return_type = ''
while (i < sccontent_len)
let line = a:sccontent[i]
" search for a function declaration
if line =~? a:search
let l = i
let function_line_start = i
" now search for the first { where the function body starts
while l < sccontent_len
let line = a:sccontent[l]
if line =~? '\V{'
let function_line_end = l
break
endif
let l += 1
endwhile
break
endif
let i += 1
endwhile
" now grab the lines that holds the function declaration line
if function_line_start != -1 && function_line_end != -1
let function_line = join(a:sccontent[function_line_start :function_line_end], " ")
let class_name_pattern = '[a-zA-Z_\x7f-\xff\\][a-zA-Z_0-9\x7f-\xff\\]*'
let return_type = matchstr(function_line, '\c\s*:\s*\zs'.class_name_pattern.'\ze\s*{')
endif
return return_type
endfunction
function! phpcomplete#GetTypeFromDocBlockParam(docblock_type) " {{{ function! phpcomplete#GetTypeFromDocBlockParam(docblock_type) " {{{
if a:docblock_type !~ '|' if a:docblock_type !~ '|'
return a:docblock_type return a:docblock_type
@@ -2572,7 +2622,7 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
" find kind flags from tags or built in methods for the objects we extracted " find kind flags from tags or built in methods for the objects we extracted
" they can be either classes, interfaces or namespaces, no other thing is importable in php " they can be either classes, interfaces or namespaces, no other thing is importable in php
for [key, import] in items(imports) for [key, import] in items(imports)
" if theres a \ in the name we have it's definetly not a built in thing, look for tags " if theres a \ in the name we have it's definitely not a built in thing, look for tags
if import.name =~ '\\' if import.name =~ '\\'
let patched_ctags_detected = 0 let patched_ctags_detected = 0
let [classname, namespace_for_classes] = phpcomplete#ExpandClassName(import.name, '\', {}) let [classname, namespace_for_classes] = phpcomplete#ExpandClassName(import.name, '\', {})

33
runtime/autoload/tar.vim
View File

@@ -152,13 +152,16 @@ fun! tar#Browse(tarfile)
" assuming cygwin " assuming cygwin
let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e') let tarfile=substitute(system("cygpath -u ".shellescape(tarfile,0)),'\n$','','e')
endif endif
let gzip_command = s:get_gzip_command(tarfile)
let curlast= line("$") let curlast= line("$")
if tarfile =~# '\.\(gz\|tgz\)$' if tarfile =~# '\.\(gz\|tgz\)$'
" call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("1: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! " . gzip_command . " -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
elseif tarfile =~# '\.lrp' elseif tarfile =~# '\.lrp'
" call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! cat -- ".shellescape(tarfile,1)."|" . gzip_command . " -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$' elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$'
" call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ") " call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - " exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
@@ -287,15 +290,18 @@ fun! tar#Read(fname,mode)
else else
let tar_secure= " " let tar_secure= " "
endif endif
let gzip_command = s:get_gzip_command(tarfile)
if tarfile =~# '\.bz2$' if tarfile =~# '\.bz2$'
" call Decho("7: exe silent r! bzip2 -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("7: exe silent r! bzip2 -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.\(gz\|tgz\)$' elseif tarfile =~# '\.\(gz\|tgz\)$'
" call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1)) " call Decho("5: exe silent r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd.' -'.g:tar_readoptions.' - '.tar_secure.shellescape(fname,1))
exe "sil! r! gzip -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! " . gzip_command . " -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.lrp$' elseif tarfile =~# '\.lrp$'
" call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("6: exe silent r! cat ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! cat -- ".shellescape(tarfile,1)." | gzip -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! cat -- ".shellescape(tarfile,1)." | " . gzip_command . " -d -c - | ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
elseif tarfile =~# '\.lzma$' elseif tarfile =~# '\.lzma$'
" call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp) " call Decho("7: exe silent r! lzma -d -c ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp)
exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)."| ".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.shellescape(fname,1).decmp
@@ -389,6 +395,8 @@ fun! tar#Write(fname)
let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','') let tarfile = substitute(b:tarfile,'tarfile:\(.\{-}\)::.*$','\1','')
let fname = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','') let fname = substitute(b:tarfile,'tarfile:.\{-}::\(.*\)$','\1','')
let gzip_command = s:get_gzip_command(tarfile)
" handle compressed archives " handle compressed archives
if tarfile =~# '\.bz2' if tarfile =~# '\.bz2'
call system("bzip2 -d -- ".shellescape(tarfile,0)) call system("bzip2 -d -- ".shellescape(tarfile,0))
@@ -396,12 +404,12 @@ fun! tar#Write(fname)
let compress= "bzip2 -- ".shellescape(tarfile,0) let compress= "bzip2 -- ".shellescape(tarfile,0)
" call Decho("compress<".compress.">") " call Decho("compress<".compress.">")
elseif tarfile =~# '\.gz' elseif tarfile =~# '\.gz'
call system("gzip -d -- ".shellescape(tarfile,0)) call system(gzip_command . " -d -- ".shellescape(tarfile,0))
let tarfile = substitute(tarfile,'\.gz','','e') let tarfile = substitute(tarfile,'\.gz','','e')
let compress= "gzip -- ".shellescape(tarfile,0) let compress= "gzip -- ".shellescape(tarfile,0)
" call Decho("compress<".compress.">") " call Decho("compress<".compress.">")
elseif tarfile =~# '\.tgz' elseif tarfile =~# '\.tgz'
call system("gzip -d -- ".shellescape(tarfile,0)) call system(gzip_command . " -d -- ".shellescape(tarfile,0))
let tarfile = substitute(tarfile,'\.tgz','.tar','e') let tarfile = substitute(tarfile,'\.tgz','.tar','e')
let compress= "gzip -- ".shellescape(tarfile,0) let compress= "gzip -- ".shellescape(tarfile,0)
let tgz = 1 let tgz = 1
@@ -581,7 +589,9 @@ fun! tar#Vimuntar(...)
" if necessary, decompress the tarball; then, extract it " if necessary, decompress the tarball; then, extract it
if tartail =~ '\.tgz' if tartail =~ '\.tgz'
if executable("gunzip") if executable("bzip2")
silent exe "!bzip2 -d ".shellescape(tartail)
elseif executable("gunzip")
silent exe "!gunzip ".shellescape(tartail) silent exe "!gunzip ".shellescape(tartail)
elseif executable("gzip") elseif executable("gzip")
silent exe "!gzip -d ".shellescape(tartail) silent exe "!gzip -d ".shellescape(tartail)
@@ -619,6 +629,15 @@ fun! tar#Vimuntar(...)
" call Dret("tar#Vimuntar") " call Dret("tar#Vimuntar")
endfun endfun
func s:get_gzip_command(file)
if a:file =~# 'z$' && executable('bzip2')
" Some .tgz files are actually compressed with bzip2. Since bzip2 can
" handle the format from gzip, use it if the command exists.
return 'bzip2'
endif
return 'gzip'
endfunc
" ===================================================================== " =====================================================================
" Modelines And Restoration: {{{1 " Modelines And Restoration: {{{1
let &cpo= s:keepcpo let &cpo= s:keepcpo

37
runtime/compiler/stack.vim Normal file
View File

@@ -0,0 +1,37 @@
" Vim compiler file
" Compiler: Haskell Stack
" Maintainer: Daniel Campoverde <alx@sillybytes.net>
" Latest Revision: 2018-08-27
if exists("current_compiler")
finish
endif
let current_compiler = "stack"
let s:cpo_save = &cpo
set cpo&vim
CompilerSet errorformat=
\%-G%.%#:\ build\ %.%#,
\%-G%.%#:\ configure\ %.%#,
\%-G[%.%#]%.%#,
\%-G%.%#preprocessing\ %.%#,
\%-G%.%#configuring\ %.%#,
\%-G%.%#building\ %.%#,
\%-G%.%#linking\ %.%#,
\%-G%.%#installing\ %.%#,
\%-G%.%#registering\ %.%#,
\%-G%.%#:\ copy/register%.%#,
\%-G%.%#process\ exited\ %.%#,
\%-G%.%#--builddir=%.%#,
\%-G--%.%#,
\%-G%.%#\|%.%#,
\%E%f:%l:%c:\ error:,%+Z\ \ \ \ %m,
\%E%f:%l:%c:\ error:\ %m,%-Z,
\%W%f:%l:%c:\ warning:,%+Z\ \ \ \ %m,
\%W%f:%l:%c:\ warning:\ %m,%-Z,
let &cpo = s:cpo_save
unlet s:cpo_save

4
runtime/doc/autocmd.txt
View File

@@ -287,6 +287,7 @@ Name triggered by ~
|VimSuspend| before Nvim is suspended |VimSuspend| before Nvim is suspended
Various Various
|DiffUpdated| after diffs have been updated
|DirChanged| after the |current-directory| was changed |DirChanged| after the |current-directory| was changed
|FileChangedShell| Vim notices that a file changed since editing started |FileChangedShell| Vim notices that a file changed since editing started
@@ -856,6 +857,9 @@ OptionSet After setting an option. The pattern is
plugin. You can always use `:noa` to prevent plugin. You can always use `:noa` to prevent
triggering this autocommand. triggering this autocommand.
When using |:set| in the autocommand the event
is not triggered again.
*QuickFixCmdPre* *QuickFixCmdPre*
QuickFixCmdPre Before a quickfix command is run (|:make|, QuickFixCmdPre Before a quickfix command is run (|:make|,
|:lmake|, |:grep|, |:lgrep|, |:grepadd|, |:lmake|, |:grep|, |:lgrep|, |:grepadd|,

12
runtime/doc/change.txt
View File

@@ -667,6 +667,7 @@ The flags that you can use for the substitute commands:
CTRL-E to scroll the screen up CTRL-E to scroll the screen up
CTRL-Y to scroll the screen down CTRL-Y to scroll the screen down
*:s_e*
[e] When the search pattern fails, do not issue an error message and, in [e] When the search pattern fails, do not issue an error message and, in
particular, continue in maps as if no error occurred. This is most particular, continue in maps as if no error occurred. This is most
useful to prevent the "No match" error from breaking a mapping. Vim useful to prevent the "No match" error from breaking a mapping. Vim
@@ -677,29 +678,34 @@ The flags that you can use for the substitute commands:
Trailing characters Trailing characters
Interrupted Interrupted
*:s_g*
[g] Replace all occurrences in the line. Without this argument, [g] Replace all occurrences in the line. Without this argument,
replacement occurs only for the first occurrence in each line. If the replacement occurs only for the first occurrence in each line. If the
'gdefault' option is on, this flag is on by default and the [g] 'gdefault' option is on, this flag is on by default and the [g]
argument switches it off. argument switches it off.
*:s_i*
[i] Ignore case for the pattern. The 'ignorecase' and 'smartcase' options [i] Ignore case for the pattern. The 'ignorecase' and 'smartcase' options
are not used. are not used.
*:s_I*
[I] Don't ignore case for the pattern. The 'ignorecase' and 'smartcase' [I] Don't ignore case for the pattern. The 'ignorecase' and 'smartcase'
options are not used. options are not used.
*:s_n*
[n] Report the number of matches, do not actually substitute. The [c] [n] Report the number of matches, do not actually substitute. The [c]
flag is ignored. The matches are reported as if 'report' is zero. flag is ignored. The matches are reported as if 'report' is zero.
Useful to |count-items|. Useful to |count-items|.
If \= |sub-replace-expression| is used, the expression will be If \= |sub-replace-expression| is used, the expression will be
evaluated in the |sandbox| at every match. evaluated in the |sandbox| at every match.
[p] Print the line containing the last substitute. [p] Print the line containing the last substitute. *:s_p*
[#] Like [p] and prepend the line number. [#] Like [p] and prepend the line number. *:s_#*
[l] Like [p] but print the text like |:list|. [l] Like [p] but print the text like |:list|. *:s_l*
*:s_r*
[r] Only useful in combination with `:&` or `:s` without arguments. `:&r` [r] Only useful in combination with `:&` or `:s` without arguments. `:&r`
works the same way as `:~`: When the search pattern is empty, use the works the same way as `:~`: When the search pattern is empty, use the
previously used search pattern instead of the search pattern from the previously used search pattern instead of the search pattern from the

42
runtime/doc/cmdline.txt
View File

@@ -495,8 +495,46 @@ after a command causes the rest of the line to be ignored. This can be used
to add comments. Example: > to add comments. Example: >
:set ai "set 'autoindent' option :set ai "set 'autoindent' option
It is not possible to add a comment to a shell command ":!cmd" or to the It is not possible to add a comment to a shell command ":!cmd" or to the
":map" command and a few others, because they see the '"' as part of their ":map" command and a few others (mainly commands that expect expressions)
argument. This is mentioned where the command is explained. that see the '"' as part of their argument:
:argdo
:autocmd
:bufdo
:cexpr (and the like)
:call
:cdo (and the like)
:command
:cscope (and the like)
:debug
:display
:echo (and the like)
:elseif
:execute
:folddoopen
:folddoclosed
:for
:grep (and the like)
:help (and the like)
:if
:let
:make
:map (and the like including :abbrev commands)
:menu (and the like)
:mkspell
:normal
:ownsyntax
:popup
:promptfind (and the like)
:registers
:return
:sort
:syntax
:tabdo
:tearoff
:vimgrep (and the like)
:while
:windo
*:bar* *:\bar* *:bar* *:\bar*
'|' can be used to separate commands, so you can give multiple commands in one '|' can be used to separate commands, so you can give multiple commands in one

23
runtime/doc/eval.txt
View File

@@ -921,6 +921,13 @@ These three can be repeated and mixed. Examples:
expr8 *expr8* expr8 *expr8*
----- -----
This expression is either |expr9| or a sequence of the alternatives below,
in any order. E.g., these are all possible:
expr9[expr1].name
expr9.name[expr1]
expr9(expr1, ...)[expr1].name
expr8[expr1] item of String or |List| *expr-[]* *E111* expr8[expr1] item of String or |List| *expr-[]* *E111*
*subscript* *subscript*
@@ -2223,7 +2230,6 @@ remote_read({serverid} [, {timeout}])
remote_send({server}, {string} [, {idvar}]) remote_send({server}, {string} [, {idvar}])
String send key sequence String send key sequence
remote_startserver({name}) none become server {name} remote_startserver({name}) none become server {name}
String send key sequence
remove({list}, {idx} [, {end}]) any remove items {idx}-{end} from {list} remove({list}, {idx} [, {end}]) any remove items {idx}-{end} from {list}
remove({dict}, {key}) any remove entry {key} from {dict} remove({dict}, {key}) any remove entry {key} from {dict}
rename({from}, {to}) Number rename (move) file from {from} to {to} rename({from}, {to}) Number rename (move) file from {from} to {to}
@@ -2416,10 +2422,10 @@ and({expr}, {expr}) *and()*
api_info() *api_info()* api_info() *api_info()*
Returns Dictionary of |api-metadata|. Returns Dictionary of |api-metadata|.
append({lnum}, {expr}) *append()* append({lnum}, {text}) *append()*
When {expr} is a |List|: Append each item of the |List| as a When {text} is a |List|: Append each item of the |List| as a
text line below line {lnum} in the current buffer. text line below line {lnum} in the current buffer.
Otherwise append {expr} as one text line below line {lnum} in Otherwise append {text} as one text line below line {lnum} in
the current buffer. the current buffer.
{lnum} can be zero to insert a line before the first one. {lnum} can be zero to insert a line before the first one.
Returns 1 for failure ({lnum} out of range or out of memory), Returns 1 for failure ({lnum} out of range or out of memory),
@@ -2489,7 +2495,7 @@ assert_exception({error} [, {msg}]) *assert_exception()*
call assert_exception('E492:') call assert_exception('E492:')
endtry endtry
assert_fails({cmd} [, {error}]) *assert_fails()* assert_fails({cmd} [, {error} [, {msg}]]) *assert_fails()*
Run {cmd} and add an error message to |v:errors| if it does Run {cmd} and add an error message to |v:errors| if it does
NOT produce an error. NOT produce an error.
When {error} is given it must match in |v:errmsg|. When {error} is given it must match in |v:errmsg|.
@@ -4051,6 +4057,8 @@ getcmdline() *getcmdline()*
Example: > Example: >
:cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR> :cmap <F7> <C-\>eescape(getcmdline(), ' \')<CR>
< Also see |getcmdtype()|, |getcmdpos()| and |setcmdpos()|. < Also see |getcmdtype()|, |getcmdpos()| and |setcmdpos()|.
Returns an empty string when entering a password or using
|inputsecret()|.
getcmdpos() *getcmdpos()* getcmdpos() *getcmdpos()*
Return the position of the cursor in the command line as a Return the position of the cursor in the command line as a
@@ -5445,11 +5453,14 @@ match({expr}, {pat} [, {start} [, {count}]]) *match()*
When {expr} is a |List| then this returns the index of the When {expr} is a |List| then this returns the index of the
first item where {pat} matches. Each item is used as a first item where {pat} matches. Each item is used as a
String, |Lists| and |Dictionaries| are used as echoed. String, |Lists| and |Dictionaries| are used as echoed.
Otherwise, {expr} is used as a String. The result is a Otherwise, {expr} is used as a String. The result is a
Number, which gives the index (byte offset) in {expr} where Number, which gives the index (byte offset) in {expr} where
{pat} matches. {pat} matches.
A match at the first character or |List| item returns zero. A match at the first character or |List| item returns zero.
If there is no match -1 is returned. If there is no match -1 is returned.
For getting submatches see |matchlist()|. For getting submatches see |matchlist()|.
Example: > Example: >
:echo match("testing", "ing") " results in 4 :echo match("testing", "ing") " results in 4
@@ -7711,7 +7722,7 @@ synconcealed({lnum}, {col}) *synconcealed()*
concealable region if there are two consecutive regions concealable region if there are two consecutive regions
with the same replacement character. For an example, if with the same replacement character. For an example, if
the text is "123456" and both "23" and "45" are concealed the text is "123456" and both "23" and "45" are concealed
and replace by the character "X", then: and replaced by the character "X", then:
call returns ~ call returns ~
synconcealed(lnum, 1) [0, '', 0] synconcealed(lnum, 1) [0, '', 0]
synconcealed(lnum, 2) [1, 'X', 1] synconcealed(lnum, 2) [1, 'X', 1]

22
runtime/doc/filetype.txt
View File

@@ -573,11 +573,31 @@ By default the following options are set, in accordance with PEP8: >
setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8 setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
To disable this behaviour, set the following variable in your vimrc: > To disable this behavior, set the following variable in your vimrc: >
let g:python_recommended_style = 0 let g:python_recommended_style = 0
R MARKDOWN *ft-rmd-plugin*
By default ftplugin/html.vim is not sourced. If you want it sourced, add to
your |vimrc|: >
let rmd_include_html = 1
The 'formatexpr' option is set dynamically with different values for R code
and for Markdown code. If you prefer that 'formatexpr' is not set, add to your
|vimrc|: >
let rmd_dynamic_comments = 0
R RESTRUCTURED TEXT *ft-rrst-plugin*
The 'formatexpr' option is set dynamically with different values for R code
and for ReStructured text. If you prefer that 'formatexpr' is not set, add to
your |vimrc|: >
let rrst_dynamic_comments = 0
RPM SPEC *ft-spec-plugin* RPM SPEC *ft-spec-plugin*
Since the text for this plugin is rather long it has been put in a separate Since the text for this plugin is rather long it has been put in a separate

2
runtime/doc/help.txt
View File

@@ -182,4 +182,4 @@ will try to find help for it. Especially for options in single quotes, e.g.
'hlsearch'. 'hlsearch'.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl: vim:tw=78:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl:

16
runtime/doc/if_pyth.txt
View File

@@ -42,9 +42,10 @@ Example: >
endfunction endfunction
To see what version of Python you have: > To see what version of Python you have: >
:python import sys
:python print(sys.version) :python print(sys.version)
There is no need to import sys, it's done by default.
Note: Python is very sensitive to the indenting. Make sure the "class" line Note: Python is very sensitive to the indenting. Make sure the "class" line
and "EOF" do not have any indent. and "EOF" do not have any indent.
@@ -62,6 +63,18 @@ Examples:
> >
:pydo return "%s\t%d" % (line[::-1], len(line)) :pydo return "%s\t%d" % (line[::-1], len(line))
:pydo if line: return "%4d: %s" % (linenr, line) :pydo if line: return "%4d: %s" % (linenr, line)
<
One can use `:pydo` in possible conjunction with `:py` to filter a range using
python. For example: >
:py3 << EOF
needle = vim.eval('@a')
replacement = vim.eval('@b')
def py_vim_string_replace(str):
return str.replace(needle, replacement)
EOF
:'<,'>py3do return py_vim_string_replace(line)
< <
*:pyfile* *:pyf* *:pyfile* *:pyf*
:[range]pyf[ile] {file} :[range]pyf[ile] {file}
@@ -79,7 +92,6 @@ Python commands cannot be used in the |sandbox|.
To pass arguments you need to set sys.argv[] explicitly. Example: > To pass arguments you need to set sys.argv[] explicitly. Example: >
:python import sys
:python sys.argv = ["foo", "bar"] :python sys.argv = ["foo", "bar"]
:pyfile myscript.py :pyfile myscript.py

10
runtime/doc/indent.txt
View File

@@ -937,6 +937,11 @@ Indent after a nested paren: >
Indent for a continuation line: > Indent for a continuation line: >
let g:pyindent_continue = '&sw * 2' let g:pyindent_continue = '&sw * 2'
The method uses searchpair() to look back for unclosed parenthesis. This can
sometimes be slow, thus it timeouts after 150 msec. If you notice the
indenting isn't correct, you can set a larger timeout in msec: >
let g:pyindent_searchpair_timeout = 500
R *ft-r-indent* R *ft-r-indent*
@@ -974,6 +979,11 @@ Below is an example of indentation with and without this option enabled:
paste(x) paste(x) paste(x) paste(x)
} } } }
< <
The code will be indented after lines that match the pattern
`'\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'`. If you want indentation after
lines that match a different pattern, you should set the appropriate value of
`r_indent_op_pattern` in your |vimrc|.
SHELL *ft-sh-indent* SHELL *ft-sh-indent*

12
runtime/doc/insert.txt
View File

@@ -1026,13 +1026,13 @@ The function must return the column where the completion starts. It must be a
number between zero and the cursor column "col('.')". This involves looking number between zero and the cursor column "col('.')". This involves looking
at the characters just before the cursor and including those characters that at the characters just before the cursor and including those characters that
could be part of the completed item. The text between this column and the could be part of the completed item. The text between this column and the
cursor column will be replaced with the matches. cursor column will be replaced with the matches. If the returned value is
larger than the cursor column, the cursor column is used.
Special return values: Negative return values:
-1 If no completion can be done, the completion will be cancelled with an -2 To cancel silently and stay in completion mode.
error message. -3 To cancel silently and leave completion mode.
-2 To cancel silently and stay in completion mode. Another negative value: completion starts at the cursor column
-3 To cancel silently and leave completion mode.
On the second invocation the arguments are: On the second invocation the arguments are:
a:findstart 0 a:findstart 0

9
runtime/doc/map.txt
View File

@@ -371,8 +371,9 @@ several modes. In Vim you can use the ":nmap", ":vmap", ":omap", ":cmap" and
*omap-info* *omap-info*
Operator-pending mappings can be used to define a movement command that can be Operator-pending mappings can be used to define a movement command that can be
used with any operator. Simple example: ":omap { w" makes "y{" work like "yw" used with any operator. Simple example: >
and "d{" like "dw". :omap { w
makes "y{" work like "yw" and "d{" like "dw".
To ignore the starting cursor position and select different text, you can have To ignore the starting cursor position and select different text, you can have
the omap start Visual mode to select the text to be operated upon. Example the omap start Visual mode to select the text to be operated upon. Example
@@ -383,9 +384,11 @@ Normal mode commands find the first '(' character and select the first word
before it. That usually is the function name. before it. That usually is the function name.
To enter a mapping for Normal and Visual mode, but not Operator-pending mode, To enter a mapping for Normal and Visual mode, but not Operator-pending mode,
first define it for all three modes, then unmap it for Operator-pending mode: first define it for all three modes, then unmap it for
Operator-pending mode: >
:map xx something-difficult :map xx something-difficult
:ounmap xx :ounmap xx
Likewise for a mapping for Visual and Operator-pending mode or Normal and Likewise for a mapping for Visual and Operator-pending mode or Normal and
Operator-pending mode. Operator-pending mode.

51
runtime/doc/options.txt
View File

@@ -100,17 +100,17 @@ and the following arguments will be ignored.
When 'verbose' is non-zero, displaying an option value will also tell where it When 'verbose' is non-zero, displaying an option value will also tell where it
was last set. Example: > was last set. Example: >
:verbose set shiftwidth cindent? :verbose set shiftwidth cindent?
< shiftwidth=4 ~ < shiftwidth=4 ~
Last set from modeline ~ Last set from modeline line 1 ~
cindent ~ cindent ~
Last set from /usr/local/share/vim/vim60/ftplugin/c.vim ~ Last set from /usr/local/share/vim/vim60/ftplugin/c.vim line 30 ~
This is only done when specific option values are requested, not for ":verbose This is only done when specific option values are requested, not for ":verbose
set all" or ":verbose set" without an argument. 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 by hand there is no "Last set" message.
When the option was set while executing a function, user command or When the option was set while executing a function, user command or
autocommand, the script in which it was defined is reported. autocommand, the script in which it was defined is reported.
A few special texts: A few special texts:
Last set from modeline ~ Last set from modeline line 1 ~
Option was set in a |modeline|. Option was set in a |modeline|.
Last set from --cmd argument ~ Last set from --cmd argument ~
Option was set with command line argument |--cmd| or +. Option was set with command line argument |--cmd| or +.
@@ -691,6 +691,8 @@ A jump table for the options with a short description can be found at |Q_op|.
'{A-Z0-9}, or `{A-Z0-9} command takes one to another file. '{A-Z0-9}, or `{A-Z0-9} command takes one to another file.
Note that for some commands the 'autowrite' option is not used, see Note that for some commands the 'autowrite' option is not used, see
'autowriteall' for that. 'autowriteall' for that.
Some buffers will not be written, specifically when 'buftype' is
"nowrite", "nofile", "terminal" or "prompt".
*'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'* *'autowriteall'* *'awa'* *'noautowriteall'* *'noawa'*
'autowriteall' 'awa' boolean (default off) 'autowriteall' 'awa' boolean (default off)
@@ -1456,8 +1458,8 @@ A jump table for the options with a short description can be found at |Q_op|.
displayed. E.g., when moving vertically it may change column. displayed. E.g., when moving vertically it may change column.
'conceallevel' 'cole' *'conceallevel'* *'cole'* *'conceallevel'* *'cole'*
number (default 0) 'conceallevel' 'cole' number (default 0)
local to window local to window
Determine how text with the "conceal" syntax attribute |:syn-conceal| Determine how text with the "conceal" syntax attribute |:syn-conceal|
is shown: is shown:
@@ -1902,6 +1904,15 @@ A jump table for the options with a short description can be found at |Q_op|.
When omitted a context of six lines is used. When omitted a context of six lines is used.
See |fold-diff|. See |fold-diff|.
iblank Ignore changes where lines are all blank. Adds
the "-B" flag to the "diff" command if
'diffexpr' is empty. Check the documentation
of the "diff" command for what this does
exactly.
NOTE: the diff windows will get out of sync,
because no differences between blank lines are
taken into account.
icase Ignore changes in case of text. "a" and "A" icase Ignore changes in case of text. "a" and "A"
are considered the same. Adds the "-i" flag are considered the same. Adds the "-i" flag
to the "diff" command if 'diffexpr' is empty. to the "diff" command if 'diffexpr' is empty.
@@ -1913,6 +1924,18 @@ A jump table for the options with a short description can be found at |Q_op|.
exactly. It should ignore adding trailing exactly. It should ignore adding trailing
white space, but not leading white space. white space, but not leading white space.
iwhiteall Ignore all white space changes. Adds
the "-w" flag to the "diff" command if
'diffexpr' is empty. Check the documentation
of the "diff" command for what this does
exactly.
iwhiteeol Ignore white space changes at end of line.
Adds the "-Z" flag to the "diff" command if
'diffexpr' is empty. Check the documentation
of the "diff" command for what this does
exactly.
horizontal Start diff mode with horizontal splits (unless horizontal Start diff mode with horizontal splits (unless
explicitly specified otherwise). explicitly specified otherwise).
@@ -3201,8 +3224,7 @@ A jump table for the options with a short description can be found at |Q_op|.
so far, matches. The matched string is highlighted. If the pattern so far, matches. The matched string is highlighted. If the pattern
is invalid or not found, nothing is shown. The screen will be updated is invalid or not found, nothing is shown. The screen will be updated
often, this is only useful on fast terminals. often, this is only useful on fast terminals.
Also applies to the `:s`, `:g` and `:v` commands. < Note that the match will be shown, but the cursor will return to its
Note that the match will be shown, but the cursor will return to its
original position when no match is found and when pressing <Esc>. You original position when no match is found and when pressing <Esc>. You
still need to finish the search command with <Enter> to move the still need to finish the search command with <Enter> to move the
cursor to the match. cursor to the match.
@@ -3369,7 +3391,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Identifiers are used in recognizing environment variables and after a Identifiers are used in recognizing environment variables and after a
match of the 'define' option. It is also used for "\i" in a match of the 'define' option. It is also used for "\i" in a
|pattern|. See 'isfname' for a description of the format of this |pattern|. See 'isfname' for a description of the format of this
option. option. For '@' only characters up to 255 are used.
Careful: If you change this option, it might break expanding Careful: If you change this option, it might break expanding
environment variables. E.g., when '/' is included and Vim tries to environment variables. E.g., when '/' is included and Vim tries to
expand "$HOME/.local/share/nvim/shada/main.shada". Maybe you should expand "$HOME/.local/share/nvim/shada/main.shada". Maybe you should
@@ -3381,8 +3403,9 @@ A jump table for the options with a short description can be found at |Q_op|.
local to buffer local to buffer
Keywords are used in searching and recognizing with many commands: Keywords are used in searching and recognizing with many commands:
"w", "*", "[i", etc. It is also used for "\k" in a |pattern|. See "w", "*", "[i", etc. It is also used for "\k" in a |pattern|. See
'isfname' for a description of the format of this option. For C 'isfname' for a description of the format of this option. For '@'
programs you could use "a-z,A-Z,48-57,_,.,-,>". characters above 255 check the "word" character class.
For C programs you could use "a-z,A-Z,48-57,_,.,-,>".
For a help file it is set to all non-blank printable characters except For a help file it is set to all non-blank printable characters except
'*', '"' and '|' (so that CTRL-] on a command finds the help for that '*', '"' and '|' (so that CTRL-] on a command finds the help for that
command). command).
@@ -4397,13 +4420,13 @@ A jump table for the options with a short description can be found at |Q_op|.
security reasons. security reasons.
*'printencoding'* *'penc'* *'printencoding'* *'penc'*
'printencoding' 'penc' String (default empty, except for some systems) 'printencoding' 'penc' string (default empty, except for some systems)
global global
Sets the character encoding used when printing. Sets the character encoding used when printing.
See |penc-option|. See |penc-option|.
*'printexpr'* *'pexpr'* *'printexpr'* *'pexpr'*
'printexpr' 'pexpr' String (default: see below) 'printexpr' 'pexpr' string (default: see below)
global global
Expression used to print the PostScript produced with |:hardcopy|. Expression used to print the PostScript produced with |:hardcopy|.
See |pexpr-option|. See |pexpr-option|.

3
runtime/doc/recover.txt
View File

@@ -27,6 +27,9 @@ You can see the name of the current swap file being used with the command:
:sw[apname] *:sw* *:swapname* :sw[apname] *:sw* *:swapname*
Or you can use the |swapname()| function, which also allows for seeing the
swap file name of other buffers.
The name of the swap file is normally the same as the file you are editing, The name of the swap file is normally the same as the file you are editing,
with the extension ".swp". with the extension ".swp".
- On Unix, a '.' is prepended to swap file names in the same directory as the - On Unix, a '.' is prepended to swap file names in the same directory as the

50
runtime/doc/syntax.txt
View File

@@ -1243,7 +1243,7 @@ doxygen_javadoc_autobrief 1 Set to 0 to disable javadoc autobrief
doxygen_end_punctuation '[.]' Set to regexp match for the ending doxygen_end_punctuation '[.]' Set to regexp match for the ending
punctuation of brief punctuation of brief
There are also some hilight groups worth mentioning as they can be useful in There are also some highlight groups worth mentioning as they can be useful in
configuration. configuration.
Highlight Effect ~ Highlight Effect ~
@@ -2610,6 +2610,48 @@ Any combination of these three variables is legal, but might highlight more
commands than are actually available to you by the game. commands than are actually available to you by the game.
R *r.vim* *ft-r-syntax*
The parsing of R code for syntax highlight starts 40 lines backwards, but you
can set a different value in your |vimrc|. Example: >
let r_syntax_minlines = 60
You can also turn off syntax highlighting of ROxygen: >
let r_syntax_hl_roxygen = 0
enable folding of code delimited by parentheses, square brackets and curly
braces: >
let r_syntax_folding = 1
and highlight as functions all keywords followed by an opening parenthesis: >
let r_syntax_fun_pattern = 1
R MARKDOWN *rmd.vim* *ft-rmd-syntax*
To disable syntax highlight of YAML header, add to your |vimrc|: >
let rmd_syn_hl_yaml = 0
To disable syntax highlighting of citation keys: >
let rmd_syn_hl_citations = 0
To highlight R code in knitr chunk headers: >
let rmd_syn_hl_chunk = 1
By default, chunks of R code will be highlighted following the rules of R
language. If you want proper syntax highlighting of chunks of other languages,
you should add them to either `markdown_fenced_languages` or
`rmd_fenced_languages`. For example to properly highlight both R and Python,
you may add this to your |vimrc|: >
let rmd_fenced_languages = ['r', 'python']
R RESTRUCTURED TEXT *rrst.vim* *ft-rrst-syntax*
To highlight R code in knitr chunk headers, add to your |vimrc|: >
let rrst_syn_hl_chunk = 1
READLINE *readline.vim* *ft-readline-syntax* READLINE *readline.vim* *ft-readline-syntax*
The readline library is primarily used by the BASH shell, which adds quite a The readline library is primarily used by the BASH shell, which adds quite a
@@ -3138,6 +3180,12 @@ by syntax/tex.vim. Please consider uploading any extensions that you write,
which typically would go in $HOME/after/syntax/tex/[pkgname].vim, to which typically would go in $HOME/after/syntax/tex/[pkgname].vim, to
http://vim.sf.net/. http://vim.sf.net/.
I've included some support for various popular packages on my website: >
http://www.drchip.org/astronaut/vim/index.html#LATEXPKGS
<
The syntax files there go into your .../after/syntax/tex/ directory.
*tex-error* *g:tex_no_error* *tex-error* *g:tex_no_error*
Tex: Excessive Error Highlighting? ~ Tex: Excessive Error Highlighting? ~

2
runtime/doc/usr_11.txt
View File

@@ -283,6 +283,8 @@ machines. Therefore, don't rely on Vim always warning you.
If you really don't want to see this message, you can add the 'A' flag to the If you really don't want to see this message, you can add the 'A' flag to the
'shortmess' option. But it's very unusual that you need this. 'shortmess' option. But it's very unusual that you need this.
For programatic access to the swap file, see |swapinfo()|.
============================================================================== ==============================================================================
*11.4* Further reading *11.4* Further reading

20
runtime/ftplugin/cmake.vim
View File

@@ -1,16 +1,34 @@
" Vim filetype plugin " Vim filetype plugin
" Language: CMake " Language: CMake
" Maintainer: Keith Smiley <keithbsmiley@gmail.com> " Maintainer: Keith Smiley <keithbsmiley@gmail.com>
" Last Change: 2017 Dec 24 " Last Change: 2018 Aug 30
" 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")
finish finish
endif endif
" save 'cpo' for restoration at the end of this file
let s:cpo_save = &cpo
set cpo&vim
" Don't load another plugin for this buffer " Don't load another plugin for this buffer
let b:did_ftplugin = 1 let b:did_ftplugin = 1
let b:undo_ftplugin = "setl commentstring<" let b:undo_ftplugin = "setl commentstring<"
if exists('loaded_matchit')
let b:match_words = '\<if\>:\<elseif\>\|\<else\>:\<endif\>'
\ . ',\<foreach\>\|\<while\>:\<break\>:\<endforeach\>\|\<endwhile\>'
\ . ',\<macro\>:\<endmacro\>'
\ . ',\<function\>:\<endfunction\>'
let b:match_ignorecase = 1
let b:undo_ftplugin .= "| unlet b:match_words"
endif
setlocal commentstring=#\ %s setlocal commentstring=#\ %s
" restore 'cpo' and clean up buffer variable
let &cpo = s:cpo_save
unlet s:cpo_save

4
runtime/ftplugin/haskell.vim
View File

@@ -1,7 +1,8 @@
" Vim filetype plugin file " Vim filetype plugin file
" Language: Haskell " Language: Haskell
" Maintainer: Daniel Campoverde <alx@sillybytes.net>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09 " Latest Revision: 2018-08-27
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
@@ -15,6 +16,7 @@ let b:undo_ftplugin = "setl com< cms< fo<"
setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s setlocal comments=s1fl:{-,mb:-,ex:-},:-- commentstring=--\ %s
setlocal formatoptions-=t formatoptions+=croql setlocal formatoptions-=t formatoptions+=croql
setlocal omnifunc=haskellcomplete#Complete
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save

33
runtime/ftplugin/rmd.vim
View File

@@ -2,7 +2,7 @@
" Language: R Markdown file " Language: R Markdown file
" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Mon Jun 06, 2016 09:41PM " Last Change: Sun Jul 22, 2018 06:51PM
" Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann) " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
" Only do this when not yet done for this buffer " Only do this when not yet done for this buffer
@@ -10,19 +10,12 @@ if exists("b:did_ftplugin")
finish finish
endif endif
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim if exists('g:rmd_include_html') && g:rmd_include_html
runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
" Nvim-R plugin needs this
if exists("*CompleteR")
if &omnifunc == "CompleteR"
let b:rplugin_nonr_omnifunc = ""
else
let b:rplugin_nonr_omnifunc = &omnifunc
endif
set omnifunc=CompleteR
endif endif
setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s setlocal comments=fb:*,fb:-,fb:+,n:>
setlocal commentstring=#\ %s
setlocal formatoptions+=tcqln setlocal formatoptions+=tcqln
setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+ setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
setlocal iskeyword=@,48-57,_,. setlocal iskeyword=@,48-57,_,.
@@ -30,6 +23,22 @@ setlocal iskeyword=@,48-57,_,.
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
function! FormatRmd()
if search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")
setlocal comments=:#',:###,:##,:#
else
setlocal comments=fb:*,fb:-,fb:+,n:>
endif
return 1
endfunction
" If you do not want 'comments' dynamically defined, put in your vimrc:
" let g:rmd_dynamic_comments = 0
if !exists("g:rmd_dynamic_comments") || (exists("g:rmd_dynamic_comments") && g:rmd_dynamic_comments == 1)
setlocal formatexpr=FormatRmd()
endif
" Enables pandoc if it is installed " Enables pandoc if it is installed
unlet! b:did_ftplugin unlet! b:did_ftplugin
runtime ftplugin/pandoc.vim runtime ftplugin/pandoc.vim

20
runtime/ftplugin/rrst.vim
View File

@@ -2,7 +2,7 @@
" Language: reStructuredText documentation format with R code " Language: reStructuredText documentation format with R code
" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Tue Apr 07, 2015 04:38PM " Last Change: Wed Nov 01, 2017 10:47PM
" Original work by Alex Zvoleff " Original work by Alex Zvoleff
" Only do this when not yet done for this buffer " Only do this when not yet done for this buffer
@@ -16,11 +16,27 @@ let b:did_ftplugin = 1
let s:cpo_save = &cpo let s:cpo_save = &cpo
set cpo&vim set cpo&vim
setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s setlocal comments=fb:*,fb:-,fb:+,n:>
setlocal commentstring=#\ %s
setlocal formatoptions+=tcqln setlocal formatoptions+=tcqln
setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+ setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
setlocal iskeyword=@,48-57,_,. setlocal iskeyword=@,48-57,_,.
function! FormatRrst()
if search('^\.\. {r', "bncW") > search('^\.\. \.\.$', "bncW")
setlocal comments=:#',:###,:##,:#
else
setlocal comments=fb:*,fb:-,fb:+,n:>
endif
return 1
endfunction
" If you do not want 'comments' dynamically defined, put in your vimrc:
" let g:rrst_dynamic_comments = 0
if !exists("g:rrst_dynamic_comments") || (exists("g:rrst_dynamic_comments") && g:rrst_dynamic_comments == 1)
setlocal formatexpr=FormatRrst()
endif
if has("gui_win32") && !exists("b:browsefilter") if has("gui_win32") && !exists("b:browsefilter")
let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" . let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
\ "All Files (*.*)\t*.*\n" \ "All Files (*.*)\t*.*\n"

11
runtime/ftplugin/vim.vim
View File

@@ -70,10 +70,10 @@ if !exists("no_plugin_maps") && !exists("no_vim_maps")
vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "bW")<CR> vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "bW")<CR>
nnoremap <silent><buffer> ]] m':call search('^\s*fu\%[nction]\>', "W")<CR> nnoremap <silent><buffer> ]] m':call search('^\s*fu\%[nction]\>', "W")<CR>
vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "W")<CR> vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "W")<CR>
nnoremap <silent><buffer> [] m':call search('^\s*endf*\%[unction]\>', "bW")<CR> nnoremap <silent><buffer> [] m':call search('^\s*endf\%[unction]\>', "bW")<CR>
vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf*\%[unction]\>', "bW")<CR> vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf\%[unction]\>', "bW")<CR>
nnoremap <silent><buffer> ][ m':call search('^\s*endf*\%[unction]\>', "W")<CR> nnoremap <silent><buffer> ][ m':call search('^\s*endf\%[unction]\>', "W")<CR>
vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf*\%[unction]\>', "W")<CR> vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf\%[unction]\>', "W")<CR>
" Move around comments " Move around comments
nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR> nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
@@ -90,8 +90,7 @@ if exists("loaded_matchit")
\ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' . \ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
\ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' . \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
\ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' . \ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' .
\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,' . \ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,'
\ '(:)'
" Ignore syntax region commands and settings, any 'en*' would clobber " Ignore syntax region commands and settings, any 'en*' would clobber
" if-endif. " if-endif.
" - set spl=de,en " - set spl=de,en

59
runtime/indent/dosbatch.vim Normal file
View File

@@ -0,0 +1,59 @@
" Vim indent file
" Language: MSDOS batch file (with NT command extensions)
" Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-dosbatch-indent
" Last Change: 2017 May 10
" Filenames: *.bat
" License: VIM License
if exists("b:did_indent")
finish
endif
let b:did_indent = 1
setlocal nosmartindent
setlocal noautoindent
setlocal indentexpr=GetDosBatchIndent(v:lnum)
setlocal indentkeys=!^F,o,O
setlocal indentkeys+=0=)
if exists("*GetDosBatchIndent")
finish
endif
let s:cpo_save = &cpo
set cpo&vim
function! GetDosBatchIndent(lnum)
let l:prevlnum = prevnonblank(a:lnum-1)
if l:prevlnum == 0
" top of file
return 0
endif
" grab the previous and current line, stripping comments.
let l:prevl = substitute(getline(l:prevlnum), '\c^\s*\%(@\s*\)\?rem\>.*$', '', '')
let l:thisl = getline(a:lnum)
let l:previ = indent(l:prevlnum)
let l:ind = l:previ
if l:prevl =~? '^\s*@\=if\>.*(\s*$' ||
\ l:prevl =~? '\<do\>\s*(\s*$' ||
\ l:prevl =~? '\<else\>\s*\%(if\>.*\)\?(\s*$' ||
\ l:prevl =~? '^.*\(&&\|||\)\s*(\s*$'
" previous line opened a block
let l:ind += shiftwidth()
endif
if l:thisl =~ '^\s*)'
" this line closed a block
let l:ind -= shiftwidth()
endif
return l:ind
endfunction
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: ts=8 sw=2 sts=2

6
runtime/indent/dtd.vim
View File

@@ -3,9 +3,6 @@
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2011-07-08 " Latest Revision: 2011-07-08
let s:cpo_save = &cpo
set cpo&vim
setlocal indentexpr=GetDTDIndent() setlocal indentexpr=GetDTDIndent()
setlocal indentkeys=!^F,o,O,> setlocal indentkeys=!^F,o,O,>
setlocal nosmartindent setlocal nosmartindent
@@ -14,6 +11,9 @@ if exists("*GetDTDIndent")
finish finish
endif endif
let s:cpo_save = &cpo
set cpo&vim
" TODO: Needs to be adjusted to stop at [, <, and ]. " TODO: Needs to be adjusted to stop at [, <, and ].
let s:token_pattern = '^[^[:space:]]\+' let s:token_pattern = '^[^[:space:]]\+'

8
runtime/indent/html.vim
View File

@@ -663,7 +663,7 @@ func! s:CSSIndent()
else else
let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:' let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
let prev_unfinished = s:CssUnfinished(prev_text) let prev_unfinished = s:CssUnfinished(prev_text)
if !cur_hasfield && (prev_hasfield || prev_unfinished) if prev_unfinished
" Continuation line has extra indent if the previous line was not a " Continuation line has extra indent if the previous line was not a
" continuation line. " continuation line.
let extra = shiftwidth() let extra = shiftwidth()
@@ -716,9 +716,13 @@ func! s:CSSIndent()
endfunc "}}} endfunc "}}}
" Inside <style>: Whether a line is unfinished. " Inside <style>: Whether a line is unfinished.
" tag:
" tag: blah
" tag: blah &&
" tag: blah ||
func! s:CssUnfinished(text) func! s:CssUnfinished(text)
"{{{ "{{{
return a:text =~ '\s\(||\|&&\|:\)\s*$' return a:text =~ '\(||\|&&\|:\|\k\)\s*$'
endfunc "}}} endfunc "}}}
" Search back for the first unfinished line above "lnum". " Search back for the first unfinished line above "lnum".

13
runtime/indent/prolog.vim
View File

@@ -2,6 +2,7 @@
" Maintainer : Gergely Kontra <kgergely@mcl.hu> " Maintainer : Gergely Kontra <kgergely@mcl.hu>
" Revised on : 2002.02.18. 23:34:05 " Revised on : 2002.02.18. 23:34:05
" Language : Prolog " Language : Prolog
" Last change by: Takuya Fujiwara, 2018 Sep 23
" TODO: " TODO:
" checking with respect to syntax highlighting " checking with respect to syntax highlighting
@@ -37,10 +38,18 @@ function! GetPrologIndent()
let ind = indent(pnum) let ind = indent(pnum)
" Previous line was comment -> use previous line's indent " Previous line was comment -> use previous line's indent
if pline =~ '^\s*%' if pline =~ '^\s*%'
retu ind return ind
endif
" Previous line was the start of block comment -> +1 after '/*' comment
if pline =~ '^\s*/\*'
return ind + 1
endif
" Previous line was the end of block comment -> -1 after '*/' comment
if pline =~ '^\s*\*/'
return ind - 1
endif endif
" Check for clause head on previous line " Check for clause head on previous line
if pline =~ ':-\s*\(%.*\)\?$' if pline =~ '\%(:-\|-->\)\s*\(%.*\)\?$'
let ind = ind + shiftwidth() let ind = ind + shiftwidth()
" Check for end of clause on previous line " Check for end of clause on previous line
elseif pline =~ '\.\s*\(%.*\)\?$' elseif pline =~ '\.\s*\(%.*\)\?$'

14
runtime/indent/python.vim
View File

@@ -53,6 +53,11 @@ function GetPythonIndent(lnum)
return 0 return 0
endif endif
" searchpair() can be slow sometimes, limit the time to 100 msec or what is
" put in g:pyindent_searchpair_timeout
let searchpair_stopline = 0
let searchpair_timeout = get(g:, 'pyindent_searchpair_timeout', 150)
" If the previous line is inside parenthesis, use the indent of the starting " If the previous line is inside parenthesis, use the indent of the starting
" line. " line.
" Trick: use the non-existing "dummy" variable to break out of the loop when " Trick: use the non-existing "dummy" variable to break out of the loop when
@@ -61,7 +66,8 @@ function GetPythonIndent(lnum)
let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW', let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
\ "line('.') < " . (plnum - s:maxoff) . " ? dummy :" \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
\ . " =~ '\\(Comment\\|Todo\\|String\\)$'") \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
\ searchpair_stopline, searchpair_timeout)
if parlnum > 0 if parlnum > 0
let plindent = indent(parlnum) let plindent = indent(parlnum)
let plnumstart = parlnum let plnumstart = parlnum
@@ -80,14 +86,16 @@ function GetPythonIndent(lnum)
let p = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW', let p = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
\ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
\ . " =~ '\\(Comment\\|Todo\\|String\\)$'") \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
\ searchpair_stopline, searchpair_timeout)
if p > 0 if p > 0
if p == plnum if p == plnum
" When the start is inside parenthesis, only indent one 'shiftwidth'. " When the start is inside parenthesis, only indent one 'shiftwidth'.
let pp = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW', let pp = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
\ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
\ . " synIDattr(synID(line('.'), col('.'), 1), 'name')" \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
\ . " =~ '\\(Comment\\|Todo\\|String\\)$'") \ . " =~ '\\(Comment\\|Todo\\|String\\)$'",
\ searchpair_stopline, searchpair_timeout)
if pp > 0 if pp > 0
return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : shiftwidth()) return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : shiftwidth())
endif endif

37
runtime/indent/r.vim
View File

@@ -2,7 +2,7 @@
" Language: R " Language: R
" Author: Jakson Alves de Aquino <jalvesaq@gmail.com> " Author: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Thu Feb 18, 2016 06:32AM " Last Change: Sun Aug 19, 2018 09:13PM
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
@@ -19,22 +19,16 @@ if exists("*GetRIndent")
finish finish
endif endif
let s:cpo_save = &cpo
set cpo&vim
" Options to make the indentation more similar to Emacs/ESS: " Options to make the indentation more similar to Emacs/ESS:
if !exists("g:r_indent_align_args") let g:r_indent_align_args = get(g:, 'r_indent_align_args', 1)
let g:r_indent_align_args = 1 let g:r_indent_ess_comments = get(g:, 'r_indent_ess_comments', 0)
endif let g:r_indent_comment_column = get(g:, 'r_indent_comment_column', 40)
if !exists("g:r_indent_ess_comments") let g:r_indent_ess_compatible = get(g:, 'r_indent_ess_compatible', 0)
let g:r_indent_ess_comments = 0 let g:r_indent_op_pattern = get(g:, 'r_indent_op_pattern',
endif \ '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$')
if !exists("g:r_indent_comment_column")
let g:r_indent_comment_column = 40
endif
if ! exists("g:r_indent_ess_compatible")
let g:r_indent_ess_compatible = 0
endif
if ! exists("g:r_indent_op_pattern")
let g:r_indent_op_pattern = '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'
endif
function s:RDelete_quotes(line) function s:RDelete_quotes(line)
let i = 0 let i = 0
@@ -231,7 +225,7 @@ function GetRIndent()
let cline = SanitizeRLine(cline) let cline = SanitizeRLine(cline)
if cline =~ '^\s*}' || cline =~ '^\s*}\s*)$' if cline =~ '^\s*}'
let indline = s:Get_matching_brace(clnum, '{', '}', 1) let indline = s:Get_matching_brace(clnum, '{', '}', 1)
if indline > 0 && indline != clnum if indline > 0 && indline != clnum
let iline = SanitizeRLine(getline(indline)) let iline = SanitizeRLine(getline(indline))
@@ -244,6 +238,11 @@ function GetRIndent()
endif endif
endif endif
if cline =~ '^\s*)$'
let indline = s:Get_matching_brace(clnum, '(', ')', 1)
return indent(indline)
endif
" Find the first non blank line above the current line " Find the first non blank line above the current line
let lnum = s:Get_prev_line(clnum) let lnum = s:Get_prev_line(clnum)
" Hit the start of the file, use zero indent. " Hit the start of the file, use zero indent.
@@ -515,7 +514,9 @@ function GetRIndent()
endwhile endwhile
return ind return ind
endfunction endfunction
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: sw=2 " vim: sw=2

25
runtime/indent/rmd.vim
View File

@@ -2,7 +2,7 @@
" Language: Rmd " Language: Rmd
" Author: Jakson Alves de Aquino <jalvesaq@gmail.com> " Author: Jakson Alves de Aquino <jalvesaq@gmail.com>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Tue Apr 07, 2015 04:38PM " Last Change: Sun Aug 19, 2018 09:14PM
" Only load this indent file when no other was loaded. " Only load this indent file when no other was loaded.
@@ -20,7 +20,10 @@ if exists("*GetRmdIndent")
finish finish
endif endif
function GetMdIndent() let s:cpo_save = &cpo
set cpo&vim
function s:GetMdIndent()
let pline = getline(v:lnum - 1) let pline = getline(v:lnum - 1)
let cline = getline(v:lnum) let cline = getline(v:lnum)
if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+' if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+'
@@ -33,15 +36,31 @@ function GetMdIndent()
return indent(prevnonblank(v:lnum - 1)) return indent(prevnonblank(v:lnum - 1))
endfunction endfunction
function s:GetYamlIndent()
let pline = getline(v:lnum - 1)
if pline =~ ':\s*$'
return indent(v:lnum) + &sw
elseif pline =~ '^\s*- '
return indent(v:lnum) + 2
endif
return indent(prevnonblank(v:lnum - 1))
endfunction
function GetRmdIndent() function GetRmdIndent()
if getline(".") =~ '^[ \t]*```{r .*}$' || getline(".") =~ '^[ \t]*```$' if getline(".") =~ '^[ \t]*```{r .*}$' || getline(".") =~ '^[ \t]*```$'
return 0 return 0
endif endif
if search('^[ \t]*```{r', "bncW") > search('^[ \t]*```$', "bncW") if search('^[ \t]*```{r', "bncW") > search('^[ \t]*```$', "bncW")
return s:RIndent() return s:RIndent()
elseif v:lnum > 1 && search('^---$', "bnW") == 1 &&
\ (search('^---$', "nW") > v:lnum || search('^...$', "nW") > v:lnum)
return s:GetYamlIndent()
else else
return GetMdIndent() return s:GetMdIndent()
endif endif
endfunction endfunction
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: sw=2 " vim: sw=2

2
runtime/indent/rnoweb.vim
View File

@@ -21,7 +21,7 @@ else
let s:TeXIndent = function(substitute(&indentexpr, "()", "", "")) let s:TeXIndent = function(substitute(&indentexpr, "()", "", ""))
endif endif
unlet b:did_indent unlet! b:did_indent
runtime indent/r.vim runtime indent/r.vim
let s:RIndent = function(substitute(&indentexpr, "()", "", "")) let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
let b:did_indent = 1 let b:did_indent = 1

4
runtime/indent/teraterm.vim
View File

@@ -1,9 +1,9 @@
" Vim indent file " Vim indent file
" Language: Tera Term Language (TTL) " Language: Tera Term Language (TTL)
" Based on Tera Term Version 4.92 " Based on Tera Term Version 4.100
" Maintainer: Ken Takata " Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-teraterm " URL: https://github.com/k-takata/vim-teraterm
" Last Change: 2017 Jun 13 " Last Change: 2018-08-31
" Filenames: *.ttl " Filenames: *.ttl
" License: VIM License " License: VIM License

196
runtime/menu.vim
View File

@@ -2,7 +2,7 @@
" You can also use this as a start for your own set of menus. " You can also use this as a start for your own set of menus.
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2017 Mar 04 " Last Change: 2018 May 17
" Note that ":an" (short for ":anoremenu") is often used to make a menu work " Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user. " in all modes and avoid side effects from mappings defined by the user.
@@ -56,6 +56,13 @@ if exists("v:lang") || &langmenu != ""
let s:lang = substitute(s:lang, '\.[^.]*', "", "") let s:lang = substitute(s:lang, '\.[^.]*', "", "")
exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim" exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim"
if !exists("did_menu_trans") && s:lang =~ '_'
" If the language includes a region try matching without that region.
" (e.g. find menu_de.vim if s:lang == de_DE).
let langonly = substitute(s:lang, '_.*', "", "")
exe "runtime! lang/menu_" . langonly . "[^a-z]*vim"
endif
if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us' if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us'
" On windows locale names are complicated, try using $LANG, it might " On windows locale names are complicated, try using $LANG, it might
" have been set by set_init_1(). But don't do this for "en" or "en_us". " have been set by set_init_1(). But don't do this for "en" or "en_us".
@@ -159,7 +166,7 @@ nnoremenu 20.370 &Edit.Put\ &Before<Tab>[p [p
inoremenu &Edit.Put\ &Before<Tab>[p <C-O>[p inoremenu &Edit.Put\ &Before<Tab>[p <C-O>[p
nnoremenu 20.380 &Edit.Put\ &After<Tab>]p ]p nnoremenu 20.380 &Edit.Put\ &After<Tab>]p ]p
inoremenu &Edit.Put\ &After<Tab>]p <C-O>]p inoremenu &Edit.Put\ &After<Tab>]p <C-O>]p
if has("win32") || has("win16") if has("win32")
vnoremenu 20.390 &Edit.&Delete<Tab>x x vnoremenu 20.390 &Edit.&Delete<Tab>x x
endif endif
noremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG :<C-U>call <SID>SelectAll()<CR> noremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG :<C-U>call <SID>SelectAll()<CR>
@@ -167,7 +174,7 @@ inoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG <C-O>:call <SID>S
cnoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG <C-U>call <SID>SelectAll()<CR> cnoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG <C-U>call <SID>SelectAll()<CR>
an 20.405 &Edit.-SEP2- <Nop> an 20.405 &Edit.-SEP2- <Nop>
if has("win32") || has("win16") || has("gui_gtk") || has("gui_kde") || has("gui_motif") if has("win32") || has("gui_gtk") || has("gui_kde") || has("gui_motif")
an 20.410 &Edit.&Find\.\.\. :promptfind<CR> an 20.410 &Edit.&Find\.\.\. :promptfind<CR>
vunmenu &Edit.&Find\.\.\. vunmenu &Edit.&Find\.\.\.
vnoremenu <silent> &Edit.&Find\.\.\. y:promptfind <C-R>=<SID>FixFText()<CR><CR> vnoremenu <silent> &Edit.&Find\.\.\. y:promptfind <C-R>=<SID>FixFText()<CR><CR>
@@ -194,6 +201,8 @@ fun! s:EditVimrc()
else else
let fname = $VIM . "/_vimrc" let fname = $VIM . "/_vimrc"
endif endif
elseif has("amiga")
let fname = "s:.vimrc"
else else
let fname = $HOME . "/.vimrc" let fname = $HOME . "/.vimrc"
endif endif
@@ -337,57 +346,77 @@ fun! s:FileFormat()
endif endif
endfun endfun
let s:did_setup_color_schemes = 0
" Setup the Edit.Color Scheme submenu " Setup the Edit.Color Scheme submenu
func! s:SetupColorSchemes() abort
if s:did_setup_color_schemes
return
endif
let s:did_setup_color_schemes = 1
" get NL separated string with file names let n = globpath(&runtimepath, "colors/*.vim", 1, 1)
let s:n = globpath(&runtimepath, "colors/*.vim") let n += globpath(&runtimepath, "pack/*/start/*/colors/*.vim", 1, 1)
let n += globpath(&runtimepath, "pack/*/opt/*/colors/*.vim", 1, 1)
" split at NL, ignore case for Windows, sort on name " Ignore case for VMS and windows, sort on name
let s:names = sort(map(split(s:n, "\n"), 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1) let names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
" define all the submenu entries " define all the submenu entries
let s:idx = 100 let idx = 100
for s:name in s:names for name in names
exe "an 20.450." . s:idx . ' &Edit.C&olor\ Scheme.' . s:name . " :colors " . s:name . "<CR>" exe "an 20.450." . idx . ' &Edit.C&olor\ Scheme.' . name . " :colors " . name . "<CR>"
let s:idx = s:idx + 10 let idx = idx + 10
endfor endfor
unlet s:name s:names s:n s:idx silent! aunmenu &Edit.Show\ C&olor\ Schemes\ in\ Menu
endfun
if exists("do_no_lazyload_menus")
call s:SetupColorSchemes()
else
an <silent> 20.450 &Edit.Show\ C&olor\ Schemes\ in\ Menu :call <SID>SetupColorSchemes()<CR>
endif
" Setup the Edit.Keymap submenu " Setup the Edit.Keymap submenu
if has("keymap") if has("keymap")
let s:n = globpath(&runtimepath, "keymap/*.vim") let s:did_setup_keymaps = 0
if s:n != ""
let s:idx = 100 func! s:SetupKeymaps() abort
an 20.460.90 &Edit.&Keymap.None :set keymap=<CR> if s:did_setup_keymaps
while strlen(s:n) > 0 return
let s:i = stridx(s:n, "\n") endif
if s:i < 0 let s:did_setup_keymaps = 1
let s:name = s:n
let s:n = "" let n = globpath(&runtimepath, "keymap/*.vim", 1, 1)
else if !empty(n)
let s:name = strpart(s:n, 0, s:i) let idx = 100
let s:n = strpart(s:n, s:i + 1, 19999) an 20.460.90 &Edit.&Keymap.None :set keymap=<CR>
endif for name in n
" Ignore case for Windows " Ignore case for VMS and windows
let s:name = substitute(s:name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '') let name = substitute(name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
exe "an 20.460." . s:idx . ' &Edit.&Keymap.' . s:name . " :set keymap=" . s:name . "<CR>" exe "an 20.460." . idx . ' &Edit.&Keymap.' . name . " :set keymap=" . name . "<CR>"
unlet s:name let idx = idx + 10
unlet s:i endfor
let s:idx = s:idx + 10 endif
endwhile silent! aunmenu &Edit.Show\ &Keymaps\ in\ Menu
unlet s:idx endfun
if exists("do_no_lazyload_menus")
call s:SetupKeymaps()
else
an <silent> 20.460 &Edit.Show\ &Keymaps\ in\ Menu :call <SID>SetupKeymaps()<CR>
endif endif
unlet s:n
endif endif
if has("win32") || has("win16") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_mac") if has("win32") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_photon") || has("gui_mac")
an 20.470 &Edit.Select\ Fo&nt\.\.\. :set guifont=*<CR> an 20.470 &Edit.Select\ Fo&nt\.\.\. :set guifont=*<CR>
endif endif
" Programming menu " Programming menu
if !exists("g:ctags_command") if !exists("g:ctags_command")
let g:ctags_command = "ctags -R ." if has("vms")
let g:ctags_command = "mc vim:ctags *.*"
else
let g:ctags_command = "ctags -R ."
endif
endif endif
an 40.300 &Tools.&Jump\ to\ This\ Tag<Tab>g^] g<C-]> an 40.300 &Tools.&Jump\ to\ This\ Tag<Tab>g^] g<C-]>
@@ -435,10 +464,10 @@ if has("spell")
endif endif
let found = 0 let found = 0
let s = globpath(&rtp, "spell/*." . enc . ".spl") let s = globpath(&runtimepath, "spell/*." . enc . ".spl", 1, 1)
if s != "" if !empty(s)
let n = 300 let n = 300
for f in split(s, "\n") for f in s
let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "") let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
if nm != "en" && nm !~ '/' if nm != "en" && nm !~ '/'
let _nm = nm let _nm = nm
@@ -532,8 +561,12 @@ an <silent> 40.540 &Tools.Conve&rt\ Back<Tab>:%!xxd\ -r
" set. " set.
func! s:XxdConv() func! s:XxdConv()
let mod = &mod let mod = &mod
call s:XxdFind() if has("vms")
exe '%!"' . g:xxdprogram . '"' %!mc vim:xxd
else
call s:XxdFind()
exe '%!"' . g:xxdprogram . '"'
endif
if getline(1) =~ "^0000000:" " only if it worked if getline(1) =~ "^0000000:" " only if it worked
set ft=xxd set ft=xxd
endif endif
@@ -542,8 +575,12 @@ endfun
func! s:XxdBack() func! s:XxdBack()
let mod = &mod let mod = &mod
call s:XxdFind() if has("vms")
exe '%!"' . g:xxdprogram . '" -r' %!mc vim:xxd -r
else
call s:XxdFind()
exe '%!"' . g:xxdprogram . '" -r'
endif
set ft= set ft=
doautocmd filetypedetect BufReadPost doautocmd filetypedetect BufReadPost
let &mod = mod let &mod = mod
@@ -560,27 +597,46 @@ func! s:XxdFind()
endif endif
endfun endfun
let s:did_setup_compilers = 0
" Setup the Tools.Compiler submenu " Setup the Tools.Compiler submenu
let s:n = globpath(&runtimepath, "compiler/*.vim") func! s:SetupCompilers() abort
let s:idx = 100 if s:did_setup_compilers
while strlen(s:n) > 0 return
let s:i = stridx(s:n, "\n")
if s:i < 0
let s:name = s:n
let s:n = ""
else
let s:name = strpart(s:n, 0, s:i)
let s:n = strpart(s:n, s:i + 1, 19999)
endif endif
" Ignore case for Windows let s:did_setup_compilers = 1
let s:name = substitute(s:name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
exe "an 30.440." . s:idx . ' &Tools.Se&t\ Compiler.' . s:name . " :compiler " . s:name . "<CR>" let n = globpath(&runtimepath, "compiler/*.vim", 1, 1)
unlet s:name let idx = 100
unlet s:i for name in n
let s:idx = s:idx + 10 " Ignore case for VMS and windows
endwhile let name = substitute(name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
unlet s:n exe "an 30.440." . idx . ' &Tools.Se&t\ Compiler.' . name . " :compiler " . name . "<CR>"
unlet s:idx let idx = idx + 10
endfor
silent! aunmenu &Tools.Show\ Compiler\ Se&ttings\ in\ Menu
endfun
if exists("do_no_lazyload_menus")
call s:SetupCompilers()
else
an <silent> 30.440 &Tools.Show\ Compiler\ Se&ttings\ in\ Menu :call <SID>SetupCompilers()<CR>
endif
" Load ColorScheme, Compiler Setting and Keymap menus when idle.
if !exists("do_no_lazyload_menus")
func! s:SetupLazyloadMenus()
call s:SetupColorSchemes()
call s:SetupCompilers()
if has("keymap")
call s:SetupKeymaps()
endif
endfunc
augroup SetupLazyloadMenus
au!
au CursorHold,CursorHoldI * call <SID>SetupLazyloadMenus() | au! SetupLazyloadMenus
augroup END
endif
if !exists("no_buffers_menu") if !exists("no_buffers_menu")
@@ -683,13 +739,21 @@ endfunc
func! s:BMHash(name) func! s:BMHash(name)
" Make name all upper case, so that chars are between 32 and 96 " Make name all upper case, so that chars are between 32 and 96
let nm = substitute(a:name, ".*", '\U\0', "") let nm = substitute(a:name, ".*", '\U\0', "")
let sp = char2nr(' ') if has("ebcdic")
" HACK: Replace all non alphabetics with 'Z'
" Just to make it work for now.
let nm = substitute(nm, "[^A-Z]", 'Z', "g")
let sp = char2nr('A') - 1
else
let sp = char2nr(' ')
endif
" convert first six chars into a number for sorting: " convert first six chars into a number for sorting:
return (char2nr(nm[0]) - sp) * 0x800000 + (char2nr(nm[1]) - sp) * 0x20000 + (char2nr(nm[2]) - sp) * 0x1000 + (char2nr(nm[3]) - sp) * 0x80 + (char2nr(nm[4]) - sp) * 0x20 + (char2nr(nm[5]) - sp) return (char2nr(nm[0]) - sp) * 0x800000 + (char2nr(nm[1]) - sp) * 0x20000 + (char2nr(nm[2]) - sp) * 0x1000 + (char2nr(nm[3]) - sp) * 0x80 + (char2nr(nm[4]) - sp) * 0x20 + (char2nr(nm[5]) - sp)
endfunc endfunc
func! s:BMHash2(name) func! s:BMHash2(name)
let nm = substitute(a:name, ".", '\L\0', "") let nm = substitute(a:name, ".", '\L\0', "")
" Not exactly right for EBCDIC...
if nm[0] < 'a' || nm[0] > 'z' if nm[0] < 'a' || nm[0] > 'z'
return '&others.' return '&others.'
elseif nm[0] <= 'd' elseif nm[0] <= 'd'
@@ -1082,7 +1146,7 @@ if (exists("did_load_filetypes") || exists("syntax_on"))
if exists("do_syntax_sel_menu") if exists("do_syntax_sel_menu")
runtime! synmenu.vim runtime! synmenu.vim
else else
an 50.10 &Syntax.&Show\ File\ Types\ in\ Menu :let do_syntax_sel_menu = 1<Bar>runtime! synmenu.vim<Bar>aunmenu &Syntax.&Show\ File\ Types\ in\ Menu<CR> an <silent> 50.10 &Syntax.&Show\ File\ Types\ in\ Menu :let do_syntax_sel_menu = 1<Bar>runtime! synmenu.vim<Bar>aunmenu &Syntax.&Show\ File\ Types\ in\ Menu<CR>
an 50.195 &Syntax.-SEP1- <Nop> an 50.195 &Syntax.-SEP1- <Nop>
endif endif

6
runtime/syntax/c.vim
View File

@@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: C " Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2017 Apr 30 " Last Change: 2018 Sep 21
" Quit when a (custom) syntax file was already loaded " Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@@ -220,7 +220,7 @@ if exists("c_comment_strings")
syn match cCommentSkip contained "^\s*\*\($\|\s\+\)" syn match cCommentSkip contained "^\s*\*\($\|\s\+\)"
syn region cCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=cSpecial,cCommentSkip syn region cCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=cSpecial,cCommentSkip
syn region cComment2String contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=cSpecial syn region cComment2String contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=cSpecial
syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cComment2String,cCharacter,cNumbersCom,cSpaceError,@Spell syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cComment2String,cCharacter,cNumbersCom,cSpaceError,cWrongComTail,@Spell
if exists("c_no_comment_fold") if exists("c_no_comment_fold")
" Use "extend" here to have preprocessor lines not terminate halfway a " Use "extend" here to have preprocessor lines not terminate halfway a
" comment. " comment.
@@ -239,6 +239,7 @@ endif
" keep a // comment separately, it terminates a preproc. conditional " keep a // comment separately, it terminates a preproc. conditional
syn match cCommentError display "\*/" syn match cCommentError display "\*/"
syn match cCommentStartError display "/\*"me=e-1 contained syn match cCommentStartError display "/\*"me=e-1 contained
syn match cWrongComTail display "\*/"
syn keyword cOperator sizeof syn keyword cOperator sizeof
if exists("c_gnu") if exists("c_gnu")
@@ -453,6 +454,7 @@ hi def link cErrInBracket cError
hi def link cCommentError cError hi def link cCommentError cError
hi def link cCommentStartError cError hi def link cCommentStartError cError
hi def link cSpaceError cError hi def link cSpaceError cError
hi def link cWrongComTail cError
hi def link cSpecialError cError hi def link cSpecialError cError
hi def link cCurlyError cError hi def link cCurlyError cError
hi def link cOperator Operator hi def link cOperator Operator

18
runtime/syntax/dosini.vim
View File

@@ -1,12 +1,12 @@
" Vim syntax file " Vim syntax file
" Language: Configuration File (ini file) for MSDOS/MS Windows " Language: Configuration File (ini file) for MSDOS/MS Windows
" Version: 2.1 " Version: 2.2
" Original Author: Sean M. McKee <mckee@misslink.net> " Original Author: Sean M. McKee <mckee@misslink.net>
" Previous Maintainer: Nima Talebi <nima@it.net.au> " Previous Maintainer: Nima Talebi <nima@it.net.au>
" Current Maintainer: Hong Xu <xuhdev@gmail.com> " Current Maintainer: Hong Xu <hong@topbug.net>
" Homepage: http://www.vim.org/scripts/script.php?script_id=3747 " Homepage: http://www.vim.org/scripts/script.php?script_id=3747
" https://bitbucket.org/xuhdev/syntax-dosini.vim " Repository: https://github.com/xuhdev/syntax-dosini.vim
" Last Change: 2011 Nov 8 " Last Change: 2018 Sep 11
" quit when a syntax file was already loaded " quit when a syntax file was already loaded
@@ -17,10 +17,11 @@ endif
" shut case off " shut case off
syn case ignore syn case ignore
syn match dosiniNumber "\<\d\+\>" syn match dosiniLabel "^.\{-}\ze\s*=" nextgroup=dosiniNumber,dosiniValue
syn match dosiniNumber "\<\d*\.\d\+\>" syn match dosiniValue "=\zs.*"
syn match dosiniNumber "\<\d\+e[+-]\=\d\+\>" syn match dosiniNumber "=\zs\s*\d\+\s*$"
syn match dosiniLabel "^.\{-}=" syn match dosiniNumber "=\zs\s*\d*\.\d\+\s*$"
syn match dosiniNumber "=\zs\s*\d\+e[+-]\=\d\+\s*$"
syn region dosiniHeader start="^\s*\[" end="\]" syn region dosiniHeader start="^\s*\[" end="\]"
syn match dosiniComment "^[#;].*$" syn match dosiniComment "^[#;].*$"
@@ -31,6 +32,7 @@ hi def link dosiniNumber Number
hi def link dosiniHeader Special hi def link dosiniHeader Special
hi def link dosiniComment Comment hi def link dosiniComment Comment
hi def link dosiniLabel Type hi def link dosiniLabel Type
hi def link dosiniValue String
let b:current_syntax = "dosini" let b:current_syntax = "dosini"

2
runtime/syntax/named.vim
View File

@@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: BIND configuration file " Language: BIND configuration file
" Maintainer: Nick Hibma <nick@van-laarhoven.org> " Maintainer: Nick Hibma <nick@van-laarhoven.org>
" Last change: 2007-01-30 " Last Change: 2007-01-30
" Filenames: named.conf, rndc.conf " Filenames: named.conf, rndc.conf
" Location: http://www.van-laarhoven.org/vim/syntax/named.vim " Location: http://www.van-laarhoven.org/vim/syntax/named.vim
" "

6
runtime/syntax/nsis.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: Ken Takata " Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-nsis " URL: https://github.com/k-takata/vim-nsis
" Previous Maintainer: Alex Jakushev <Alex.Jakushev@kemek.lt> " Previous Maintainer: Alex Jakushev <Alex.Jakushev@kemek.lt>
" Last Change: 2018-02-07 " Last Change: 2018-10-02
" quit when a syntax file was already loaded " quit when a syntax file was already loaded
if exists("b:current_syntax") if exists("b:current_syntax")
@@ -104,8 +104,8 @@ syn match nsisSysVar "$\$"
syn match nsisSysVar "$\\["'`]" syn match nsisSysVar "$\\["'`]"
"LABELS (4.3) "LABELS (4.3)
syn match nsisLocalLabel contained "[^-+!$0-9;#. \t/*][^ \t:;#]*:\ze\%($\|[ \t;#]\|\/\*\)" syn match nsisLocalLabel contained "[^-+!$0-9;"'#. \t/*][^ \t:;#]*:\ze\%($\|[ \t;#]\|\/\*\)"
syn match nsisGlobalLabel contained "\.[^-+!$0-9;# \t/*][^ \t:;#]*:\ze\%($\|[ \t;#]\|\/\*\)" syn match nsisGlobalLabel contained "\.[^-+!$0-9;"'# \t/*][^ \t:;#]*:\ze\%($\|[ \t;#]\|\/\*\)"
"CONSTANTS "CONSTANTS
syn keyword nsisBoolean contained true false syn keyword nsisBoolean contained true false

32
runtime/syntax/r.vim
View File

@@ -5,7 +5,7 @@
" Tom Payne <tom@tompayne.org> " Tom Payne <tom@tompayne.org>
" Contributor: Johannes Ranke <jranke@uni-bremen.de> " Contributor: Johannes Ranke <jranke@uni-bremen.de>
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Sat Apr 08, 2017 07:01PM " Last Change: Wed Aug 01, 2018 10:10PM
" Filenames: *.R *.r *.Rhistory *.Rt " Filenames: *.R *.r *.Rhistory *.Rt
" "
" NOTE: The highlighting of R functions might be defined in " NOTE: The highlighting of R functions might be defined in
@@ -43,15 +43,17 @@ endif
if exists("g:r_syntax_folding") && g:r_syntax_folding if exists("g:r_syntax_folding") && g:r_syntax_folding
setlocal foldmethod=syntax setlocal foldmethod=syntax
endif endif
if !exists("g:r_syntax_hl_roxygen")
let g:r_syntax_hl_roxygen = 1 let g:r_syntax_hl_roxygen = get(g:, 'r_syntax_hl_roxygen', 1)
endif
syn case match syn case match
" Comment " Comment
syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):" syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):"
syn match rComment contains=@Spell,rCommentTodo,rOBlock "#.*" syn match rTodoParen contained "\(BUG\|FIXME\|NOTE\|TODO\)\s*(.\{-})\s*:" contains=rTodoKeyw,rTodoInfo transparent
syn keyword rTodoKeyw BUG FIXME NOTE TODO contained
syn match rTodoInfo "(\zs.\{-}\ze)" contained
syn match rComment contains=@Spell,rCommentTodo,rTodoParen,rOBlock "#.*"
" Roxygen " Roxygen
if g:r_syntax_hl_roxygen if g:r_syntax_hl_roxygen
@@ -65,7 +67,7 @@ if g:r_syntax_hl_roxygen
" First we match all roxygen blocks as containing only a title. In case an " First we match all roxygen blocks as containing only a title. In case an
" empty roxygen line ending the title or a tag is found, this will be " empty roxygen line ending the title or a tag is found, this will be
" overriden later by the definitions of rOBlock. " overridden later by the definitions of rOBlock.
syn match rOTitleBlock "\%^\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag syn match rOTitleBlock "\%^\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
syn match rOTitleBlock "^\s*\n\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag syn match rOTitleBlock "^\s*\n\(\s*#\{1,2}' .*\n\)\{1,}" contains=rOCommentKey,rOTitleTag
@@ -91,7 +93,7 @@ if g:r_syntax_hl_roxygen
syn match rOTitle "^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag syn match rOTitle "^\s*\n\(\s*#\{1,2}' .*\n\)\{-1,}\s*#\{1,2}'\s*$" contained contains=rOCommentKey,rOTitleTag
syn match rOTitleTag contained "@title" syn match rOTitleTag contained "@title"
syn match rOCommentKey "#\{1,2}'" contained syn match rOCommentKey "^\s*#\{1,2}'" contained
syn region rOExamples start="^#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOTag fold syn region rOExamples start="^#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOTag fold
" rOTag list generated from the lists in " rOTag list generated from the lists in
@@ -256,6 +258,7 @@ if exists("g:r_syntax_folding")
syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError fold syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError fold
syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError fold syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError fold
syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError fold syn region rRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError fold
syn region rSection matchgroup=Title start=/^#.*[-=#]\{4,}/ end=/^#.*[-=#]\{4,}/ms=s-2,me=s-1 transparent contains=ALL fold
else else
syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError syn region rRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError
syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError syn region rRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError
@@ -282,13 +285,8 @@ endif
if g:r_syntax_fun_pattern == 1 if g:r_syntax_fun_pattern == 1
syn match rFunction '[0-9a-zA-Z_\.]\+\s*\ze(' syn match rFunction '[0-9a-zA-Z_\.]\+\s*\ze('
else else
if !exists("g:R_hi_fun") " Nvim-R:
let g:R_hi_fun = 1 runtime R/functions.vim
endif
if g:R_hi_fun
" Nvim-R:
runtime R/functions.vim
endif
endif endif
syn match rDollar display contained "\$" syn match rDollar display contained "\$"
@@ -311,7 +309,7 @@ syn keyword rType array category character complex double function integer list
" Name of object with spaces " Name of object with spaces
if &filetype != "rmd" && &filetype != "rrst" if &filetype != "rmd" && &filetype != "rrst"
syn region rNameWSpace start="`" end="`" syn region rNameWSpace start="`" end="`" contains=rSpaceFun
endif endif
if &filetype == "rhelp" if &filetype == "rhelp"
@@ -331,7 +329,10 @@ hi def link rAssign Statement
hi def link rBoolean Boolean hi def link rBoolean Boolean
hi def link rBraceError Error hi def link rBraceError Error
hi def link rComment Comment hi def link rComment Comment
hi def link rTodoParen Comment
hi def link rTodoInfo SpecialComment
hi def link rCommentTodo Todo hi def link rCommentTodo Todo
hi def link rTodoKeyw Todo
hi def link rComplex Number hi def link rComplex Number
hi def link rConditional Conditional hi def link rConditional Conditional
hi def link rConstant Constant hi def link rConstant Constant
@@ -341,6 +342,7 @@ hi def link rDollar SpecialChar
hi def link rError Error hi def link rError Error
hi def link rFloat Float hi def link rFloat Float
hi def link rFunction Function hi def link rFunction Function
hi def link rSpaceFun Function
hi def link rHelpIdent Identifier hi def link rHelpIdent Identifier
hi def link rhPreProc PreProc hi def link rhPreProc PreProc
hi def link rhSection PreCondit hi def link rhSection PreCondit

175
runtime/syntax/rmd.vim
View File

@@ -1,123 +1,118 @@
" markdown Text with R statements " markdown Text with R statements
" Language: markdown with R code chunks " Language: markdown with R code chunks
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Sat Jan 28, 2017 10:06PM " Last Change: Sat Aug 25, 2018 03:44PM
"
" CONFIGURATION:
" To highlight chunk headers as R code, put in your vimrc (e.g. .config/nvim/init.vim):
" let rmd_syn_hl_chunk = 1
" "
" For highlighting pandoc extensions to markdown like citations and TeX and " For highlighting pandoc extensions to markdown like citations and TeX and
" many other advanced features like folding of markdown sections, it is " many other advanced features like folding of markdown sections, it is
" recommended to install the vim-pandoc filetype plugin as well as the " recommended to install the vim-pandoc filetype plugin as well as the
" vim-pandoc-syntax filetype plugin from https://github.com/vim-pandoc. " vim-pandoc-syntax filetype plugin from https://github.com/vim-pandoc.
"
" TODO:
" - Provide highlighting for rmarkdown parameters in yaml header
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
" load all of pandoc info, e.g. from " Configuration if not using pandoc syntax:
" Add syntax highlighting of YAML header
let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
" Add syntax highlighting of citation keys
let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
" Highlight the header of the chunk of R code
let g:rmd_syn_hl_chunk = get(g:, 'g:rmd_syn_hl_chunk', 0)
" Pandoc-syntax has more features, but it is slower.
" https://github.com/vim-pandoc/vim-pandoc-syntax " https://github.com/vim-pandoc/vim-pandoc-syntax
let g:pandoc#syntax#codeblocks#embeds#langs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', ['r'])
runtime syntax/pandoc.vim runtime syntax/pandoc.vim
if exists("b:current_syntax") if exists("b:current_syntax")
let rmdIsPandoc = 1 " Fix recognition of R code
unlet b:current_syntax syn region pandocDelimitedCodeBlock_r start=/^```{r\>.*}$/ end=/^```$/ contained containedin=pandocDelimitedCodeBlock contains=@R
else syn region rmdrInline matchgroup=rmdInlineDelim start="`r " end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend
let rmdIsPandoc = 0 hi def link rmdInlineDelim Delimiter
runtime syntax/markdown.vim let b:current_syntax = "rmd"
if exists("b:current_syntax") finish
unlet b:current_syntax
endif
" load all of the yaml syntax highlighting rules into @yaml
syntax include @yaml syntax/yaml.vim
if exists("b:current_syntax")
unlet b:current_syntax
endif
" highlight yaml block commonly used for front matter
syntax region rmdYamlBlock matchgroup=rmdYamlBlockDelim start="^---" matchgroup=rmdYamlBlockDelim end="^---" contains=@yaml keepend fold
endif endif
if !exists("g:rmd_syn_langs") let s:cpo_save = &cpo
let g:rmd_syn_langs = ["r"] set cpo&vim
else
let s:hasr = 0 " R chunks will not be highlighted by syntax/markdown because their headers
for s:lng in g:rmd_syn_langs " follow a non standard pattern: "```{lang" instead of "^```lang".
if s:lng == "r" " Make a copy of g:markdown_fenced_languages to highlight the chunks later:
let s:hasr = 1 if exists('g:markdown_fenced_languages')
endif if !exists('g:rmd_fenced_languages')
endfor let g:rmd_fenced_languages = deepcopy(g:markdown_fenced_languages)
if s:hasr == 0 let g:markdown_fenced_languages = []
let g:rmd_syn_langs += ["r"]
endif endif
else
let g:rmd_fenced_languages = ['r']
endif endif
for s:lng in g:rmd_syn_langs runtime syntax/markdown.vim
exe 'syntax include @' . toupper(s:lng) . ' syntax/'. s:lng . '.vim'
if exists("b:current_syntax")
unlet b:current_syntax
endif
exe 'syntax region rmd' . toupper(s:lng) . 'Chunk start="^[ \t]*``` *{\(' . s:lng . '\|r.*engine\s*=\s*["' . "']" . s:lng . "['" . '"]\).*}$" end="^[ \t]*```$" contains=@' . toupper(s:lng) . ',rmd' . toupper(s:lng) . 'ChunkDelim keepend fold'
if exists("g:rmd_syn_hl_chunk") && s:lng == "r" " Now highlight chunks:
" highlight R code inside chunk header for s:type in g:rmd_fenced_languages
syntax match rmdRChunkDelim "^[ \t]*```{r" contained if s:type =~ '='
syntax match rmdRChunkDelim "}$" contained let s:lng = substitute(s:type, '=.*', '')
let s:nm = substitute(s:type, '.*=', '')
else else
exe 'syntax match rmd' . toupper(s:lng) . 'ChunkDelim "^[ \t]*```{\(' . s:lng . '\|r.*engine\s*=\s*["' . "']" . s:lng . "['" . '"]\).*}$" contained' let s:lng = s:type
let s:nm = s:type
endif endif
exe 'syntax match rmd' . toupper(s:lng) . 'ChunkDelim "^[ \t]*```$" contained' unlet! b:current_syntax
exe 'syn include @Rmd'.s:nm.' syntax/'.s:lng.'.vim'
if g:rmd_syn_hl_chunk
exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmd'.s:nm
exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@Rmd'.s:nm
else
exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
endif
exe 'syn region rmd'.s:nm.'Inline matchgroup=rmdInlineDelim start="`'.s:nm.' " end="`" contains=@Rmd'.s:nm.' keepend'
endfor endfor
unlet! s:type
hi def link rmdInlineDelim Delimiter
hi def link rmdCodeDelim Delimiter
" also match and syntax highlight in-line R code " You don't need this if either your markdown/syntax.vim already highlights
syntax region rmdrInline matchgroup=rmdInlineDelim start="`r " end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend " the YAML header or you are writing standard markdown
" I was not able to highlight rmdrInline inside a pandocLaTeXCommand, although if g:rmd_syn_hl_yaml
" highlighting works within pandocLaTeXRegion and yamlFlowString. " Minimum highlighting of yaml header
syntax cluster texMathZoneGroup add=rmdrInline syn match rmdYamlFieldTtl /^\s*\zs\w*\ze:/ contained
syn match rmdYamlFieldTtl /^\s*-\s*\zs\w*\ze:/ contained
" match slidify special marker syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"' contains=yamlEscape,rmdrInline contained
syntax match rmdSlidifySpecial "\*\*\*" syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''" end="'" contains=yamlSingleEscape,rmdrInline contained
syn match yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
syn match yamlSingleEscape contained "''"
if rmdIsPandoc == 0 syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^\([-.]\)\1\{2}$/ keepend contains=rmdYamlFieldTtl,yamlFlowString
syn match rmdBlockQuote /^\s*>.*\n\(.*\n\@<!\n\)*/ skipnl hi def link rmdYamlBlockDelim Delimiter
" LaTeX hi def link rmdYamlFieldTtl Identifier
syntax include @LaTeX syntax/tex.vim hi def link yamlFlowString String
if exists("b:current_syntax")
unlet b:current_syntax
endif
" Inline
syntax match rmdLaTeXInlDelim "\$"
syntax match rmdLaTeXInlDelim "\\\$"
syn region texMathZoneX matchgroup=Delimiter start="\$" skip="\\\\\|\\\$" matchgroup=Delimiter end="\$" end="%stopzone\>" contains=@texMathZoneGroup
" Region
syntax match rmdLaTeXRegDelim "\$\$" contained
syntax match rmdLaTeXRegDelim "\$\$latex$" contained
syntax match rmdLaTeXSt "\\[a-zA-Z]\+"
syntax region rmdLaTeXRegion start="^\$\$" skip="\\\$" end="\$\$$" contains=@LaTeX,rmdLaTeXRegDelim keepend
syntax region rmdLaTeXRegion2 start="^\\\[" end="\\\]" contains=@LaTeX,rmdLaTeXRegDelim keepend
hi def link rmdBlockQuote Comment
hi def link rmdLaTeXSt Statement
hi def link rmdLaTeXInlDelim Special
hi def link rmdLaTeXRegDelim Special
endif endif
for s:lng in g:rmd_syn_langs " You don't need this if either your markdown/syntax.vim already highlights
exe 'syn sync match rmd' . toupper(s:lng) . 'SyncChunk grouphere rmd' . toupper(s:lng) . 'Chunk /^[ \t]*``` *{\(' . s:lng . '\|r.*engine\s*=\s*["' . "']" . s:lng . "['" . '"]\)/' " citations or you are writing standard markdown
endfor if g:rmd_syn_hl_citations
" From vim-pandoc-syntax
hi def link rmdYamlBlockDelim Delim " parenthetical citations
for s:lng in g:rmd_syn_langs syn match pandocPCite /\^\@<!\[[^\[\]]\{-}-\{0,1}@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*.\{-}\]/ contains=pandocEmphasis,pandocStrong,pandocLatex,pandocCiteKey,@Spell,pandocAmpersandEscape display
exe 'hi def link rmd' . toupper(s:lng) . 'ChunkDelim Special' " in-text citations with location
endfor syn match pandocICite /@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\s\[.\{-1,}\]/ contains=pandocCiteKey,@Spell display
hi def link rmdInlineDelim Special " cite keys
hi def link rmdSlidifySpecial Special syn match pandocCiteKey /\(-\=@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\)/ containedin=pandocPCite,pandocICite contains=@NoSpell display
syn match pandocCiteAnchor /[-@]/ contained containedin=pandocCiteKey display
syn match pandocCiteLocator /[\[\]]/ contained containedin=pandocPCite,pandocICite
hi def link pandocPCite Operator
hi def link pandocICite Operator
hi def link pandocCiteKey Label
hi def link pandocCiteAnchor Operator
hi def link pandocCiteLocator Operator
endif
let b:current_syntax = "rmd" let b:current_syntax = "rmd"
let &cpo = s:cpo_save
unlet s:cpo_save
" vim: ts=8 sw=2 " vim: ts=8 sw=2

4
runtime/syntax/rnoweb.vim
View File

@@ -1,7 +1,7 @@
" Vim syntax file " Vim syntax file
" Language: R noweb Files " Language: R noweb Files
" Maintainer: Johannes Ranke <jranke@uni-bremen.de> " Maintainer: Johannes Ranke <jranke@uni-bremen.de>
" Last Change: Sat Feb 06, 2016 06:47AM " Last Change: Thu Apr 05, 2018 11:06PM
" Version: 0.9.1 " Version: 0.9.1
" Remarks: - This file is inspired by the proposal of " Remarks: - This file is inspired by the proposal of
" Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br> " Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
@@ -16,7 +16,7 @@ syn case match
" Extension of Tex clusters {{{1 " Extension of Tex clusters {{{1
runtime syntax/tex.vim runtime syntax/tex.vim
unlet b:current_syntax unlet! b:current_syntax
syn cluster texMatchGroup add=@rnoweb syn cluster texMatchGroup add=@rnoweb
syn cluster texMathMatchGroup add=rnowebSexpr syn cluster texMathMatchGroup add=rnowebSexpr

4
runtime/syntax/rrst.vim
View File

@@ -2,7 +2,7 @@
" Language: reST with R code chunks " Language: reST with R code chunks
" Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu " Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
" Homepage: https://github.com/jalvesaq/R-Vim-runtime " Homepage: https://github.com/jalvesaq/R-Vim-runtime
" Last Change: Tue Jun 28, 2016 08:53AM " Last Change: Thu Apr 05, 2018 11:06PM
" "
" CONFIGURATION: " CONFIGURATION:
" To highlight chunk headers as R code, put in your vimrc: " To highlight chunk headers as R code, put in your vimrc:
@@ -14,7 +14,7 @@ endif
" load all of the rst info " load all of the rst info
runtime syntax/rst.vim runtime syntax/rst.vim
unlet b:current_syntax unlet! b:current_syntax
" load all of the r syntax highlighting rules into @R " load all of the r syntax highlighting rules into @R
syntax include @R syntax/r.vim syntax include @R syntax/r.vim

29
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: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
" Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int>
" Last Change: Jul 31, 2018 " Last Change: Sep 04, 2018
" Version: 179 " Version: 182
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
" 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 Eric Brunet (eric.brunet@ens.fr) " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
@@ -151,6 +151,7 @@ syn cluster shPPSRightList contains=shComment,shDeref,shDerefSimple,shEscape,shP
syn cluster shSubShList contains=@shCommandSubList,shCommandSubBQ,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator syn cluster shSubShList contains=@shCommandSubList,shCommandSubBQ,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
syn cluster shTestList contains=shCharClass,shCommandSub,shCommandSubBQ,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shSpecialDQ,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr syn cluster shTestList contains=shCharClass,shCommandSub,shCommandSubBQ,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shSpecialDQ,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr
syn cluster shNoZSList contains=shSpecialNoZS syn cluster shNoZSList contains=shSpecialNoZS
syn cluster shForList contains=shTestOpr,shNumber,shDerefSimple,shDeref,shCommandSub,shCommandSubBQ,shArithmetic
" Echo: {{{1 " Echo: {{{1
" ==== " ====
@@ -243,7 +244,7 @@ syn match shCharClass contained "\[:\(backspace\|escape\|return\|xdigit\|alnum
ShFoldIfDoFor syn region shDo transparent matchgroup=shConditional start="\<do\>" matchgroup=shConditional end="\<done\>" contains=@shLoopList ShFoldIfDoFor syn region shDo transparent matchgroup=shConditional start="\<do\>" matchgroup=shConditional end="\<done\>" contains=@shLoopList
ShFoldIfDoFor syn region shIf transparent matchgroup=shConditional start="\<if\_s" matchgroup=shConditional skip=+-fi\>+ end="\<;\_s*then\>" end="\<fi\>" contains=@shIfList ShFoldIfDoFor syn region shIf transparent matchgroup=shConditional start="\<if\_s" matchgroup=shConditional skip=+-fi\>+ end="\<;\_s*then\>" end="\<fi\>" contains=@shIfList
ShFoldIfDoFor syn region shFor matchgroup=shLoop start="\<for\ze\_s\s*\%(((\)\@!" end="\<in\>" end="\<do\>"me=e-2 contains=@shLoopList,shDblParen skipwhite nextgroup=shCurlyIn ShFoldIfDoFor syn region shFor matchgroup=shLoop start="\<for\ze\_s\s*\%(((\)\@!" end="\<in\>" end="\<do\>"me=e-2 contains=@shLoopList,shDblParen skipwhite nextgroup=shCurlyIn
ShFoldIfDoFor syn region shForPP matchgroup=shLoop start='\<for\>\_s*((' end='))' contains=shTestOpr ShFoldIfDoFor syn region shForPP matchgroup=shLoop start='\<for\>\_s*((' end='))' contains=@shForList
if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
syn cluster shCaseList add=shRepeat syn cluster shCaseList add=shRepeat
@@ -290,7 +291,7 @@ endif
" Misc: {{{1 " Misc: {{{1
"====== "======
syn match shWrapLineOperator "\\$" syn match shWrapLineOperator "\\$"
syn region shCommandSubBQ start="`" skip="\\\\\|\\." end="`" contains=@shCommandSubList syn region shCommandSubBQ start="`" skip="\\\\\|\\." end="`" contains=shBQComment,@shCommandSubList
syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shSingleQuote,shDoubleQuote,shComment syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shSingleQuote,shDoubleQuote,shComment
" $() and $(()): {{{1 " $() and $(()): {{{1
@@ -374,6 +375,7 @@ syn match shComment "^\s*\zs#.*$" contains=@shCommentGroup
syn match shComment "\s\zs#.*$" contains=@shCommentGroup syn match shComment "\s\zs#.*$" contains=@shCommentGroup
syn match shComment contained "#.*$" contains=@shCommentGroup syn match shComment contained "#.*$" contains=@shCommentGroup
syn match shQuickComment contained "#.*$" syn match shQuickComment contained "#.*$"
syn match shBQComment contained "#.\{-}\ze`" contains=@shCommentGroup
" Here Documents: {{{1 " Here Documents: {{{1
" ========================================= " =========================================
@@ -525,8 +527,8 @@ if exists("b:is_bash")
syn region shDerefPPSright contained start='.' skip=@\%(\\\\\)\+@ end='\ze}' contains=@shPPSRightList syn region shDerefPPSright contained start='.' skip=@\%(\\\\\)\+@ end='\ze}' contains=@shPPSRightList
" bash : ${parameter/#substring/replacement} " bash : ${parameter/#substring/replacement}
syn match shDerefPSR contained '/#' nextgroup=shDerefPSRleft syn match shDerefPSR contained '/#' nextgroup=shDerefPSRleft,shDoubleQuote,shSingleQuote
syn region shDerefPSRleft contained start='.' skip=@\%(\\\\\)*\\/@ matchgroup=shDerefOp end='/' end='\ze}' nextgroup=shDerefPSRright syn region shDerefPSRleft contained start='[^"']' skip=@\%(\\\\\)*\\/@ matchgroup=shDerefOp end='/' end='\ze}' nextgroup=shDerefPSRright
syn region shDerefPSRright contained start='.' skip=@\%(\\\\\)\+@ end='\ze}' syn region shDerefPSRright contained start='.' skip=@\%(\\\\\)\+@ end='\ze}'
endif endif
@@ -534,7 +536,7 @@ endif
"syn region shParen matchgroup=shArithRegion start='[^$]\zs(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList "syn region shParen matchgroup=shArithRegion start='[^$]\zs(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList
syn region shParen matchgroup=shArithRegion start='\$\@!(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList syn region shParen matchgroup=shArithRegion start='\$\@!(\%(\ze[^(]\|$\)' end=')' contains=@shArithParenList
" Useful sh Keywords: {{{1 " Additional sh Keywords: {{{1
" =================== " ===================
syn keyword shStatement break cd chdir continue eval exec exit kill newgrp pwd read readonly return shift test trap ulimit umask wait syn keyword shStatement break cd chdir continue eval exec exit kill newgrp pwd read readonly return shift test trap ulimit umask wait
syn keyword shConditional contained elif else then syn keyword shConditional contained elif else then
@@ -542,20 +544,22 @@ if !exists("g:sh_no_error")
syn keyword shCondError elif else then syn keyword shCondError elif else then
endif endif
" Useful ksh Keywords: {{{1 " Additional ksh Keywords and Aliases: {{{1
" ==================== " ===================================
if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
syn keyword shStatement autoload bg false fc fg functions getopts hash history integer jobs let nohup printf r stop suspend times true type unalias whence syn keyword shStatement bg builtin disown enum export false fg getconf getopts hist jobs let printf sleep true typeset unalias unset whence
syn keyword shStatement autoload compound fc float functions hash history integer nameref nohup r redirect source stop suspend times type
if exists("b:is_posix") if exists("b:is_posix")
syn keyword shStatement command syn keyword shStatement command
else else
syn keyword shStatement time syn keyword shStatement time
endif endif
" Useful bash Keywords: {{{1 " Additional bash Keywords: {{{1
" ===================== " =====================
if exists("b:is_bash") if exists("b:is_bash")
syn keyword shStatement bind builtin dirs disown enable help logout popd pushd shopt source " syn keyword shStatement bind builtin dirs disown enable help logout popd pushd shopt source
syn keyword shStatement bind builtin caller compopt declare dirs disown enable export help local logout mapfile popd pushd readarray shopt source typeset unset
else else
syn keyword shStatement login newgrp syn keyword shStatement login newgrp
endif endif
@@ -637,6 +641,7 @@ if !exists("skip_sh_syntax_inits")
hi def link shParen shArithmetic hi def link shParen shArithmetic
hi def link shPosnParm shShellVariables hi def link shPosnParm shShellVariables
hi def link shQuickComment shComment hi def link shQuickComment shComment
hi def link shBQComment shComment
hi def link shRange shOperator hi def link shRange shOperator
hi def link shRedir shOperator hi def link shRedir shOperator
hi def link shSetListDelim shOperator hi def link shSetListDelim shOperator

70
runtime/syntax/sudoers.vim
View File

@@ -1,8 +1,9 @@
" Vim syntax file " Vim syntax file
" Language: sudoers(5) configuration files " Language: sudoers(5) configuration files
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2018-07-19 " Latest Revision: 2018-08-18
" Recent Changes: Support for #include and #includedir. " Recent Changes: Support for #include and #includedir.
" Added many new options (Samuel D. Leslie)
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@@ -152,77 +153,120 @@ syn match sudoersDefaultTypeGreaterThan contained '>' nextgroup=@sudoersUser s
" TODO: could also deal with special characters here " TODO: could also deal with special characters here
syn match sudoersBooleanParameter contained '!' nextgroup=sudoersBooleanParameter skipwhite skipnl syn match sudoersBooleanParameter contained '!' nextgroup=sudoersBooleanParameter skipwhite skipnl
syn keyword sudoersBooleanParameter contained skipwhite skipnl syn keyword sudoersBooleanParameter contained skipwhite skipnl
\ always_query_group_plugin
\ always_set_home \ always_set_home
\ authenticate \ authenticate
\ closefrom_override \ closefrom_override
\ compress_io
\ env_editor \ env_editor
\ env_reset \ env_reset
\ exec_background
\ fast_glob
\ fqdn \ fqdn
\ ignore_audit_errors
\ ignore_dot \ ignore_dot
\ ignore_iolog_errors
\ ignore_local_sudoers \ ignore_local_sudoers
\ ignore_logfile_errors
\ ignore_unknown_defaults
\ insults \ insults
\ log_host \ log_host
\ log_input
\ log_output
\ log_year \ log_year
\ long_otp_prompt \ long_otp_prompt
\ mail_all_cmnds
\ mail_always \ mail_always
\ mail_badpass \ mail_badpass
\ mail_no_host \ mail_no_host
\ mail_no_perms \ mail_no_perms
\ mail_no_user \ mail_no_user
\ match_group_by_gid
\ netgroup_tuple
\ noexec \ noexec
\ path_info \ pam_session
\ pam_setcred
\ passprompt_override \ passprompt_override
\ path_info
\ preserve_groups \ preserve_groups
\ pwfeedback
\ requiretty \ requiretty
\ root_sudo \ root_sudo
\ rootpw \ rootpw
\ runaspw \ runaspw
\ set_home \ set_home
\ set_logname \ set_logname
\ set_utmp
\ setenv \ setenv
\ shell_noargs \ shell_noargs
\ stay_setuid \ stay_setuid
\ sudoedit_checkdir
\ sudoedit_fellow
\ syslog_pid
\ targetpw \ targetpw
\ tty_tickets \ tty_tickets
\ umask_override
\ use_netgroups
\ use_pty
\ user_command_timeouts
\ utmp_runas
\ visiblepw \ visiblepw
syn keyword sudoersIntegerParameter contained syn keyword sudoersIntegerParameter contained
\ nextgroup=sudoersIntegerParameterEquals \ nextgroup=sudoersIntegerParameterEquals
\ skipwhite skipnl \ skipwhite skipnl
\ closefrom \ closefrom
\ passwd_tries \ command_timeout
\ loglinelen \ loglinelen
\ maxseq
\ passwd_timeout \ passwd_timeout
\ passwd_tries
\ syslog_maxlen
\ timestamp_timeout \ timestamp_timeout
\ umask \ umask
syn keyword sudoersStringParameter contained syn keyword sudoersStringParameter contained
\ nextgroup=sudoersStringParameterEquals \ nextgroup=sudoersStringParameterEquals
\ skipwhite skipnl \ skipwhite skipnl
\ askpass
\ badpass_message \ badpass_message
\ editor \ editor
\ mailsub
\ noexec_file
\ passprompt
\ runas_default
\ syslog_badpri
\ syslog_goodpri
\ sudoers_locale
\ timestampdir
\ timestampowner
\ askpass
\ env_file \ env_file
\ exempt_group \ exempt_group
\ fdexec
\ group_plugin
\ iolog_dir
\ iolog_file
\ iolog_flush
\ iolog_group
\ iolog_mode
\ iolog_user
\ lecture \ lecture
\ lecture_file \ lecture_file
\ lecture_status_dir
\ listpw \ listpw
\ logfile \ logfile
\ mailerflags \ mailerflags
\ mailerpath \ mailerpath
\ mailfrom \ mailfrom
\ mailsub
\ mailto \ mailto
\ noexec_file
\ pam_login_service
\ pam_service
\ passprompt
\ restricted_env_file
\ role
\ runas_default
\ secure_path \ secure_path
\ sudoers_locale
\ syslog \ syslog
\ syslog_badpri
\ syslog_goodpri
\ timestamp_type
\ timestampdir
\ timestampowner
\ type
\ verifypw \ verifypw
syn keyword sudoersListParameter contained syn keyword sudoersListParameter contained

17
runtime/syntax/teraterm.vim
View File

@@ -1,9 +1,9 @@
" Vim syntax file " Vim syntax file
" Language: Tera Term Language (TTL) " Language: Tera Term Language (TTL)
" Based on Tera Term Version 4.92 " Based on Tera Term Version 4.100
" Maintainer: Ken Takata " Maintainer: Ken Takata
" URL: https://github.com/k-takata/vim-teraterm " URL: https://github.com/k-takata/vim-teraterm
" Last Change: 2016 Aug 17 " Last Change: 2018-08-31
" Filenames: *.ttl " Filenames: *.ttl
" License: VIM License " License: VIM License
@@ -75,12 +75,13 @@ syn keyword ttlCommunicationCommand contained
\ logrotate logstart logwrite quickvanrecv \ logrotate logstart logwrite quickvanrecv
\ quickvansend recvln restoresetup scprecv scpsend \ quickvansend recvln restoresetup scprecv scpsend
\ send sendbreak sendbroadcast sendfile sendkcode \ send sendbreak sendbroadcast sendfile sendkcode
\ sendln sendlnbroadcast sendmulticast setbaud \ sendln sendlnbroadcast sendlnmulticast sendmulticast
\ setdebug setdtr setecho setmulticastname setrts \ setbaud setdebug setdtr setecho setflowctrl
\ setsync settitle showtt testlink unlink wait \ setmulticastname setrts setspeed setsync settitle
\ wait4all waitevent waitln waitn waitrecv waitregex \ showtt testlink unlink wait wait4all waitevent
\ xmodemrecv xmodemsend ymodemrecv ymodemsend \ waitln waitn waitrecv waitregex xmodemrecv
\ zmodemrecv zmodemsend \ xmodemsend ymodemrecv ymodemsend zmodemrecv
\ zmodemsend
syn keyword ttlStringCommand contained syn keyword ttlStringCommand contained
\ code2str expandenv int2str regexoption sprintf \ code2str expandenv int2str regexoption sprintf
\ sprintf2 str2code str2int strcompare strconcat \ sprintf2 str2code str2int strcompare strconcat

132
runtime/syntax/tex.vim
View File

@@ -1,8 +1,8 @@
" Vim syntax file " Vim syntax file
" Language: TeX " Language: TeX
" Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM> " Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
" Last Change: Mar 30, 2018 " Last Change: Sep 09, 2018
" Version: 109 " Version: 110
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
" "
" Notes: {{{1 " Notes: {{{1
@@ -596,7 +596,6 @@ if s:tex_fast =~# 'v'
if exists("g:tex_verbspell") && g:tex_verbspell if exists("g:tex_verbspell") && g:tex_verbspell
syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" contains=@Spell syn region texZone start="\\begin{[vV]erbatim}" end="\\end{[vV]erbatim}\|%stopzone\>" contains=@Spell
" listings package: " listings package:
syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>" contains=@Spell
if b:tex_stylish if b:tex_stylish
syn region texZone start="\\verb\*\=\z([^\ta-zA-Z@]\)" end="\z1\|%stopzone\>" contains=@Spell syn region texZone start="\\verb\*\=\z([^\ta-zA-Z@]\)" end="\z1\|%stopzone\>" contains=@Spell
else else
@@ -683,13 +682,7 @@ if has("conceal") && &enc == 'utf-8'
\ ['approx' , '≈'], \ ['approx' , '≈'],
\ ['ast' , '∗'], \ ['ast' , '∗'],
\ ['asymp' , '≍'], \ ['asymp' , '≍'],
\ ['backepsilon' , '∍'],
\ ['backsimeq' , '≃'],
\ ['backslash' , '∖'], \ ['backslash' , '∖'],
\ ['barwedge' , '⊼'],
\ ['because' , '∵'],
\ ['beth' , 'ܒ'],
\ ['between' , '≬'],
\ ['bigcap' , '∩'], \ ['bigcap' , '∩'],
\ ['bigcirc' , '○'], \ ['bigcirc' , '○'],
\ ['bigcup' , '∪'], \ ['bigcup' , '∪'],
@@ -701,38 +694,18 @@ if has("conceal") && &enc == 'utf-8'
\ ['bigtriangleup' , '∆'], \ ['bigtriangleup' , '∆'],
\ ['bigvee' , '⋁'], \ ['bigvee' , '⋁'],
\ ['bigwedge' , '⋀'], \ ['bigwedge' , '⋀'],
\ ['blacksquare' , '∎'],
\ ['bot' , '⊥'], \ ['bot' , '⊥'],
\ ['bowtie' , '⋈'], \ ['bowtie' , '⋈'],
\ ['boxdot' , '⊡'],
\ ['boxminus' , '⊟'],
\ ['boxplus' , '⊞'],
\ ['boxtimes' , '⊠'],
\ ['Box' , '☐'],
\ ['bullet' , '•'], \ ['bullet' , '•'],
\ ['bumpeq' , '≏'],
\ ['Bumpeq' , '≎'],
\ ['cap' , '∩'], \ ['cap' , '∩'],
\ ['Cap' , '⋒'],
\ ['cdot' , '·'], \ ['cdot' , '·'],
\ ['cdots' , '⋯'], \ ['cdots' , '⋯'],
\ ['circ' , '∘'], \ ['circ' , '∘'],
\ ['circeq' , '≗'],
\ ['circlearrowleft', '↺'],
\ ['circlearrowright', '↻'],
\ ['circledast' , '⊛'],
\ ['circledcirc' , '⊚'],
\ ['clubsuit' , '♣'], \ ['clubsuit' , '♣'],
\ ['complement' , '∁'],
\ ['cong' , '≅'], \ ['cong' , '≅'],
\ ['coprod' , '∐'], \ ['coprod' , '∐'],
\ ['copyright' , '©'], \ ['copyright' , '©'],
\ ['cup' , '∪'], \ ['cup' , '∪'],
\ ['Cup' , '⋓'],
\ ['curlyeqprec' , '⋞'],
\ ['curlyeqsucc' , '⋟'],
\ ['curlyvee' , '⋎'],
\ ['curlywedge' , '⋏'],
\ ['dagger' , '†'], \ ['dagger' , '†'],
\ ['dashv' , '⊣'], \ ['dashv' , '⊣'],
\ ['ddagger' , '‡'], \ ['ddagger' , '‡'],
@@ -741,50 +714,27 @@ if has("conceal") && &enc == 'utf-8'
\ ['diamondsuit' , '♢'], \ ['diamondsuit' , '♢'],
\ ['div' , '÷'], \ ['div' , '÷'],
\ ['doteq' , '≐'], \ ['doteq' , '≐'],
\ ['doteqdot' , '≑'],
\ ['dotplus' , '∔'],
\ ['dots' , '…'], \ ['dots' , '…'],
\ ['dotsb' , '⋯'],
\ ['dotsc' , '…'],
\ ['dotsi' , '⋯'],
\ ['dotso' , '…'],
\ ['doublebarwedge' , '⩞'],
\ ['downarrow' , '↓'], \ ['downarrow' , '↓'],
\ ['Downarrow' , '⇓'], \ ['Downarrow' , '⇓'],
\ ['ell' , 'ℓ'], \ ['ell' , 'ℓ'],
\ ['emptyset' , '∅'], \ ['emptyset' , '∅'],
\ ['eqcirc' , '≖'],
\ ['eqsim' , '≂'],
\ ['eqslantgtr' , '⪖'],
\ ['eqslantless' , '⪕'],
\ ['equiv' , '≡'], \ ['equiv' , '≡'],
\ ['eth' , 'ð'],
\ ['exists' , '∃'], \ ['exists' , '∃'],
\ ['fallingdotseq' , '≒'],
\ ['flat' , '♭'], \ ['flat' , '♭'],
\ ['forall' , '∀'], \ ['forall' , '∀'],
\ ['frown' , '⁔'], \ ['frown' , '⁔'],
\ ['ge' , '≥'], \ ['ge' , '≥'],
\ ['geq' , '≥'], \ ['geq' , '≥'],
\ ['geqq' , '≧'],
\ ['gets' , '←'], \ ['gets' , '←'],
\ ['gimel' , 'ℷ'],
\ ['gg' , '⟫'], \ ['gg' , '⟫'],
\ ['gneqq' , '≩'],
\ ['gtrdot' , '⋗'],
\ ['gtreqless' , '⋛'],
\ ['gtrless' , '≷'],
\ ['gtrsim' , '≳'],
\ ['hbar' , 'ℏ'], \ ['hbar' , 'ℏ'],
\ ['heartsuit' , '♡'], \ ['heartsuit' , '♡'],
\ ['hookleftarrow' , '↩'], \ ['hookleftarrow' , '↩'],
\ ['hookrightarrow' , '↪'], \ ['hookrightarrow' , '↪'],
\ ['iff' , '⇔'], \ ['iff' , '⇔'],
\ ['iiint' , '∭'],
\ ['iint' , '∬'],
\ ['Im' , 'ℑ'], \ ['Im' , 'ℑ'],
\ ['imath' , 'ɩ'], \ ['imath' , 'ɩ'],
\ ['implies' , '⇒'],
\ ['in' , '∈'], \ ['in' , '∈'],
\ ['infty' , '∞'], \ ['infty' , '∞'],
\ ['int' , '∫'], \ ['int' , '∫'],
@@ -793,69 +743,33 @@ if has("conceal") && &enc == 'utf-8'
\ ['lceil' , '⌈'], \ ['lceil' , '⌈'],
\ ['ldots' , '…'], \ ['ldots' , '…'],
\ ['le' , '≤'], \ ['le' , '≤'],
\ ['leadsto' , '↝'],
\ ['left(' , '('], \ ['left(' , '('],
\ ['left\[' , '['], \ ['left\[' , '['],
\ ['left\\{' , '{'], \ ['left\\{' , '{'],
\ ['leftarrow' , '←'], \ ['leftarrow' , '←'],
\ ['Leftarrow' , '⇐'], \ ['Leftarrow' , '⇐'],
\ ['leftarrowtail' , '↢'],
\ ['leftharpoondown', '↽'], \ ['leftharpoondown', '↽'],
\ ['leftharpoonup' , '↼'], \ ['leftharpoonup' , '↼'],
\ ['leftrightarrow' , '↔'], \ ['leftrightarrow' , '↔'],
\ ['Leftrightarrow' , '⇔'], \ ['Leftrightarrow' , '⇔'],
\ ['leftrightsquigarrow', '↭'],
\ ['leftthreetimes' , '⋋'],
\ ['leq' , '≤'], \ ['leq' , '≤'],
\ ['leq' , '≤'], \ ['leq' , '≤'],
\ ['leqq' , '≦'],
\ ['lessdot' , '⋖'],
\ ['lesseqgtr' , '⋚'],
\ ['lesssim' , '≲'],
\ ['lfloor' , '⌊'], \ ['lfloor' , '⌊'],
\ ['ll' , '≪'], \ ['ll' , '≪'],
\ ['lmoustache' , '╭'], \ ['lmoustache' , '╭'],
\ ['lneqq' , '≨'],
\ ['lor' , '∨'], \ ['lor' , '∨'],
\ ['ltimes' , '⋉'],
\ ['mapsto' , '↦'], \ ['mapsto' , '↦'],
\ ['measuredangle' , '∡'],
\ ['mid' , '∣'], \ ['mid' , '∣'],
\ ['models' , '╞'], \ ['models' , '╞'],
\ ['mp' , '∓'], \ ['mp' , '∓'],
\ ['nabla' , '∇'], \ ['nabla' , '∇'],
\ ['natural' , '♮'], \ ['natural' , '♮'],
\ ['ncong' , '≇'],
\ ['ne' , '≠'], \ ['ne' , '≠'],
\ ['nearrow' , '↗'], \ ['nearrow' , '↗'],
\ ['neg' , '¬'], \ ['neg' , '¬'],
\ ['neq' , '≠'], \ ['neq' , '≠'],
\ ['nexists' , '∄'],
\ ['ngeq' , '≱'],
\ ['ngeqq' , '≱'],
\ ['ngtr' , '≯'],
\ ['ni' , '∋'], \ ['ni' , '∋'],
\ ['nleftarrow' , '↚'],
\ ['nLeftarrow' , '⇍'],
\ ['nLeftrightarrow', '⇎'],
\ ['nleq' , '≰'],
\ ['nleqq' , '≰'],
\ ['nless' , '≮'],
\ ['nmid' , '∤'],
\ ['notin' , '∉'], \ ['notin' , '∉'],
\ ['nparallel' , '∦'],
\ ['nprec' , '⊀'],
\ ['nrightarrow' , '↛'],
\ ['nRightarrow' , '⇏'],
\ ['nsim' , '≁'],
\ ['nsucc' , '⊁'],
\ ['ntriangleleft' , '⋪'],
\ ['ntrianglelefteq', '⋬'],
\ ['ntriangleright' , '⋫'],
\ ['ntrianglerighteq', '⋭'],
\ ['nvdash' , '⊬'],
\ ['nvDash' , '⊭'],
\ ['nVdash' , '⊮'],
\ ['nwarrow' , '↖'], \ ['nwarrow' , '↖'],
\ ['odot' , '⊙'], \ ['odot' , '⊙'],
\ ['oint' , '∮'], \ ['oint' , '∮'],
@@ -868,15 +782,9 @@ if has("conceal") && &enc == 'utf-8'
\ ['parallel' , '║'], \ ['parallel' , '║'],
\ ['partial' , '∂'], \ ['partial' , '∂'],
\ ['perp' , '⊥'], \ ['perp' , '⊥'],
\ ['pitchfork' , '⋔'],
\ ['pm' , '±'], \ ['pm' , '±'],
\ ['prec' , '≺'], \ ['prec' , '≺'],
\ ['precapprox' , '⪷'],
\ ['preccurlyeq' , '≼'],
\ ['preceq' , '⪯'], \ ['preceq' , '⪯'],
\ ['precnapprox' , '⪹'],
\ ['precneqq' , '⪵'],
\ ['precsim' , '≾'],
\ ['prime' , '′'], \ ['prime' , '′'],
\ ['prod' , '∏'], \ ['prod' , '∏'],
\ ['propto' , '∝'], \ ['propto' , '∝'],
@@ -888,13 +796,8 @@ if has("conceal") && &enc == 'utf-8'
\ ['right\\}' , '}'], \ ['right\\}' , '}'],
\ ['rightarrow' , '→'], \ ['rightarrow' , '→'],
\ ['Rightarrow' , '⇒'], \ ['Rightarrow' , '⇒'],
\ ['rightarrowtail' , '↣'],
\ ['rightleftharpoons', '⇌'], \ ['rightleftharpoons', '⇌'],
\ ['rightsquigarrow', '↝'],
\ ['rightthreetimes', '⋌'],
\ ['risingdotseq' , '≓'],
\ ['rmoustache' , '╮'], \ ['rmoustache' , '╮'],
\ ['rtimes' , '⋊'],
\ ['S' , '§'], \ ['S' , '§'],
\ ['searrow' , '↘'], \ ['searrow' , '↘'],
\ ['setminus' , '∖'], \ ['setminus' , '∖'],
@@ -903,7 +806,6 @@ if has("conceal") && &enc == 'utf-8'
\ ['simeq' , '⋍'], \ ['simeq' , '⋍'],
\ ['smile' , '‿'], \ ['smile' , '‿'],
\ ['spadesuit' , '♠'], \ ['spadesuit' , '♠'],
\ ['sphericalangle' , '∢'],
\ ['sqcap' , '⊓'], \ ['sqcap' , '⊓'],
\ ['sqcup' , '⊔'], \ ['sqcup' , '⊔'],
\ ['sqsubset' , '⊏'], \ ['sqsubset' , '⊏'],
@@ -912,60 +814,30 @@ if has("conceal") && &enc == 'utf-8'
\ ['sqsupseteq' , '⊒'], \ ['sqsupseteq' , '⊒'],
\ ['star' , '✫'], \ ['star' , '✫'],
\ ['subset' , '⊂'], \ ['subset' , '⊂'],
\ ['Subset' , '⋐'],
\ ['subseteq' , '⊆'], \ ['subseteq' , '⊆'],
\ ['subseteqq' , '⫅'],
\ ['subsetneq' , '⊊'],
\ ['subsetneqq' , '⫋'],
\ ['succ' , '≻'], \ ['succ' , '≻'],
\ ['succapprox' , '⪸'],
\ ['succcurlyeq' , '≽'],
\ ['succeq' , '⪰'], \ ['succeq' , '⪰'],
\ ['succnapprox' , '⪺'],
\ ['succneqq' , '⪶'],
\ ['succsim' , '≿'],
\ ['sum' , '∑'], \ ['sum' , '∑'],
\ ['supset' , '⊃'], \ ['supset' , '⊃'],
\ ['Supset' , '⋑'],
\ ['supseteq' , '⊇'], \ ['supseteq' , '⊇'],
\ ['supseteqq' , '⫆'],
\ ['supsetneq' , '⊋'],
\ ['supsetneqq' , '⫌'],
\ ['surd' , '√'], \ ['surd' , '√'],
\ ['swarrow' , '↙'], \ ['swarrow' , '↙'],
\ ['therefore' , '∴'],
\ ['times' , '×'], \ ['times' , '×'],
\ ['to' , '→'], \ ['to' , '→'],
\ ['top' , '⊤'], \ ['top' , '⊤'],
\ ['triangle' , '∆'], \ ['triangle' , '∆'],
\ ['triangleleft' , '⊲'], \ ['triangleleft' , '⊲'],
\ ['trianglelefteq' , '⊴'],
\ ['triangleq' , '≜'],
\ ['triangleright' , '⊳'], \ ['triangleright' , '⊳'],
\ ['trianglerighteq', '⊵'],
\ ['twoheadleftarrow', '↞'],
\ ['twoheadrightarrow', '↠'],
\ ['ulcorner' , '⌜'],
\ ['uparrow' , '↑'], \ ['uparrow' , '↑'],
\ ['Uparrow' , '⇑'], \ ['Uparrow' , '⇑'],
\ ['updownarrow' , '↕'], \ ['updownarrow' , '↕'],
\ ['Updownarrow' , '⇕'], \ ['Updownarrow' , '⇕'],
\ ['urcorner' , '⌝'],
\ ['varnothing' , '∅'],
\ ['vartriangle' , '∆'],
\ ['vdash' , '⊢'], \ ['vdash' , '⊢'],
\ ['vDash' , '⊨'],
\ ['Vdash' , '⊩'],
\ ['vdots' , '⋮'], \ ['vdots' , '⋮'],
\ ['vee' , '∨'], \ ['vee' , '∨'],
\ ['veebar' , '⊻'],
\ ['Vvdash' , '⊪'],
\ ['wedge' , '∧'], \ ['wedge' , '∧'],
\ ['wp' , '℘'], \ ['wp' , '℘'],
\ ['wr' , '≀']] \ ['wr' , '≀']]
" \ ['jmath' , 'X']
" \ ['uminus' , 'X']
" \ ['uplus' , 'X']
if &ambw == "double" || exists("g:tex_usedblwidth") if &ambw == "double" || exists("g:tex_usedblwidth")
let s:texMathList= s:texMathList + [ let s:texMathList= s:texMathList + [
\ ['right\\rangle' , '〉'], \ ['right\\rangle' , '〉'],

254
src/nvim/po/eo.po
View File

@@ -72,26 +72,23 @@ msgstr "E516: Neniu bufro estis forviŝita"
msgid "E517: No buffers were wiped out" msgid "E517: No buffers were wiped out"
msgstr "E517: Neniu bufro estis detruita" msgstr "E517: Neniu bufro estis detruita"
msgid "1 buffer unloaded" #, c-format
msgstr "1 bufro malŝargita" msgid "%d buffer unloaded"
msgid_plural "%d buffers unloaded"
msgstr[0] "%d bufro malŝargita"
msgstr[1] "%d bufroj malŝargitaj"
#, c-format #, c-format
msgid "%d buffers unloaded" msgid "%d buffer deleted"
msgstr "%d bufroj malŝargitaj" msgid_plural "%d buffers deleted"
msgstr[0] "%d bufro forviŝita"
msgid "1 buffer deleted" msgstr[1] "%d bufroj forviŝitaj"
msgstr "1 bufro forviŝita"
#, c-format #, c-format
msgid "%d buffers deleted" msgid "%d buffer wiped out"
msgstr "%d bufroj forviŝitaj" msgid_plural "%d buffers wiped out"
msgstr[0] "%d bufro detruita"
msgid "1 buffer wiped out" msgstr[1] "%d bufroj detruitaj"
msgstr "1 bufro detruita"
#, c-format
msgid "%d buffers wiped out"
msgstr "%d bufroj detruitaj"
msgid "E90: Cannot unload last buffer" msgid "E90: Cannot unload last buffer"
msgstr "E90: Ne eblas malŝargi la lastan bufron" msgstr "E90: Ne eblas malŝargi la lastan bufron"
@@ -167,12 +164,10 @@ msgid "[readonly]"
msgstr "[nurlegebla]" msgstr "[nurlegebla]"
#, c-format #, c-format
msgid "1 line --%d%%--" msgid "%ld line --%d%%--"
msgstr "1 linio --%d%%--" msgid_plural "%ld lines --%d%%--"
msgstr[0] "%ld linio --%d%%--"
#, c-format msgstr[1] "%ld linioj --%d%%--"
msgid "%ld lines --%d%%--"
msgstr "%ld linioj --%d%%--"
#, c-format #, c-format
msgid "line %ld of %ld --%d%%-- col " msgid "line %ld of %ld --%d%%-- col "
@@ -209,6 +204,9 @@ msgstr ""
msgid "E382: Cannot write, 'buftype' option is set" msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita" msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
msgid "[Prompt]"
msgstr "[Invito]"
msgid "[Scratch]" msgid "[Scratch]"
msgstr "[Malneto]" msgstr "[Malneto]"
@@ -740,6 +738,9 @@ msgstr "E916: nevalida tasko"
msgid "E701: Invalid type for len()" msgid "E701: Invalid type for len()"
msgstr "E701: Nevalida datumtipo de len()" msgstr "E701: Nevalida datumtipo de len()"
msgid "E957: Invalid window number"
msgstr "E957: Nevalida numero de vindozo"
#, c-format #, c-format
msgid "E798: ID is reserved for \":match\": %ld" msgid "E798: ID is reserved for \":match\": %ld"
msgstr "E798: ID estas rezervita por \":match\": %ld" msgstr "E798: ID estas rezervita por \":match\": %ld"
@@ -825,12 +826,11 @@ msgstr "> %d, Deksesuma %08x, Okuma %o"
msgid "E134: Move lines into themselves" msgid "E134: Move lines into themselves"
msgstr "E134: Movas liniojn en ilin mem" msgstr "E134: Movas liniojn en ilin mem"
msgid "1 line moved"
msgstr "1 linio movita"
#, c-format #, c-format
msgid "%ld lines moved" msgid "%ld line moved"
msgstr "%ld linioj movitaj" msgid_plural "%ld lines moved"
msgstr[0] "%ld linio movita"
msgstr[1] "%ld linioj movitaj"
#, c-format #, c-format
msgid "%ld lines filtered" msgid "%ld lines filtered"
@@ -982,26 +982,29 @@ msgstr "ĉu anstataŭigi per %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) " msgid "(Interrupted) "
msgstr "(Interrompita) " msgstr "(Interrompita) "
msgid "1 match" #, c-format
msgstr "1 kongruo" msgid "%ld match on %ld line"
msgid_plural "%ld matches on %ld line"
msgid "1 substitution" msgstr[0] "%ld kongruo en %ld linio"
msgstr "1 anstataŭigo" msgstr[1] "%ld kongruoj en %ld linio"
#, c-format #, c-format
msgid "%ld matches" msgid "%ld substitution on %ld line"
msgstr "%ld kongruoj" msgid_plural "%ld substitutions on %ld line"
msgstr[0] "%ld anstataŭigo en %ld linio"
msgstr[1] "%ld anstataŭigoj en %ld linio"
#, c-format #, c-format
msgid "%ld substitutions" msgid "%ld match on %ld lines"
msgstr "%ld anstataŭigoj" msgid_plural "%ld matches on %ld lines"
msgstr[0] "%ld kongruo en %ld linioj"
msgid " on 1 line" msgstr[1] "%ld kongruoj en %ld linioj"
msgstr " en 1 linio"
#, c-format #, c-format
msgid " on %ld lines" msgid "%ld substitution on %ld lines"
msgstr " en %ld linioj" msgid_plural "%ld substitutions on %ld lines"
msgstr[0] "%ld anstataŭigo en %ld linioj"
msgstr[1] "%ld anstataŭigoj en %ld linioj"
msgid "E147: Cannot do :global recursive with a range" msgid "E147: Cannot do :global recursive with a range"
msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso" msgstr "E147: Ne eblas fari \":global\" rekursie kun amplekso"
@@ -1305,19 +1308,17 @@ msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
msgid "E172: Only one file name allowed" msgid "E172: Only one file name allowed"
msgstr "E172: Nur unu dosiernomo permesebla" msgstr "E172: Nur unu dosiernomo permesebla"
msgid "1 more file to edit. Quit anyway?" #, c-format
msgstr "1 plia redaktenda dosiero. Ĉu tamen eliri?" msgid "%d more file to edit. Quit anyway?"
msgid_plural "%d more files to edit. Quit anyway?"
msgstr[0] "%d plia redaktenda dosiero. Ĉu tamen eliri?"
msgstr[1] "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?"
#, c-format #, c-format
msgid "%d more files to edit. Quit anyway?" msgid "E173: %ld more file to edit"
msgstr "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?" msgid_plural "E173: %ld more files to edit"
msgstr[0] "E173: %ld plia redaktenda dosiero"
msgid "E173: 1 more file to edit" msgstr[1] "E173: %ld pliaj redaktendaj dosieroj"
msgstr "E173: 1 plia redaktenda dosiero"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: %ld pliaj redaktendaj dosieroj"
msgid "E174: Command already exists: add ! to replace it" msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin" msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
@@ -1399,6 +1400,9 @@ msgstr "E784: Ne eblas fermi lastan langeton"
msgid "Already only one tab page" msgid "Already only one tab page"
msgstr "Jam nur unu langeto" msgstr "Jam nur unu langeto"
msgid "Edit File in new tab page"
msgstr "Redakti Dosieron en nova langeto"
msgid "Edit File in new window" msgid "Edit File in new window"
msgstr "Redakti Dosieron en nova fenestro" msgstr "Redakti Dosieron en nova fenestro"
@@ -1698,9 +1702,6 @@ msgstr "Legado el stdin..."
msgid "E202: Conversion made file unreadable!" msgid "E202: Conversion made file unreadable!"
msgstr "E202: Konverto igis la dosieron nelegebla!" msgstr "E202: Konverto igis la dosieron nelegebla!"
msgid "[fifo/socket]"
msgstr "[rektvica memoro/kontaktoskatolo]"
msgid "[fifo]" msgid "[fifo]"
msgstr "[rektvica memoro]" msgstr "[rektvica memoro]"
@@ -1880,19 +1881,17 @@ msgstr "[unikso]"
msgid "[unix format]" msgid "[unix format]"
msgstr "[formato unikso]" msgstr "[formato unikso]"
msgid "1 line, " #, c-format
msgstr "1 linio, " msgid "%ld line, "
msgid_plural "%ld lines, "
msgstr[0] "%ld linio, "
msgstr[1] "%ld linioj, "
#, c-format #, c-format
msgid "%ld lines, " msgid "%lld character"
msgstr "%ld linioj, " msgid_plural "%lld characters"
msgstr[0] "%lld signo"
msgid "1 character" msgstr[1] "%lld signoj"
msgstr "1 signo"
#, c-format
msgid "%lld characters"
msgstr "%lld signoj"
msgid "[noeol]" msgid "[noeol]"
msgstr "[sen EOL]" msgstr "[sen EOL]"
@@ -2264,11 +2263,11 @@ msgstr "&Malfari"
msgid "Open tab..." msgid "Open tab..."
msgstr "Malfermi langeton..." msgstr "Malfermi langeton..."
msgid "Find string (use '\\\\' to find a '\\')" msgid "Find string"
msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')" msgstr "Trovi ĉenon"
msgid "Find & Replace (use '\\\\' to find a '\\')" msgid "Find & Replace"
msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')" msgstr "Trovi & Anstataŭigi"
msgid "Not Used" msgid "Not Used"
msgstr "Ne uzata" msgstr "Ne uzata"
@@ -3947,19 +3946,17 @@ msgstr ""
msgid "Type number and <Enter> (empty cancels): " msgid "Type number and <Enter> (empty cancels): "
msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): " msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): "
msgid "1 more line" #, c-format
msgstr "1 plia linio" msgid "%ld more line"
msgid_plural "%ld more lines"
msgid "1 line less" msgstr[0] "%ld plia linio"
msgstr "1 malplia linio" msgstr[1] "%ld pliaj linioj"
#, c-format #, c-format
msgid "%ld more lines" msgid "%ld line less"
msgstr "%ld pliaj linioj" msgid_plural "%ld fewer lines"
msgstr[0] "%ld malplia linio"
#, c-format msgstr[1] "%ld malpliaj linioj"
msgid "%ld fewer lines"
msgstr "%ld malpliaj linioj"
msgid " (Interrupted)" msgid " (Interrupted)"
msgstr " (Interrompita)" msgstr " (Interrompita)"
@@ -4097,31 +4094,26 @@ msgstr ""
"Vim" "Vim"
#, c-format #, c-format
msgid "1 line %sed 1 time" msgid "%ld line %sed %d time"
msgstr "1 linio %sita 1 foje" msgid_plural "%ld line %sed %d times"
msgstr[0] "%ld linio %sita %d foje"
msgstr[1] "%ld linio %sita %d foje"
#, c-format #, c-format
msgid "1 line %sed %d times" msgid "%ld lines %sed %d time"
msgstr "1 linio %sita %d foje" msgid_plural "%ld lines %sed %d times"
msgstr[0] "%ld linioj %sitaj %d foje"
#, c-format msgstr[1] "%ld linioj %sitaj %d foje"
msgid "%ld lines %sed 1 time"
msgstr "%ld linio %sita 1 foje"
#, c-format
msgid "%ld lines %sed %d times"
msgstr "%ld linioj %sitaj %d foje"
#, c-format #, c-format
msgid "%ld lines to indent... " msgid "%ld lines to indent... "
msgstr "%ld krommarĝenendaj linioj... " msgstr "%ld krommarĝenendaj linioj... "
msgid "1 line indented "
msgstr "1 linio krommarĝenita "
#, c-format #, c-format
msgid "%ld lines indented " msgid "%ld line indented "
msgstr "%ld linioj krommarĝenitaj " msgid_plural "%ld lines indented "
msgstr[0] "%ld linio krommarĝenita "
msgstr[1] "%ld linioj krommarĝenitaj "
msgid "E748: No previously used register" msgid "E748: No previously used register"
msgstr "E748: Neniu reĝistro antaŭe uzata" msgstr "E748: Neniu reĝistro antaŭe uzata"
@@ -4129,12 +4121,11 @@ msgstr "E748: Neniu reĝistro antaŭe uzata"
msgid "cannot yank; delete anyway" msgid "cannot yank; delete anyway"
msgstr "ne eblas kopii; tamen forviŝi" msgstr "ne eblas kopii; tamen forviŝi"
msgid "1 line changed"
msgstr "1 linio ŝanĝita"
#, c-format #, c-format
msgid "%ld lines changed" msgid "%ld line changed"
msgstr "%ld linioj ŝanĝitaj" msgid_plural "%ld lines changed"
msgstr[0] "%ld linio ŝanĝita"
msgstr[1] "%ld linioj ŝanĝitaj"
#, c-format #, c-format
msgid "freeing %ld lines" msgid "freeing %ld lines"
@@ -4145,20 +4136,16 @@ msgid " into \"%c"
msgstr " en \"%c" msgstr " en \"%c"
#, c-format #, c-format
msgid "block of 1 line yanked%s" msgid "block of %ld line yanked%s"
msgstr "bloko de 1 linio kopiita%s" msgid_plural "block of %ld lines yanked%s"
msgstr[0] "bloko de %ld linio kopiita%s"
msgstr[1] "bloko de %ld linioj kopiitaj%s"
#, c-format #, c-format
msgid "1 line yanked%s" msgid "%ld line yanked%s"
msgstr "1 linio kopiita%s" msgid_plural "%ld lines yanked%s"
msgstr[0] "%ld linio kopiita%s"
#, c-format msgstr[1] "%ld linioj kopiitaj%s"
msgid "block of %ld lines yanked%s"
msgstr "bloko de %ld linioj kopiita%s"
#, c-format
msgid "%ld lines yanked%s"
msgstr "%ld linioj kopiitaj%s"
#, c-format #, c-format
msgid "E353: Nothing in register %s" msgid "E353: Nothing in register %s"
@@ -4744,6 +4731,9 @@ msgstr "E69: Mankas ] malantaŭ %s%%["
msgid "E70: Empty %s%%[]" msgid "E70: Empty %s%%[]"
msgstr "E70: Malplena %s%%[]" msgstr "E70: Malplena %s%%[]"
msgid "E956: Cannot use pattern recursively"
msgstr "E956: Ne eblas uzi ŝablonon rekursie"
msgid "E65: Illegal back reference" msgid "E65: Illegal back reference"
msgstr "E65: Nevalida retro-referenco" msgstr "E65: Nevalida retro-referenco"
@@ -4858,6 +4848,11 @@ msgstr "E879: (NFA-regulesprimo) tro da \\z("
msgid "E873: (NFA regexp) proper termination error" msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA-regulesprimo) propra end-eraro" msgstr "E873: (NFA-regulesprimo) propra end-eraro"
msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
"stderr..."
msgid "E874: (NFA) Could not pop the stack!" msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) Ne povis elpreni de la staplo!" msgstr "E874: (NFA) Ne povis elpreni de la staplo!"
@@ -4874,19 +4869,6 @@ msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmemorigi la tutan NFA "
msgid "E878: (NFA) Could not allocate memory for branch traversal!" msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!" msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
msgid ""
"Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
"stderr..."
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) NE POVIS MALFERMI %s!"
msgid "Could not open temporary log file for writing "
msgstr "Ne povis malfermi la provizoran protokolan dosieron por skribi "
msgid " VREPLACE" msgid " VREPLACE"
msgstr " V-ANSTATAŬIGO" msgstr " V-ANSTATAŬIGO"
@@ -5373,6 +5355,9 @@ msgstr "E783: ripetita signo en rikordo MAP"
msgid "No Syntax items defined for this buffer" msgid "No Syntax items defined for this buffer"
msgstr "Neniu sintaksa elemento difinita por tiu bufro" msgstr "Neniu sintaksa elemento difinita por tiu bufro"
msgid "'redrawtime' exceeded, syntax highlighting disabled"
msgstr "'redrawtime' transpasita, sintaksa emfazo malŝaltita"
msgid "syntax conceal on" msgid "syntax conceal on"
msgstr "sintakso de conceal ŝaltata" msgstr "sintakso de conceal ŝaltata"
@@ -5402,6 +5387,9 @@ msgstr ""
msgid "syntax iskeyword " msgid "syntax iskeyword "
msgstr "sintakso iskeyword " msgstr "sintakso iskeyword "
msgid "syntax iskeyword not set"
msgstr "sintakso iskeyword ne ŝaltita"
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
msgstr "E391: Nenia sintaksa fasko: %s" msgstr "E391: Nenia sintaksa fasko: %s"
@@ -5870,8 +5858,10 @@ msgid "number changes when saved"
msgstr "numero ŝanĝoj tempo konservita" msgstr "numero ŝanĝoj tempo konservita"
#, c-format #, c-format
msgid "%ld seconds ago" msgid "%ld second ago"
msgstr "antaŭ %ld sekundoj" msgid_plural "%ld seconds ago"
msgstr[0] "antaŭ %ld sekundo"
msgstr[1] "antaŭ %ld sekundoj"
msgid "E790: undojoin is not allowed after undo" msgid "E790: undojoin is not allowed after undo"
msgstr "E790: undojoin estas nepermesebla post malfaro" msgstr "E790: undojoin estas nepermesebla post malfaro"
@@ -6010,6 +6000,10 @@ msgstr "E133: \":return\" ekster funkcio"
msgid "E107: Missing parentheses: %s" msgid "E107: Missing parentheses: %s"
msgstr "E107: Mankas krampoj: %s" msgstr "E107: Mankas krampoj: %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, kompilita %s)"
msgid "" msgid ""
"\n" "\n"
"MS-Windows 64-bit GUI version" "MS-Windows 64-bit GUI version"

264
src/nvim/po/fr.po
View File

@@ -11,15 +11,15 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Vim(Fran<61>ais)\n" "Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-08 09:00+0200\n" "POT-Creation-Date: 2018-09-01 14:20+0200\n"
"PO-Revision-Date: 2018-05-08 09:17+0200\n" "PO-Revision-Date: 2018-09-01 17:15+0200\n"
"Last-Translator: Dominique Pell<6C> <dominique.pelle@gmail.com>\n" "Last-Translator: Dominique Pell<6C> <dominique.pelle@gmail.com>\n"
"Language-Team: \n" "Language-Team: French\n"
"Language: fr\n" "Language: fr\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO_8859-15\n" "Content-Type: text/plain; charset=ISO-8859-15\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"
@@ -74,26 +74,23 @@ msgstr "E516: Aucun tampon n'a
msgid "E517: No buffers were wiped out" msgid "E517: No buffers were wiped out"
msgstr "E517: Aucun tampon n'a <20>t<EFBFBD> d<>truit" msgstr "E517: Aucun tampon n'a <20>t<EFBFBD> d<>truit"
msgid "1 buffer unloaded" #, c-format
msgstr "1 tampon a <20>t<EFBFBD> d<>charg<72>" msgid "%d buffer unloaded"
msgid_plural "%d buffers unloaded"
msgstr[0] "%d tampon a <20>t<EFBFBD> d<>charg<72>"
msgstr[1] "%d tampons ont <20>t<EFBFBD> d<>charg<72>s"
#, c-format #, c-format
msgid "%d buffers unloaded" msgid "%d buffer deleted"
msgstr "%d tampons ont <20>t<EFBFBD> d<>charg<72>s" msgid_plural "%d buffers deleted"
msgstr[0] "%d tampon a <20>t<EFBFBD> effac<61>"
msgid "1 buffer deleted" msgstr[1] "%d tampons ont <20>t<EFBFBD> effac<61>s"
msgstr "1 tampon a <20>t<EFBFBD> effac<61>"
#, c-format #, c-format
msgid "%d buffers deleted" msgid "%d buffer wiped out"
msgstr "%d tampons ont <20>t<EFBFBD> effac<61>s" msgid_plural "%d buffers wiped out"
msgstr[0] "%d tampon a <20>t<EFBFBD> d<>truit"
msgid "1 buffer wiped out" msgstr[1] "%d tampons ont <20>t<EFBFBD> d<>truits"
msgstr "1 tampon a <20>t<EFBFBD> d<>truit"
#, c-format
msgid "%d buffers wiped out"
msgstr "%d tampons ont <20>t<EFBFBD> d<>truits"
msgid "E90: Cannot unload last buffer" msgid "E90: Cannot unload last buffer"
msgstr "E90: Impossible de d<>charger le dernier tampon" msgstr "E90: Impossible de d<>charger le dernier tampon"
@@ -177,12 +174,10 @@ msgid "[readonly]"
msgstr "[lecture-seule]" msgstr "[lecture-seule]"
#, c-format #, c-format
msgid "1 line --%d%%--" msgid "%ld line --%d%%--"
msgstr "1 ligne --%d%%--" msgid_plural "%ld lines --%d%%--"
msgstr[0] "%ld ligne --%d%%--"
#, c-format msgstr[1] "%ld lignes --%d%%--"
msgid "%ld lines --%d%%--"
msgstr "%ld lignes --%d%%--"
# AB - Faut-il remplacer "sur" par "de" ? # AB - Faut-il remplacer "sur" par "de" ?
# DB - Mon avis : oui. # DB - Mon avis : oui.
@@ -229,6 +224,9 @@ msgstr ""
msgid "E382: Cannot write, 'buftype' option is set" msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: <20>criture impossible, l'option 'buftype' est activ<69>e" msgstr "E382: <20>criture impossible, l'option 'buftype' est activ<69>e"
msgid "[Prompt]"
msgstr "[Invite]"
msgid "[Scratch]" msgid "[Scratch]"
msgstr "[Brouillon]" msgstr "[Brouillon]"
@@ -821,6 +819,9 @@ msgstr "E916: t
msgid "E701: Invalid type for len()" msgid "E701: Invalid type for len()"
msgstr "E701: Type invalide avec len()" msgstr "E701: Type invalide avec len()"
msgid "E957: Invalid window number"
msgstr "E957: num<75>ro de fen<65>tre invalide"
#, c-format #, c-format
msgid "E798: ID is reserved for \":match\": %ld" msgid "E798: ID is reserved for \":match\": %ld"
msgstr "E798: ID est r<>serv<72> pour \":match\": %ld" msgstr "E798: ID est r<>serv<72> pour \":match\": %ld"
@@ -922,12 +923,11 @@ msgstr "> %d, Hexa %08x, Octal %o"
msgid "E134: Move lines into themselves" msgid "E134: Move lines into themselves"
msgstr "E134: La destination est dans la plage d'origine" msgstr "E134: La destination est dans la plage d'origine"
msgid "1 line moved"
msgstr "1 ligne d<>plac<61>e"
#, c-format #, c-format
msgid "%ld lines moved" msgid "%ld line moved"
msgstr "%ld lignes d<EFBFBD>plac<EFBFBD>es" msgid_plural "%ld lines moved"
msgstr[0] "%ld ligne d<>plac<61>e"
msgstr[1] "%ld lignes d<>plac<61>es"
#, c-format #, c-format
msgid "%ld lines filtered" msgid "%ld lines filtered"
@@ -1135,26 +1135,29 @@ msgstr "remplacer par %s (y/n/a/q/l/^E/^Y)?"
msgid "(Interrupted) " msgid "(Interrupted) "
msgstr "(Interrompu) " msgstr "(Interrompu) "
msgid "1 match" #, c-format
msgstr "1 correspondance" msgid "%ld match on %ld line"
msgid_plural "%ld matches on %ld line"
msgid "1 substitution" msgstr[0] "%ld correspondance sur %ld ligne"
msgstr "1 substitution" msgstr[1] "%ld correspondances sur %ld ligne"
#, c-format #, c-format
msgid "%ld matches" msgid "%ld substitution on %ld line"
msgstr "%ld correspondances" msgid_plural "%ld substitutions on %ld line"
msgstr[0] "%ld substitution sur %ld ligne"
msgstr[1] "%ld substitutions sur %ld ligne"
#, c-format #, c-format
msgid "%ld substitutions" msgid "%ld match on %ld lines"
msgstr "%ld substitutions" msgid_plural "%ld matches on %ld lines"
msgstr[0] "%ld correspondance sur %ld lignes"
msgid " on 1 line" msgstr[1] "%ld correspondances sur %ld lignes"
msgstr " sur 1 ligne"
#, c-format #, c-format
msgid " on %ld lines" msgid "%ld substitution on %ld lines"
msgstr " sur %ld lignes" msgid_plural "%ld substitutions on %ld lines"
msgstr[0] "%ld substitution sur %ld lignes"
msgstr[1] "%ld substitutions sur %ld lignes"
# AB - Il faut respecter l'esprit plus que la lettre. # AB - Il faut respecter l'esprit plus que la lettre.
# AB - Ce message devrait contenir une r<>f<EFBFBD>rence <20> :vglobal. # AB - Ce message devrait contenir une r<>f<EFBFBD>rence <20> :vglobal.
@@ -1504,19 +1507,17 @@ msgstr ""
msgid "E319: Sorry, the command is not available in this version" msgid "E319: Sorry, the command is not available in this version"
msgstr "E319: D<>sol<6F>, cette commande n'est pas disponible dans cette version" msgstr "E319: D<>sol<6F>, cette commande n'est pas disponible dans cette version"
msgid "1 more file to edit. Quit anyway?" #, c-format
msgstr "Encore 1 fichier <20> <20>diter. Quitter tout de m<>me ?" msgid "%d more file to edit. Quit anyway?"
msgid_plural "%d more files to edit. Quit anyway?"
msgstr[0] "Encore %d fichier <20> <20>diter. Quitter tout de m<>me ?"
msgstr[1] "Encore %d fichiers <20> <20>diter. Quitter tout de m<>me ?"
#, c-format #, c-format
msgid "%d more files to edit. Quit anyway?" msgid "E173: %ld more file to edit"
msgstr "Encore %d fichiers <20> <20>diter. Quitter tout de m<>me ?" msgid_plural "E173: %ld more files to edit"
msgstr[0] "E173: encore %ld fichier <20> <20>diter"
msgid "E173: 1 more file to edit" msgstr[1] "E173: encore %ld fichiers <20> <20>diter"
msgstr "E173: encore 1 fichier <20> <20>diter"
#, c-format
msgid "E173: %ld more files to edit"
msgstr "E173: encore %ld fichiers <20> <20>diter"
msgid "E174: Command already exists: add ! to replace it" msgid "E174: Command already exists: add ! to replace it"
msgstr "E174: La commande existe d<>j<EFBFBD> : ajoutez ! pour la red<65>finir" msgstr "E174: La commande existe d<>j<EFBFBD> : ajoutez ! pour la red<65>finir"
@@ -1597,6 +1598,9 @@ msgstr "E784: Impossible de fermer le dernier onglet"
msgid "Already only one tab page" msgid "Already only one tab page"
msgstr "Il ne reste d<>j<EFBFBD> plus qu'un seul onglet" msgstr "Il ne reste d<>j<EFBFBD> plus qu'un seul onglet"
msgid "Edit File in new tab page"
msgstr "Ouvrir un fichier dans un nouvel onglet"
msgid "Edit File in new window" msgid "Edit File in new window"
msgstr "Ouvrir un fichier dans une nouvelle fen<65>tre - Vim" msgstr "Ouvrir un fichier dans une nouvelle fen<65>tre - Vim"
@@ -1904,9 +1908,6 @@ msgstr "Lecture de stdin..."
msgid "E202: Conversion made file unreadable!" msgid "E202: Conversion made file unreadable!"
msgstr "E202: La conversion a rendu le fichier illisible !" msgstr "E202: La conversion a rendu le fichier illisible !"
msgid "[fifo/socket]"
msgstr "[fifo/socket]"
msgid "[fifo]" msgid "[fifo]"
msgstr "[fifo]" msgstr "[fifo]"
@@ -2091,19 +2092,17 @@ msgstr "[unix]"
msgid "[unix format]" msgid "[unix format]"
msgstr "[format unix]" msgstr "[format unix]"
msgid "1 line, " #, c-format
msgstr "1 ligne, " msgid "%ld line, "
msgid_plural "%ld lines, "
msgstr[0] "%ld ligne, "
msgstr[1] "%ld lignes, "
#, c-format #, c-format
msgid "%ld lines, " msgid "%lld character"
msgstr "%ld lignes, " msgid_plural "%lld characters"
msgstr[0] "%lld caract<63>re"
msgid "1 character" msgstr[1] "%lld caract<EFBFBD>res"
msgstr "1 caract<63>re"
#, c-format
msgid "%lld characters"
msgstr "%lld caract<63>res"
msgid "[noeol]" msgid "[noeol]"
msgstr "[noeol]" msgstr "[noeol]"
@@ -2489,11 +2488,11 @@ msgstr "Ann&uler"
msgid "Open tab..." msgid "Open tab..."
msgstr "Ouvrir dans un onglet..." msgstr "Ouvrir dans un onglet..."
msgid "Find string (use '\\\\' to find a '\\')" msgid "Find string"
msgstr "Chercher une cha<68>ne (utilisez '\\\\' pour chercher un '\\')" msgstr "Trouver une cha<68>ne"
msgid "Find & Replace (use '\\\\' to find a '\\')" msgid "Find & Replace"
msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')" msgstr "Trouver & remplacer"
# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un # DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
# param<61>trage bidon afin de s<>lectionner un r<>pertoire plut<75>t qu'un # param<61>trage bidon afin de s<>lectionner un r<>pertoire plut<75>t qu'un
@@ -4202,19 +4201,17 @@ msgstr "Tapez un nombre et <Entr
msgid "Type number and <Enter> (empty cancels): " msgid "Type number and <Enter> (empty cancels): "
msgstr "Tapez un nombre et <Entr<74>e> (rien annule) :" msgstr "Tapez un nombre et <Entr<74>e> (rien annule) :"
msgid "1 more line" #, c-format
msgstr "1 ligne en plus" msgid "%ld more line"
msgid_plural "%ld more lines"
msgid "1 line less" msgstr[0] "%ld ligne en plus"
msgstr "1 ligne en moins" msgstr[1] "%ld lignes en plus"
#, c-format #, c-format
msgid "%ld more lines" msgid "%ld line less"
msgstr "%ld lignes en plus" msgid_plural "%ld fewer lines"
msgstr[0] "%ld ligne en moins"
#, c-format msgstr[1] "%ld lignes en moins"
msgid "%ld fewer lines"
msgstr "%ld lignes en moins"
msgid " (Interrupted)" msgid " (Interrupted)"
msgstr " (Interrompu)" msgstr " (Interrompu)"
@@ -4352,31 +4349,26 @@ msgstr ""
"Vim" "Vim"
#, c-format #, c-format
msgid "1 line %sed 1 time" msgid "%ld line %sed %d time"
msgstr "1 ligne %s<EFBFBD>e 1 fois" msgid_plural "%ld line %sed %d times"
msgstr[0] "%ld lignes %s<>es %d fois"
msgstr[1] "%ld lignes %s<>es %d fois"
#, c-format #, c-format
msgid "1 line %sed %d times" msgid "%ld lines %sed %d time"
msgstr "1 ligne %s<EFBFBD>e %d fois" msgid_plural "%ld lines %sed %d times"
msgstr[0] "%ld lignes %s<>es %d fois"
#, c-format msgstr[1] "%ld lignes %s<>es %d fois"
msgid "%ld lines %sed 1 time"
msgstr "%ld lignes %s<>es 1 fois"
#, c-format
msgid "%ld lines %sed %d times"
msgstr "%ld lignes %s<>es %d fois"
#, c-format #, c-format
msgid "%ld lines to indent... " msgid "%ld lines to indent... "
msgstr "%ld lignes <20> indenter... " msgstr "%ld lignes <20> indenter... "
msgid "1 line indented "
msgstr "1 ligne indent<6E>e "
#, c-format #, c-format
msgid "%ld lines indented " msgid "%ld line indented "
msgstr "%ld lignes indent<EFBFBD>es " msgid_plural "%ld lines indented "
msgstr[0] "%ld ligne indent<6E>e "
msgstr[1] "%ld lignes indent<6E>es "
msgid "E748: No previously used register" msgid "E748: No previously used register"
msgstr "E748: Aucun registre n'a <20>t<EFBFBD> pr<70>c<EFBFBD>demment utilis<69>" msgstr "E748: Aucun registre n'a <20>t<EFBFBD> pr<70>c<EFBFBD>demment utilis<69>"
@@ -4385,12 +4377,11 @@ msgstr "E748: Aucun registre n'a
msgid "cannot yank; delete anyway" msgid "cannot yank; delete anyway"
msgstr "impossible de r<>aliser une copie ; effacer tout de m<>me" msgstr "impossible de r<>aliser une copie ; effacer tout de m<>me"
msgid "1 line changed"
msgstr "1 ligne modifi<66>e"
#, c-format #, c-format
msgid "%ld lines changed" msgid "%ld line changed"
msgstr "%ld lignes modifi<EFBFBD>es" msgid_plural "%ld lines changed"
msgstr[0] "%ld ligne modifi<66>e"
msgstr[1] "%ld lignes modifi<66>es"
#, c-format #, c-format
msgid "freeing %ld lines" msgid "freeing %ld lines"
@@ -4401,20 +4392,16 @@ msgid " into \"%c"
msgstr " dans \"%c" msgstr " dans \"%c"
#, c-format #, c-format
msgid "block of 1 line yanked%s" msgid "block of %ld line yanked%s"
msgstr "bloc de 1 ligne copi<70>%s" msgid_plural "block of %ld lines yanked%s"
msgstr[0] "bloc de %ld ligne copi<70>%s"
msgstr[1] "bloc de %ld lignes copi<70>%s"
#, c-format #, c-format
msgid "1 line yanked%s" msgid "%ld line yanked%s"
msgstr "1 ligne copi<70>e%s" msgid_plural "%ld lines yanked%s"
msgstr[0] "%ld ligne copi<70>e%s"
#, c-format msgstr[1] "%ld lignes copi<70>es%s"
msgid "block of %ld lines yanked%s"
msgstr "bloc de %ld lignes copi<70>%s"
#, c-format
msgid "%ld lines yanked%s"
msgstr "%ld lignes copi<70>es%s"
#, c-format #, c-format
msgid "E353: Nothing in register %s" msgid "E353: Nothing in register %s"
@@ -5014,6 +5001,9 @@ msgstr "E69: ']' manquant apr
msgid "E70: Empty %s%%[]" msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] vide" msgstr "E70: %s%%[] vide"
msgid "E956: Cannot use pattern recursively"
msgstr "E956: Impossible d'utiliser le motif r<>cursivement"
msgid "E65: Illegal back reference" msgid "E65: Illegal back reference"
msgstr "E65: post-r<>f<EFBFBD>rence invalide" msgstr "E65: post-r<>f<EFBFBD>rence invalide"
@@ -5129,6 +5119,11 @@ msgstr "E879: (regexp NFA) Trop de \\z("
msgid "E873: (NFA regexp) proper termination error" msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA regexp) erreur de terminaison" msgstr "E873: (NFA regexp) erreur de terminaison"
msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Impossible d'ouvrir le fichier de log temporaire en <20>criture, affichage sur "
"stderr... "
msgid "E874: (NFA) Could not pop the stack!" msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) Impossible de d<>piler !" msgstr "E874: (NFA) Impossible de d<>piler !"
@@ -5146,19 +5141,6 @@ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "" msgstr ""
"E878: (NFA) Impossible d'allouer la m<>moire pour parcourir les branches !" "E878: (NFA) Impossible d'allouer la m<>moire pour parcourir les branches !"
msgid ""
"Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"Impossible d'ouvrir le fichier de log temporaire en <20>criture, affichage sur "
"stderr... "
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) IMPOSSIBLE D'OUVRIR %s !"
msgid "Could not open temporary log file for writing "
msgstr "Impossible d'ouvrir le fichier de log en <20>criture"
msgid " VREPLACE" msgid " VREPLACE"
msgstr " VREMPLACEMENT" msgstr " VREMPLACEMENT"
@@ -5654,6 +5636,9 @@ msgstr "E783: caract
msgid "No Syntax items defined for this buffer" msgid "No Syntax items defined for this buffer"
msgstr "Aucun <20>l<EFBFBD>ment de syntaxe d<>fini pour ce tampon" msgstr "Aucun <20>l<EFBFBD>ment de syntaxe d<>fini pour ce tampon"
msgid "'redrawtime' exceeded, syntax highlighting disabled"
msgstr "'redrawtime' <20>coul<75>, surbrillance de syntaxe d<>sactiv<69>e"
msgid "syntax conceal on" msgid "syntax conceal on"
msgstr "\"syntax conceal\" activ<69>e" msgstr "\"syntax conceal\" activ<69>e"
@@ -5684,6 +5669,9 @@ msgstr ""
msgid "syntax iskeyword " msgid "syntax iskeyword "
msgstr "syntaxe iskeyword " msgstr "syntaxe iskeyword "
msgid "syntax iskeyword not set"
msgstr "iskeyword n'est pas activ<69>"
#, c-format #, c-format
msgid "E391: No such syntax cluster: %s" msgid "E391: No such syntax cluster: %s"
msgstr "E391: Aucune grappe de syntaxe %s" msgstr "E391: Aucune grappe de syntaxe %s"
@@ -6175,8 +6163,10 @@ msgid "number changes when saved"
msgstr "num<75>ro modif. instant enregistr<74>" msgstr "num<75>ro modif. instant enregistr<74>"
#, c-format #, c-format
msgid "%ld seconds ago" msgid "%ld second ago"
msgstr "il y a %ld secondes" msgid_plural "%ld seconds ago"
msgstr[0] "il y a %ld seconde"
msgstr[1] "il y a %ld secondes"
msgid "E790: undojoin is not allowed after undo" msgid "E790: undojoin is not allowed after undo"
msgstr "E790: undojoin n'est pas autoris<69> apr<70>s une annulation" msgstr "E790: undojoin n'est pas autoris<69> apr<70>s une annulation"
@@ -6334,6 +6324,10 @@ msgstr "E133: :return en dehors d'une fonction"
msgid "E107: Missing parentheses: %s" msgid "E107: Missing parentheses: %s"
msgstr "E107: Parenth<74>ses manquantes : %s" msgstr "E107: Parenth<74>ses manquantes : %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, compil<69> %s)"
msgid "" msgid ""
"\n" "\n"
"MS-Windows 64-bit GUI version" "MS-Windows 64-bit GUI version"