opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

vim-patch:91f84f6e11cd 

Update runtime files.
91f84f6e11
This commit is contained in:
Justin M. Keyes 2018-10-29 09:50:39 +01:00
parent 877d5c8be7
commit 07fdbba9d0
64 changed files with 367 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
runtime/autoload/RstFold.vim Normal file
View File

@ -0,0 +1,48 @@
" Author: Antony Lee <anntzer.lee@gmail.com>
" Description: Helper functions for reStructuredText syntax folding
" Last Modified: 2018-01-07
function s:CacheRstFold()
let closure = {'header_types': {}, 'max_level': 0, 'levels': {}}
function closure.Process(match) dict
let curline = getcurpos()[1]
if has_key(self.levels, curline - 1)
" For over+under-lined headers, the regex will match both at the
" overline and at the title itself; in that case, skip the second match.
return
endif
let lines = split(a:match, '\n')
let key = repeat(lines[-1][0], len(lines))
if !has_key(self.header_types, key)
let self.max_level += 1
let self.header_types[key] = self.max_level
endif
let self.levels[curline] = self.header_types[key]
endfunction
let save_cursor = getcurpos()
silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn
call setpos('.', save_cursor)
let b:RstFoldCache = closure.levels
endfunction
function RstFold#GetRstFold()
if !has_key(b:, 'RstFoldCache')
call s:CacheRstFold()
endif
if has_key(b:RstFoldCache, v:lnum)
return '>' . b:RstFoldCache[v:lnum]
else
return '='
endif
endfunction
function RstFold#GetRstFoldText()
if !has_key(b:, 'RstFoldCache')
call s:CacheRstFold()
endif
let indent = repeat(' ', b:RstFoldCache[v:foldstart] - 1)
let thisline = getline(v:foldstart)
" For over+under-lined headers, skip the overline.
let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
return indent . text
endfunction

3
runtime/autoload/xmlformat.vim
View File

@ -2,9 +2,8 @@
" Last Change: Thu, 22 May 2018 21:26:55 +0100
" Version: 0.1
" Author: Christian Brabandt <cb@256bit.org>
" Script: http://www.vim.org/scripts/script.php?script_id=
" Repository: https://github.com/chrisbra/vim-xml-ftplugin
" License: VIM License
" GetLatestVimScripts: ???? 18 :AutoInstall: xmlformat.vim
" Documentation: see :h xmlformat.txt (TODO!)
" ---------------------------------------------------------------------
" Load Once: {{{1

2
runtime/doc/arabic.txt
View File

@ -313,4 +313,4 @@ There is one known minor bug,
No other bugs are known to exist.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/change.txt
View File

@ -1803,4 +1803,4 @@ The sorting can be interrupted, but if you interrupt it too late in the
process you may end up with duplicated lines. This also depends on the system
library function used.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/cmdline.txt
View File

@ -1109,4 +1109,4 @@ The character used for the pattern indicates the type of command-line:
@ string for |input()|
- text for |:insert| or |:append|
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/debug.txt
View File

@ -170,4 +170,4 @@ Visual C++ 2005 Express Edition can be downloaded for free from:
http://msdn.microsoft.com/vstudio/express/visualC/default.aspx
=========================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/develop.txt
View File

@ -265,4 +265,4 @@ External UIs are expected to implement these common features:
this event.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/diff.txt
View File

@ -429,4 +429,4 @@ evaluating 'patchexpr'. This hopefully avoids that files in the current
directory are accidentally patched. Vim will also delete files starting with
v:fname_in and ending in ".rej" and ".orig".
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/digraph.txt
View File

@ -1484,4 +1484,4 @@ char digraph hex dec official name ~
ſt ft FB05 64261 LATIN SMALL LIGATURE LONG S T
st st FB06 64262 LATIN SMALL LIGATURE ST
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/editing.txt
View File

@ -1554,4 +1554,4 @@ There are three different types of searching:
currently work with 'path' items that contain a URL or use the double star
with depth limiter (/usr/**2) or upward search (;) notations.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/farsi.txt
View File

@ -205,4 +205,4 @@ changes made in the current line.
For more information about the bugs refer to rileft.txt.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/filetype.txt
View File

@ -773,4 +773,4 @@ The mappings can be disabled with: >
<
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/fold.txt
View File

@ -595,4 +595,4 @@ used. Otherwise the values from the window where the buffer was edited last
are used.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/ft_sql.txt
View File

@ -773,4 +773,4 @@ Setting the filetype back to Perl sets all the usual "perl" related items back
as they were.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/gui.txt
View File

@ -639,4 +639,4 @@ This creates a popup menu that doesn't exist on the main menu-bar.
Note that a menu that starts with ']' will not be displayed.
vim:tw=78:sw=4:ts=8:ft=help:norl:
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

2
runtime/doc/hebrew.txt
View File

@ -134,4 +134,4 @@ The result is that all Hebrew characters are displayed as ~x. To solve this
problem, set isprint=@,128-255.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

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'.
------------------------------------------------------------------------------
vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:
vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl:

2
runtime/doc/helphelp.txt
View File

@ -364,4 +364,4 @@ highlighting. So do these:
You can find the details in $VIMRUNTIME/syntax/help.vim
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/if_cscop.txt
View File

@ -371,4 +371,4 @@ Cscope Home Page (http://cscope.sourceforge.net/): >
\:vert scs find a <C-R>=expand("<cword>")<CR><CR>
<
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/if_pyth.txt
View File

@ -732,4 +732,4 @@ This also tells you whether Python is dynamically loaded, which will fail if
the runtime library cannot be found.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/if_ruby.txt
View File

@ -180,4 +180,4 @@ $curwin The current window object.
$curbuf The current buffer object.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/indent.txt
View File

@ -1152,4 +1152,4 @@ indent for a continuation line, a line that starts with a backslash: >
Three times shiftwidth is the default value.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/index.txt
View File

@ -1615,4 +1615,4 @@ tag command action ~
|:~| :~ repeat last ":substitute"
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/insert.txt
View File

@ -1972,4 +1972,4 @@ self explanatory. Using the long or the short version depends on the
[READ ERRORS] not all of the file could be read
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/intro.txt
View File

@ -838,4 +838,4 @@ buffer lines logical lines window lines screen lines ~
6. ~
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/map.txt
View File

@ -1489,4 +1489,4 @@ local to the script and use mappings local to the script. When the user
invokes the user command, it will run in the context of the script it was
defined in. This matters if |<SID>| is used in a command.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/mbyte.txt
View File

@ -1185,4 +1185,4 @@ Contributions specifically for the multi-byte features by:
Taro Muraoka <koron@tka.att.ne.jp>
Yasuhiro Matsumoto <mattn@mail.goo.ne.jp>
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/message.txt
View File

@ -844,4 +844,4 @@ The |g<| command can be used to see the last page of previous command output.
This is especially useful if you accidentally typed <Space> at the hit-enter
prompt.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/mlang.txt
View File

@ -203,4 +203,4 @@ a message adapt to language preferences of the user, >
:endif
<
vim:tw=78:sw=4:ts=8:ft=help:norl:
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

2
runtime/doc/motion.txt
View File

@ -1295,4 +1295,4 @@ L To line [count] from bottom of window (default: Last
position is in a status line, that window is made the
active window and the cursor is not moved.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/options.txt
View File

@ -6751,4 +6751,4 @@ A jump table for the options with a short description can be found at |Q_op|.
When negative, all redrawn characters cause a delay, even if the
character already was displayed by the UI. For debugging purposes.
vim:tw=78:ts=8:ft=help:noet:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/pattern.txt
View File

@ -1399,4 +1399,4 @@ Finally, these constructs are unique to Perl:
":2match" for another plugin.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/pi_gzip.txt
View File

@ -38,4 +38,4 @@ compression. Thus editing the patchmode file will not give you the automatic
decompression. You have to rename the file if you want this.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/pi_netrw.txt
View File

@ -4098,4 +4098,4 @@ netrw:
==============================================================================
Modelines: {{{1
vim:tw=78:ts=8:ft=help:norl:fdm=marker
vim:tw=78:ts=8:noet:ft=help:norl:fdm=marker

2
runtime/doc/pi_paren.txt
View File

@ -56,4 +56,4 @@ used. This plugin also helps to skip matches in comments. This is unrelated
to the matchparen highlighting, they use a different mechanism.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/pi_spec.txt
View File

@ -108,4 +108,4 @@ If you don't like the release updating feature and don't want to answer
Good luck!!
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/pi_tar.txt
View File

@ -148,4 +148,4 @@ Copyright 2005-2012: *tar-copyright*
v1 (original) * Michael Toren (see http://michael.toren.net/code/)
==============================================================================
vim:tw=78:ts=8:ft=help
vim:tw=78:ts=8:noet:ft=help

2
runtime/doc/pi_zip.txt
View File

@ -149,4 +149,4 @@ Copyright: Copyright (C) 2005-2015 Charles E Campbell *zip-copyright*
v1 Sep 15, 2005 * Initial release, had browsing, reading, and writing
==============================================================================
vim:tw=78:ts=8:ft=help:fdm=marker
vim:tw=78:ts=8:noet:ft=help:fdm=marker

2
runtime/doc/print.txt
View File

@ -729,4 +729,4 @@ to adjust the number of lines before a formfeed character to prevent
accidental blank pages.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/quickfix.txt
View File

@ -1762,4 +1762,4 @@ by Vim.
vim:noet:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/quickref.txt
View File

@ -1376,4 +1376,4 @@ Context-sensitive completion on the command-line:
|zN| zN fold normal set 'foldenable'
|zi| zi invert 'foldenable'
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/recover.txt
View File

@ -170,4 +170,4 @@ Once you are sure the recovery is ok delete the swap file. Otherwise, you
will continue to get warning messages that the ".swp" file already exists.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/remote.txt
View File

@ -191,4 +191,4 @@ When using gvim, the --remote-wait only works properly this way: >
start /w gvim --remote-wait file.txt
<
vim:tw=78:sw=4:ts=8:ft=help:norl:
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

2
runtime/doc/repeat.txt
View File

@ -962,4 +962,4 @@ mind there are various things that may clobber the results:
- The "self" time is wrong when a function is used recursively.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/rileft.txt
View File

@ -112,4 +112,4 @@ o When both 'rightleft' and 'revins' are on: 'textwidth' does not work.
o There is no full bidirectionality (bidi) support.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/russian.txt
View File

@ -68,4 +68,4 @@ In order to use the Russian documentation, make sure you have set the
releases of gettext.
===============================================================================
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/scroll.txt
View File

@ -250,4 +250,4 @@ the scroll wheel move one line or half a page in Normal mode: >
:map <S-ScrollWheelDown> <C-D>
You can also use Alt and Ctrl modifiers.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/sign.txt
View File

@ -196,4 +196,4 @@ JUMPING TO A SIGN *:sign-jump* *E157*
have a name.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/spell.txt
View File

@ -1733,4 +1733,4 @@ This isn't ideal, because the longer Vim is running the higher the counts
become. But in practice it is a noticeable improvement over not using the word
count.
vim:tw=78:sw=4:ts=8:ft=help:norl:
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

2
runtime/doc/sponsor.txt
View File

@ -213,4 +213,4 @@ is done. But a receipt is possible.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

16
runtime/doc/syntax.txt
View File

@ -2845,17 +2845,17 @@ This covers syntax highlighting for the older Unix (Bourne) sh, and newer
shells such as bash, dash, posix, and the Korn shells.
Vim attempts to determine which shell type is in use by specifying that
various filenames are of specific types: >
various filenames are of specific types, e.g.: >
ksh : .kshrc* *.ksh
bash: .bashrc* bashrc bash.bashrc .bash_profile* *.bash
<
If none of these cases pertain, then the first line of the file is examined
(ex. looking for /bin/sh /bin/ksh /bin/bash). If the first line specifies a
shelltype, then that shelltype is used. However some files (ex. .profile) are
known to be shell files but the type is not apparent. Furthermore, on many
systems sh is symbolically linked to "bash" (Linux, Windows+cygwin) or "ksh"
(Posix).
See $VIMRUNTIME/filetype.vim for the full list of patterns. If none of these
cases pertain, then the first line of the file is examined (ex. looking for
/bin/sh /bin/ksh /bin/bash). If the first line specifies a shelltype, then
that shelltype is used. However some files (ex. .profile) are known to be
shell files but the type is not apparent. Furthermore, on many systems sh is
symbolically linked to "bash" (Linux, Windows+cygwin) or "ksh" (Posix).
One may specify a global default by instantiating one of the following
variables in your vimrc:
@ -5254,4 +5254,4 @@ literal text specify the size of that text (in bytes):
"<\@1<=span" Matches the same, but only tries one byte before "span".
vim:tw=78:sw=4:ts=8:ft=help:norl:
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

2
runtime/doc/tabpage.txt
View File

@ -464,4 +464,4 @@ If you want to show something specific for a tab page, you might want to use a
tab page local variable. |t:var|
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/tagsrch.txt
View File

@ -819,4 +819,4 @@ Common arguments for the commands above:
< For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern
is used as a literal string, not as a search pattern.
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/doc/tips.txt
View File

@ -446,4 +446,4 @@ A slightly more advanced version is used in the |matchparen| plugin.
autocmd InsertEnter * match none
<
vim:tw=78:ts=8:ft=help:norl:
vim:tw=78:ts=8:noet:ft=help:norl:

2
runtime/filetype.vim
View File

@ -1458,7 +1458,7 @@ au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
" Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
au BufNewFile,BufRead .bashrc*,bashrc,bash.bashrc,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD* call dist#ft#SetFileTypeSH("bash")
au BufNewFile,BufRead .bashrc*,bashrc,bash.bashrc,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD* call dist#ft#SetFileTypeSH("bash")
au BufNewFile,BufRead .kshrc*,*.ksh call dist#ft#SetFileTypeSH("ksh")
au BufNewFile,BufRead */etc/profile,.profile*,*.sh,*.env call dist#ft#SetFileTypeSH(getline(1))

32
runtime/ftplugin/rst.vim
View File

@ -1,10 +1,12 @@
" Vim filetype plugin file
" Language: reStructuredText documentation format
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2008-07-09
" reStructuredText filetype plugin file
" Language: reStructuredText documentation format
" Maintainer: Marshall Ward <marshall.ward@gmail.com>
" Original Maintainer: Nikolai Weibull <now@bitwi.se>
" Website: https://github.com/marshallward/vim-restructuredtext
" Latest Revision: 2018-01-07
if exists("b:did_ftplugin")
finish
finish
endif
let b:did_ftplugin = 1
@ -16,5 +18,25 @@ let b:undo_ftplugin = "setl com< cms< et< fo<"
setlocal comments=fb:.. commentstring=..\ %s expandtab
setlocal formatoptions+=tcroql
" reStructuredText standard recommends that tabs be expanded to 8 spaces
" The choice of 3-space indentation is to provide slightly better support for
" directives (..) and ordered lists (1.), although it can cause problems for
" many other cases.
"
" More sophisticated indentation rules should be revisted in the future.
if !exists("g:rst_style") || g:rst_style != 0
setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8
endif
if has('patch-7.3.867') " Introduced the TextChanged event.
setlocal foldmethod=expr
setlocal foldexpr=RstFold#GetRstFold()
setlocal foldtext=RstFold#GetRstFoldText()
augroup RstFold
autocmd TextChanged,InsertLeave <buffer> unlet! b:RstFoldCache
augroup END
endif
let &cpo = s:cpo_save
unlet s:cpo_save

3
runtime/indent/sh.vim
View File

@ -7,6 +7,7 @@
" License: Vim (see :h license)
" Repository: https://github.com/chrisbra/vim-sh-indent
" Changelog:
" 20180724 - make check for zsh syntax more rigid (needs word-boundaries)
" 20180326 - better support for line continuation
" 20180325 - better detection of function definitions
" 20180127 - better support for zsh complex commands
@ -70,7 +71,7 @@ function! GetShIndent()
" Check contents of previous lines
if line =~ '^\s*\%(if\|then\|do\|else\|elif\|case\|while\|until\|for\|select\|foreach\)\>' ||
\ (&ft is# 'zsh' && line =~ '\%(if\|then\|do\|else\|elif\|case\|while\|until\|for\|select\|foreach\)\>')
\ (&ft is# 'zsh' && line =~ '\<\%(if\|then\|do\|else\|elif\|case\|while\|until\|for\|select\|foreach\)\>')
if line !~ '\<\%(fi\|esac\|done\|end\)\>\s*\%(#.*\)\=$'
let ind += s:indent_value('default')
endif

9
runtime/indent/xml.vim
View File

@ -1,6 +1,8 @@
" Language: xml
" Maintainer: Johannes Zellner <johannes@zellner.org>
" Last Change: 2017 Jun 13
" Repository: https://github.com/chrisbra/vim-xml-ftplugin
" Maintainer: Christian Brabandt <cb@256bit.org>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
" Last Change: 20180724 - Correctly indent xml comments https://github.com/vim/vim/issues/3200
" Notes: 1) does not indent pure non-xml code (e.g. embedded scripts)
" 2) will be confused by unbalanced tags in comments
" or CDATA sections.
@ -55,9 +57,6 @@ fun! <SID>XmlIndentSynCheck(lnum)
if '' != syn1 && syn1 !~ 'xml' && '' != syn2 && syn2 !~ 'xml'
" don't indent pure non-xml code
return 0
elseif syn1 =~ '^xmlComment' && syn2 =~ '^xmlComment'
" indent comments specially
return -1
endif
endif
return 1

27
runtime/syntax/java.vim
View File

@ -1,8 +1,8 @@
" Vim syntax file
" Language: Java
" Maintainer: Claudio Fleiner <claudio@fleiner.com>
" URL: http://www.fleiner.com/vim/syntax/java.vim
" Last Change: 2015 March 01
" URL: https://github.com/fleiner/vim/blob/master/runtime/syntax/java.vim
" Last Change: 2018 July 26
" Please check :help java.vim for comments on some of the options available.
@ -29,8 +29,6 @@ syn match javaOK "\.\.\."
syn match javaError2 "#\|=<"
hi def link javaError2 javaError
" keyword definitions
syn keyword javaExternal native package
syn match javaExternal "\<import\>\(\s\+static\>\)\?"
@ -40,7 +38,7 @@ syn keyword javaRepeat while for do
syn keyword javaBoolean true false
syn keyword javaConstant null
syn keyword javaTypedef this super
syn keyword javaOperator new instanceof
syn keyword javaOperator var new instanceof
syn keyword javaType boolean char byte short int long float double
syn keyword javaType void
syn keyword javaStatement return
@ -54,17 +52,25 @@ syn match javaTypedef "\.\s*\<class\>"ms=s+1
syn keyword javaClassDecl enum
syn match javaClassDecl "^class\>"
syn match javaClassDecl "[^.]\s*\<class\>"ms=s+1
syn match javaAnnotation "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>\(([^)]*)\)\=" contains=javaString
syn match javaAnnotation "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>" contains=javaString
syn match javaClassDecl "@interface\>"
syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite
syn match javaUserLabelRef "\k\+" contained
syn match javaVarArg "\.\.\."
syn keyword javaScopeDecl public protected private abstract
" Java Modules(Since Java 9, for "module-info.java" file)
if fnamemodify(bufname("%"), ":t") == "module-info.java"
syn keyword javaModuleStorageClass module transitive
syn keyword javaModuleStmt open requires exports opens uses provides
syn keyword javaModuleExternal to with
syn cluster javaTop add=javaModuleStorageClass,javaModuleStmt,javaModuleExternal
endif
if exists("java_highlight_java_lang_ids")
let java_highlight_all=1
endif
if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang")
if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang")
" java.lang.*
syn match javaLangClass "\<System\>"
syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
@ -296,6 +302,7 @@ hi def link javaStorageClass StorageClass
hi def link javaMethodDecl javaStorageClass
hi def link javaClassDecl javaStorageClass
hi def link javaScopeDecl javaStorageClass
hi def link javaBoolean Boolean
hi def link javaSpecial Special
hi def link javaSpecialError Error
@ -329,6 +336,12 @@ hi def link htmlComment Special
hi def link htmlCommentPart Special
hi def link javaSpaceError Error
if fnamemodify(bufname("%"), ":t") == "module-info.java"
hi def link javaModuleStorageClass StorageClass
hi def link javaModuleStmt Statement
hi def link javaModuleExternal Include
endif
let b:current_syntax = "java"
if main_syntax == 'java'

12
runtime/syntax/javascript.vim
View File

@ -7,7 +7,7 @@
" (ss) repaired several quoting and grouping glitches
" (ss) fixed regex parsing issue with multiple qualifiers [gi]
" (ss) additional factoring of keywords, globals, and members
" Last Change: 2012 Oct 05
" Last Change: 2018 Jul 28
" 2013 Jun 12: adjusted javaScriptRegexpString (Kevin Locke)
" 2018 Apr 14: adjusted javaScriptRegexpString (LongJohnCoder)
@ -35,10 +35,13 @@ syn region javaScriptComment start="/\*" end="\*/" contains=@Spell,java
syn match javaScriptSpecial "\\\d\d\d\|\\."
syn region javaScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc
syn region javaScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc
syn region javaScriptStringT start=+`+ skip=+\\\\\|\\`+ end=+`+ contains=javaScriptSpecial,javaScriptEmbed,@htmlPreproc
syn region javaScriptEmbed start=+${+ end=+}+ contains=@javaScriptEmbededExpr
syn match javaScriptSpecialCharacter "'\\.'"
syn match javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
syn region javaScriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gimuys]\{0,2\}\s*$+ end=+/[gimuys]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
syn region javaScriptRegexpString start=+[,(=+]\s*/[^/*]+ms=e-1,me=e-1 skip=+\\\\\|\\/+ end=+/[gimuys]\{0,2\}\s*$+ end=+/[gimuys]\{0,2\}\s*[+;.,)\]}]+me=e-1 end=+/[gimuys]\{0,2\}\s\+\/+me=e-1 contains=@htmlPreproc,javaScriptComment oneline
syn keyword javaScriptConditional if else switch
syn keyword javaScriptRepeat while for do in
@ -57,6 +60,8 @@ syn keyword javaScriptMember document event location
syn keyword javaScriptDeprecated escape unescape
syn keyword javaScriptReserved abstract boolean byte char class const debugger double enum export extends final float goto implements import int interface long native package private protected public short static super synchronized throws transient volatile
syn cluster javaScriptEmbededExpr contains=javaScriptBoolean,javaScriptNull,javaScriptIdentifier,javaScriptStringD,javaScriptStringS,javaScriptStringT
if exists("javaScript_fold")
syn match javaScriptFunction "\<function\>"
syn region javaScriptFunctionFold start="\<function\>.*[^};]$" end="^\z1}.*$" transparent fold keepend
@ -87,6 +92,7 @@ hi def link javaScriptCommentTodo Todo
hi def link javaScriptSpecial Special
hi def link javaScriptStringS String
hi def link javaScriptStringD String
hi def link javaScriptStringT String
hi def link javaScriptCharacter Character
hi def link javaScriptSpecialCharacter javaScriptSpecial
hi def link javaScriptNumber javaScriptValue
@ -114,6 +120,8 @@ hi def link javaScriptDeprecated Exception
hi def link javaScriptReserved Keyword
hi def link javaScriptDebug Debug
hi def link javaScriptConstant Label
hi def link javaScriptEmbed Special
let b:current_syntax = "javascript"

17
runtime/syntax/readline.vim
View File

@ -2,9 +2,9 @@
" Language: readline(3) configuration file
" Maintainer: Daniel Moch <daniel@danielmoch.com>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Latest Revision: 2017-12-25
" readline_has_bash - if defined add support for bash specific
" settings/functions
" Latest Revision: 2018-07-26
" Add new functions for Readline 7 / Bash 4.4
" (credit: Github user bewuethr)
if exists('b:current_syntax')
finish
@ -111,7 +111,7 @@ syn keyword readlineKeyword contained
\ nextgroup=readlineVariable
\ skipwhite
syn keyword readlineVariable contained
syn keyword readlineVariable contained
\ nextgroup=readlineBellStyle
\ skipwhite
\ bell-style
@ -120,12 +120,15 @@ syn keyword readlineVariable contained
\ nextgroup=readlineBoolean
\ skipwhite
\ bind-tty-special-chars
\ blink-matching-paren
\ colored-completion-prefix
\ colored-stats
\ completion-ignore-case
\ completion-map-case
\ convert-meta
\ disable-completion
\ echo-control-characters
\ enable-bracketed-paste
\ enable-keypad
\ enable-meta-key
\ expand-tilde
@ -269,6 +272,7 @@ syn keyword readlineFunction contained
\ start-kbd-macro
\ end-kbd-macro
\ call-last-kbd-macro
\ print-last-kbd-macro
\
\ re-read-init-file
\ abort
@ -339,6 +343,8 @@ syn keyword readlineFunction contained
if exists("readline_has_bash")
syn keyword readlineFunction contained
\ shell-forward-word
\ shell-backward-word
\ shell-expand-line
\ history-expand-line
\ magic-space
@ -347,6 +353,8 @@ if exists("readline_has_bash")
\ insert-last-argument
\ operate-and-get-next
\ forward-backward-delete-char
\ shell-kill-word
\ shell-backward-kill-word
\ delete-char-or-list
\ complete-filename
\ possible-filename-completions
@ -359,6 +367,7 @@ if exists("readline_has_bash")
\ complete-command
\ possible-command-completions
\ dynamic-complete-history
\ dabbrev-expand
\ complete-into-braces
\ glob-expand-word
\ glob-list-expansions

108
runtime/syntax/rst.vim
View File

@ -3,7 +3,7 @@
" Maintainer: Marshall Ward <marshall.ward@gmail.com>
" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
" Website: https://github.com/marshallward/vim-restructuredtext
" Latest Revision: 2016-08-18
" Latest Revision: 2018-07-23
if exists("b:current_syntax")
finish
@ -50,7 +50,10 @@ syn cluster rstDirectives contains=rstFootnote,rstCitation,
syn match rstExplicitMarkup '^\s*\.\.\_s'
\ nextgroup=@rstDirectives,rstComment,rstSubstitutionDefinition
let s:ReferenceName = '[[:alnum:]]\+\%([_.-][[:alnum:]]\+\)*'
" "Simple reference names are single words consisting of alphanumerics plus
" isolated (no two adjacent) internal hyphens, underscores, periods, colons
" and plus signs."
let s:ReferenceName = '[[:alnum:]]\%([-_.:+]\?[[:alnum:]]\+\)*'
syn keyword rstTodo contained FIXME TODO XXX NOTE
@ -83,7 +86,7 @@ execute 'syn region rstExDirective contained matchgroup=rstDirective' .
\ ' end=+^\s\@!+ contains=@rstCruft,rstLiteralBlock'
execute 'syn match rstSubstitutionDefinition contained' .
\ ' /|' . s:ReferenceName . '|\_s\+/ nextgroup=@rstDirectives'
\ ' /|.*|\_s\+/ nextgroup=@rstDirectives'
function! s:DefineOneInlineMarkup(name, start, middle, end, char_left, char_right)
execute 'syn region rst' . a:name .
@ -107,10 +110,10 @@ function! s:DefineInlineMarkup(name, start, middle, end)
call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '’', '’')
" TODO: Additional Unicode Pd, Po, Pi, Pf, Ps characters
call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '\%(^\|\s\|[/:]\)', '')
call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '\%(^\|\s\|\%ua0\|[/:]\)', '')
execute 'syn match rst' . a:name .
\ ' +\%(^\|\s\|[''"([{</:]\)\zs' . a:start .
\ ' +\%(^\|\s\|\%ua0\|[''"([{</:]\)\zs' . a:start .
\ '[^[:space:]' . a:start[strlen(a:start) - 1] . ']'
\ a:end . '\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+'
@ -124,14 +127,31 @@ call s:DefineInlineMarkup('InlineLiteral', '``', "", '``')
call s:DefineInlineMarkup('SubstitutionReference', '|', '|', '|_\{0,2}')
call s:DefineInlineMarkup('InlineInternalTargets', '_`', '`', '`')
syn match rstSections "^\%(\([=`:.'"~^_*+#-]\)\1\+\n\)\=.\+\n\([=`:.'"~^_*+#-]\)\2\+$"
" Sections are identified through their titles, which are marked up with
" adornment: "underlines" below the title text, or underlines and matching
" "overlines" above the title. An underline/overline is a single repeated
" punctuation character that begins in column 1 and forms a line extending at
" least as far as the right edge of the title text.
"
" It is difficult to count characters in a regex, but we at least special-case
" the case where the title has at least three characters to require the
" adornment to have at least three characters as well, in order to handle
" properly the case of a literal block:
"
" this is the end of a paragraph
" ::
" this is a literal block
syn match rstSections "\v^%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+$"
\ contains=@Spell
syn match rstSections "\v^%(([=`:.'"~^_*+#-])\1{2,}\n)?.{3,}\n([=`:.'"~^_*+#-])\2{2,}$"
\ contains=@Spell
" TODO: Can’t remember why these two can’t be defined like the ones above.
execute 'syn match rstFootnoteReference contains=@NoSpell' .
\ ' +\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]_+'
\ ' +\%(\s\|^\)\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]_+'
execute 'syn match rstCitationReference contains=@NoSpell' .
\ ' +\[' . s:ReferenceName . '\]_\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+'
\ ' +\%(\s\|^\)\[' . s:ReferenceName . '\]_\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+'
execute 'syn match rstHyperlinkReference' .
\ ' /\<' . s:ReferenceName . '__\=\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)/'
@ -140,28 +160,69 @@ syn match rstStandaloneHyperlink contains=@NoSpell
\ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]"
syn region rstCodeBlock contained matchgroup=rstDirective
\ start=+\%(sourcecode\|code\%(-block\)\=\)::\s\+\w*\_s*\n\ze\z(\s\+\)+
\ start=+\%(sourcecode\|code\%(-block\)\=\)::\s\+.*\_s*\n\ze\z(\s\+\)+
\ skip=+^$+
\ end=+^\z1\@!+
\ contains=@NoSpell
syn cluster rstDirectives add=rstCodeBlock
if !exists('g:rst_syntax_code_list')
let g:rst_syntax_code_list = ['vim', 'java', 'cpp', 'lisp', 'php',
\ 'python', 'perl', 'sh']
" A mapping from a Vim filetype to a list of alias patterns (pattern
" branches to be specific, see ':help /pattern'). E.g. given:
"
" let g:rst_syntax_code_list = {
" \ 'cpp': ['cpp', 'c++'],
" \ }
"
" then the respective contents of the following two rST directives:
"
" .. code:: cpp
"
" auto i = 42;
"
" .. code:: C++
"
" auto i = 42;
"
" will both be highlighted as C++ code. As shown by the latter block
" pattern matching will be case-insensitive.
let g:rst_syntax_code_list = {
\ 'vim': ['vim'],
\ 'java': ['java'],
\ 'cpp': ['cpp', 'c++'],
\ 'lisp': ['lisp'],
\ 'php': ['php'],
\ 'python': ['python'],
\ 'perl': ['perl'],
\ 'sh': ['sh'],
\ }
elseif type(g:rst_syntax_code_list) == type([])
" backward compatibility with former list format
let s:old_spec = g:rst_syntax_code_list
let g:rst_syntax_code_list = {}
for s:elem in s:old_spec
let g:rst_syntax_code_list[s:elem] = [s:elem]
endfor
endif
for code in g:rst_syntax_code_list
for s:filetype in keys(g:rst_syntax_code_list)
unlet! b:current_syntax
" guard against setting 'isk' option which might cause problems (issue #108)
let prior_isk = &l:iskeyword
exe 'syn include @rst'.code.' syntax/'.code.'.vim'
exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold'
\.' start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)#'
let s:alias_pattern = ''
\.'\%('
\.join(g:rst_syntax_code_list[s:filetype], '\|')
\.'\)'
exe 'syn include @rst'.s:filetype.' syntax/'.s:filetype.'.vim'
exe 'syn region rstDirective'.s:filetype
\.' matchgroup=rstDirective fold'
\.' start="\c\%(sourcecode\|code\%(-block\)\=\)::\s\+'.s:alias_pattern.'\_s*\n\ze\z(\s\+\)"'
\.' skip=#^$#'
\.' end=#^\z1\@!#'
\.' contains=@NoSpell,@rst'.code
exe 'syn cluster rstDirectives add=rstDirective'.code
\.' contains=@NoSpell,@rst'.s:filetype
exe 'syn cluster rstDirectives add=rstDirective'.s:filetype
" reset 'isk' setting, if it has been changed
if &l:iskeyword !=# prior_isk
let &l:iskeyword = prior_isk
@ -169,6 +230,9 @@ for code in g:rst_syntax_code_list
unlet! prior_isk
endfor
" Enable top level spell checking
syntax spell toplevel
" TODO: Use better syncing.
syn sync minlines=50 linebreaks=2
@ -189,8 +253,6 @@ hi def link rstHyperlinkTarget String
hi def link rstExDirective String
hi def link rstSubstitutionDefinition rstDirective
hi def link rstDelimiter Delimiter
hi def rstEmphasis ctermfg=13 term=italic cterm=italic gui=italic
hi def rstStrongEmphasis ctermfg=1 term=bold cterm=bold gui=bold
hi def link rstInterpretedTextOrHyperlinkReference Identifier
hi def link rstInlineLiteral String
hi def link rstSubstitutionReference PreProc
@ -200,6 +262,14 @@ hi def link rstCitationReference Identifier
hi def link rstHyperLinkReference Identifier
hi def link rstStandaloneHyperlink Identifier
hi def link rstCodeBlock String
if exists('g:rst_use_emphasis_colors')
" TODO: Less arbitrary color selection
hi def rstEmphasis ctermfg=13 term=italic cterm=italic gui=italic
hi def rstStrongEmphasis ctermfg=1 term=bold cterm=bold gui=bold
else
hi def rstEmphasis term=italic cterm=italic gui=italic
hi def rstStrongEmphasis term=bold cterm=bold gui=bold
endif
let b:current_syntax = "rst"

98
src/nvim/po/ja.euc-jp.po
View File

@ -5,7 +5,7 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
# vim-jp <http://vim-jp.org/>
#
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
#
@ -15,14 +15,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-01 10:46+0900\n"
"POT-Creation-Date: 2018-07-18 00:43+0900\n"
"PO-Revision-Date: 2017-05-18 00:45+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n"
"Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-jp\n"
"Content-Transfer-Encoding: 8-bit\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
msgid "E831: bf_key_init() called with empty password"
@ -205,6 +205,9 @@ msgstr ""
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 'buftype' オプションが設定されているので書込めません"
msgid "[Prompt]"
msgstr "[プロンプト]"
msgid "[Scratch]"
msgstr "[下書き]"
@ -259,10 +262,10 @@ msgstr "E917: %s()
msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
msgstr ""
"E912: raw や nl モードのチャンネルに ch_evalexpr()/ch_sendexpr() は使えません"
"E912: raw や nl モードのチャネルに ch_evalexpr()/ch_sendexpr() は使えません"
msgid "E906: not an open channel"
msgstr "E906: 開いていないチャンネルです"
msgstr "E906: 開いていないチャネルです"
msgid "E920: _io file requires _name to be set"
msgstr "E920: _io ファイルは _name の設定が必要です"
@ -522,7 +525,6 @@ msgstr "E710:
msgid "E711: List value has not enough items"
msgstr "E711: リスト型変数に十分な数の要素がありません"
#
msgid "E690: Missing \"in\" after :for"
msgstr "E690: :for の後に \"in\" がありません"
@ -591,7 +593,7 @@ msgid "E910: Using a Job as a Number"
msgstr "E910: ジョブを数値として扱っています"
msgid "E913: Using a Channel as a Number"
msgstr "E913: チャンネルを数値として扱っています"
msgstr "E913: チャネルを数値として扱っています"
msgid "E891: Using a Funcref as a Float"
msgstr "E891: 関数参照型を浮動小数点数として扱っています"
@ -612,7 +614,7 @@ msgid "E911: Using a Job as a Float"
msgstr "E911: ジョブを浮動小数点数として扱っています"
msgid "E914: Using a Channel as a Float"
msgstr "E914: チャンネルを浮動小数点数として扱っています"
msgstr "E914: チャネルを浮動小数点数として扱っています"
msgid "E729: using Funcref as a String"
msgstr "E729: 関数参照型を文字列として扱っています"
@ -1425,6 +1427,9 @@ msgstr "E784:
msgid "Already only one tab page"
msgstr "既にタブページは1つしかありません"
msgid "Edit File in new tab page"
msgstr "新しいタブページでファイルを編集します"
msgid "Edit File in new window"
msgstr "新しいウィンドウでファイルを編集します"
@ -2285,10 +2290,10 @@ msgstr "
msgid "Open tab..."
msgstr "タブページを開く"
msgid "Find string (use '\\\\' to find a '\\')"
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "検索文字列 ('\\' を検索するには '\\\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "検索・置換 ('\\' を検索するには '\\\\')"
msgid "Not Used"
@ -2706,6 +2711,19 @@ msgstr "
msgid "not allowed in the Vim sandbox"
msgstr "サンドボックスでは許されません"
#, c-format
msgid "E370: Could not load library %s"
msgstr "E370: ライブラリ %s をロードできませんでした"
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
"ています"
msgid "E836: This Vim cannot execute :python after using :py3"
msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
@ -4704,7 +4722,6 @@ msgstr "E777: ʸ
msgid "E369: invalid item in %s%%[]"
msgstr "E369: 無効な項目です: %s%%[]"
#
#, c-format
msgid "E769: Missing ] after %s["
msgstr "E769: %s[ の後に ] がありません"
@ -4727,15 +4744,12 @@ msgstr "E54: %s(
msgid "E55: Unmatched %s)"
msgstr "E55: %s) が釣り合っていません"
#
msgid "E66: \\z( not allowed here"
msgstr "E66: \\z( はココでは許可されていません"
#
msgid "E67: \\z1 - \\z9 not allowed here"
msgstr "E67: \\z1 その他はココでは許可されていません"
msgstr "E67: \\z1 - \\z9 はココでは許可されていません"
#
#, c-format
msgid "E69: Missing ] after %s%%["
msgstr "E69: %s%%[ の後に ] がありません"
@ -4744,7 +4758,9 @@ msgstr "E69: %s%%[
msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] が空です"
#
msgid "E956: Cannot use pattern recursively"
msgstr "E956: パターンを再帰的に使うことはできません"
msgid "E65: Illegal back reference"
msgstr "E65: 不正な後方参照です"
@ -4777,7 +4793,6 @@ msgstr "E61:%s*
msgid "E62: Nested %s%c"
msgstr "E62:%s%c が入れ子になっています"
#
msgid "E63: invalid use of \\_"
msgstr "E63: \\_ の無効な使用方法です"
@ -4785,16 +4800,13 @@ msgstr "E63: \\_
msgid "E64: %s%c follows nothing"
msgstr "E64:%s%c の後になにもありません"
#
msgid "E68: Invalid character after \\z"
msgstr "E68: \\z の後に不正な文字がありました"
#
#, c-format
msgid "E678: Invalid character after %s%%[dxouU]"
msgstr "E678: %s%%[dxouU] の後に不正な文字がありました"
#
#, c-format
msgid "E71: Invalid character after %s%%"
msgstr "E71: %s%% の後に不正な文字がありました"
@ -4827,7 +4839,6 @@ msgstr "E865: (NFA)
msgid "E866: (NFA regexp) Misplaced %c"
msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
#
#, c-format
msgid "E877: (NFA regexp) Invalid character class: %ld"
msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld"
@ -4865,6 +4876,11 @@ msgstr "E879: (NFA
msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA 正規表現) 終端記号がありません"
msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準エラー"
"出力に出力します。"
msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) スタックをポップできません!"
@ -4881,19 +4897,6 @@ msgstr "E876: (NFA
msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
msgid ""
"Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
"出力します。"
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) ログファイル %s を開けません!"
msgid "Could not open temporary log file for writing "
msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。"
msgid " VREPLACE"
msgstr " 仮想置換"
@ -4984,7 +4987,7 @@ msgstr "
#, c-format
msgid "Searching included file %s"
msgstr "インクルードされたファイルをスキャン中 %s"
msgstr "インクルードされたファイルを検索中 %s"
msgid "E387: Match is on current line"
msgstr "E387: 現在行に該当があります"
@ -5252,7 +5255,7 @@ msgstr "
#, c-format
msgid "Reading dictionary file %s..."
msgstr "辞書ファイル %s をスキャン中..."
msgstr "辞書ファイル %s を読込み中..."
#, c-format
msgid "E760: No word count in %s"
@ -5280,7 +5283,7 @@ msgstr "
#, c-format
msgid "Reading word file %s..."
msgstr "標準入力から読込み中 %s..."
msgstr "単語ファイル %s を読込み中..."
#, c-format
msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@ -6031,6 +6034,10 @@ msgstr "E133:
msgid "E107: Missing parentheses: %s"
msgstr "E107: カッコ '(' がありません: %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, compiled %s)"
msgid ""
"\n"
"MS-Windows 64-bit GUI version"
@ -6354,19 +6361,6 @@ msgstr "E802: ̵
msgid "E803: ID not found: %ld"
msgstr "E803: ID はありません: %ld"
#, c-format
msgid "E370: Could not load library %s"
msgstr "E370: ライブラリ %s をロードできませんでした"
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
"ています"
msgid "Edit with &multiple Vims"
msgstr "複数のVimで編集する (&M)"

100
src/nvim/po/ja.po
View File

@ -5,7 +5,7 @@
# Do ":help credits" in Vim to see a list of people who contributed.
#
# Copyright (C) 2001-2018 MURAOKA Taro <koron.kaoriya@gmail.com>,
# vim-jp (http://vim-jp.org/)
# vim-jp <http://vim-jp.org/>
#
# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
#
@ -15,14 +15,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Vim 8.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-01 10:46+0900\n"
"POT-Creation-Date: 2018-07-18 00:43+0900\n"
"PO-Revision-Date: 2017-05-18 00:45+0900\n"
"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
"Language: Japanese\n"
"Language-Team: Japanese <https://github.com/vim-jp/lang-ja>\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8-bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
msgid "E831: bf_key_init() called with empty password"
@ -205,6 +205,9 @@ msgstr ""
msgid "E382: Cannot write, 'buftype' option is set"
msgstr "E382: 'buftype' オプションが設定されているので書込めません"
msgid "[Prompt]"
msgstr "[プロンプト]"
msgid "[Scratch]"
msgstr "[下書き]"
@ -259,10 +262,10 @@ msgstr "E917: %s() にコールバックは使えません"
msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
msgstr ""
"E912: raw や nl モードのチャンネルに ch_evalexpr()/ch_sendexpr() は使えません"
"E912: raw や nl モードのチャネルに ch_evalexpr()/ch_sendexpr() は使えません"
msgid "E906: not an open channel"
msgstr "E906: 開いていないチャンネルです"
msgstr "E906: 開いていないチャネルです"
msgid "E920: _io file requires _name to be set"
msgstr "E920: _io ファイルは _name の設定が必要です"
@ -522,7 +525,6 @@ msgstr "E710: リスト型変数にターゲットよりも多い要素があり
msgid "E711: List value has not enough items"
msgstr "E711: リスト型変数に十分な数の要素がありません"
#
msgid "E690: Missing \"in\" after :for"
msgstr "E690: :for の後に \"in\" がありません"
@ -591,7 +593,7 @@ msgid "E910: Using a Job as a Number"
msgstr "E910: ジョブを数値として扱っています"
msgid "E913: Using a Channel as a Number"
msgstr "E913: チャンネルを数値として扱っています"
msgstr "E913: チャネルを数値として扱っています"
msgid "E891: Using a Funcref as a Float"
msgstr "E891: 関数参照型を浮動小数点数として扱っています"
@ -612,7 +614,7 @@ msgid "E911: Using a Job as a Float"
msgstr "E911: ジョブを浮動小数点数として扱っています"
msgid "E914: Using a Channel as a Float"
msgstr "E914: チャンネルを浮動小数点数として扱っています"
msgstr "E914: チャネルを浮動小数点数として扱っています"
msgid "E729: using Funcref as a String"
msgstr "E729: 関数参照型を文字列として扱っています"
@ -1425,6 +1427,9 @@ msgstr "E784: 最後のタブページを閉じることはできません"
msgid "Already only one tab page"
msgstr "既にタブページは1つしかありません"
msgid "Edit File in new tab page"
msgstr "新しいタブページでファイルを編集します"
msgid "Edit File in new window"
msgstr "新しいウィンドウでファイルを編集します"
@ -2285,10 +2290,10 @@ msgstr "アンドゥ(&U)"
msgid "Open tab..."
msgstr "タブページを開く"
msgid "Find string (use '\\\\' to find a '\\')"
msgid "Find string (use '\\\\' to find a '\\')"
msgstr "検索文字列 ('\\' を検索するには '\\\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgid "Find & Replace (use '\\\\' to find a '\\')"
msgstr "検索・置換 ('\\' を検索するには '\\\\')"
msgid "Not Used"
@ -2706,6 +2711,19 @@ msgstr "範囲外の行番号です"
msgid "not allowed in the Vim sandbox"
msgstr "サンドボックスでは許されません"
#, c-format
msgid "E370: Could not load library %s"
msgstr "E370: ライブラリ %s をロードできませんでした"
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
"ています"
msgid "E836: This Vim cannot execute :python after using :py3"
msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
@ -4704,7 +4722,6 @@ msgstr "E777: 文字列かリストが必要です"
msgid "E369: invalid item in %s%%[]"
msgstr "E369: 無効な項目です: %s%%[]"
#
#, c-format
msgid "E769: Missing ] after %s["
msgstr "E769: %s[ の後に ] がありません"
@ -4727,15 +4744,12 @@ msgstr "E54: %s( が釣り合っていません"
msgid "E55: Unmatched %s)"
msgstr "E55: %s) が釣り合っていません"
#
msgid "E66: \\z( not allowed here"
msgstr "E66: \\z( はココでは許可されていません"
#
msgid "E67: \\z1 - \\z9 not allowed here"
msgstr "E67: \\z1 その他はココでは許可されていません"
msgstr "E67: \\z1 - \\z9 はココでは許可されていません"
#
#, c-format
msgid "E69: Missing ] after %s%%["
msgstr "E69: %s%%[ の後に ] がありません"
@ -4744,7 +4758,9 @@ msgstr "E69: %s%%[ の後に ] がありません"
msgid "E70: Empty %s%%[]"
msgstr "E70: %s%%[] が空です"
#
msgid "E956: Cannot use pattern recursively"
msgstr "E956: パターンを再帰的に使うことはできません"
msgid "E65: Illegal back reference"
msgstr "E65: 不正な後方参照です"
@ -4777,7 +4793,6 @@ msgstr "E61:%s* が入れ子になっています"
msgid "E62: Nested %s%c"
msgstr "E62:%s%c が入れ子になっています"
#
msgid "E63: invalid use of \\_"
msgstr "E63: \\_ の無効な使用方法です"
@ -4785,16 +4800,13 @@ msgstr "E63: \\_ の無効な使用方法です"
msgid "E64: %s%c follows nothing"
msgstr "E64:%s%c の後になにもありません"
#
msgid "E68: Invalid character after \\z"
msgstr "E68: \\z の後に不正な文字がありました"
#
#, c-format
msgid "E678: Invalid character after %s%%[dxouU]"
msgstr "E678: %s%%[dxouU] の後に不正な文字がありました"
#
#, c-format
msgid "E71: Invalid character after %s%%"
msgstr "E71: %s%% の後に不正な文字がありました"
@ -4827,7 +4839,6 @@ msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました
msgid "E866: (NFA regexp) Misplaced %c"
msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
#
#, c-format
msgid "E877: (NFA regexp) Invalid character class: %ld"
msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld"
@ -4865,6 +4876,11 @@ msgstr "E879: (NFA 正規表現) \\z( が多過ぎます"
msgid "E873: (NFA regexp) proper termination error"
msgstr "E873: (NFA 正規表現) 終端記号がありません"
msgid "Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準エラー"
"出力に出力します。"
msgid "E874: (NFA) Could not pop the stack!"
msgstr "E874: (NFA) スタックをポップできません!"
@ -4881,19 +4897,6 @@ msgstr "E876: (NFA 正規表現) NFA全体を保存するには空きスペー
msgid "E878: (NFA) Could not allocate memory for branch traversal!"
msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
msgid ""
"Could not open temporary log file for writing, displaying on stderr... "
msgstr ""
"NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
"出力します。"
#, c-format
msgid "(NFA) COULD NOT OPEN %s !"
msgstr "(NFA) ログファイル %s を開けません!"
msgid "Could not open temporary log file for writing "
msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。"
msgid " VREPLACE"
msgstr " 仮想置換"
@ -4984,7 +4987,7 @@ msgstr "インクルードされたファイルをスキャン中: %s"
#, c-format
msgid "Searching included file %s"
msgstr "インクルードされたファイルをスキャン中 %s"
msgstr "インクルードされたファイルを検索中 %s"
msgid "E387: Match is on current line"
msgstr "E387: 現在行に該当があります"
@ -5252,7 +5255,7 @@ msgstr "値 %s は他の .aff ファイルで使用されたのと異なりま
#, c-format
msgid "Reading dictionary file %s..."
msgstr "辞書ファイル %s をスキャン中..."
msgstr "辞書ファイル %s を読込み中..."
#, c-format
msgid "E760: No word count in %s"
@ -5280,7 +5283,7 @@ msgstr "非ASCII文字を含む %d 個の単語を無視しました (%s 内)"
#, c-format
msgid "Reading word file %s..."
msgstr "標準入力から読込み中 %s..."
msgstr "単語ファイル %s を読込み中..."
#, c-format
msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@ -6031,6 +6034,10 @@ msgstr "E133: 関数外に :return がありました"
msgid "E107: Missing parentheses: %s"
msgstr "E107: カッコ '(' がありません: %s"
#, c-format
msgid "%s (%s, compiled %s)"
msgstr "%s (%s, compiled %s)"
msgid ""
"\n"
"MS-Windows 64-bit GUI version"
@ -6354,19 +6361,6 @@ msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
msgid "E803: ID not found: %ld"
msgstr "E803: ID はありません: %ld"
#, c-format
msgid "E370: Could not load library %s"
msgstr "E370: ライブラリ %s をロードできませんでした"
msgid "Sorry, this command is disabled: the Perl library could not be loaded."
msgstr ""
"このコマンドは無効です、ごめんなさい: Perlライブラリをロードできませんでした."
msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
msgstr ""
"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
"ています"
msgid "Edit with &multiple Vims"
msgstr "複数のVimで編集する (&M)"