Mercurial > vim
changeset 14421:2f7e67dd088c
Update runtime files.
commit https://github.com/vim/vim/commit/91f84f6e11cd879d43d651c0903d85bff95f0716
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 29 15:07:52 2018 +0200
Update runtime files.
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/runtime/autoload/RstFold.vim @@ -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
--- a/runtime/autoload/xmlformat.vim +++ b/runtime/autoload/xmlformat.vim @@ -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
--- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -319,4 +319,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:
--- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1593,4 +1593,4 @@ This will write the file without trigger gzip plugin. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1884,4 +1884,4 @@ The sorting can be interrupted, but if y 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:
--- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -816,4 +816,4 @@ the cursor to the last line. "A" will m start of the line. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1164,4 +1164,4 @@ The character used for the pattern indic @ 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:
--- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -172,4 +172,4 @@ Visual C++ 2005 Express Edition can be d 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:
--- a/runtime/doc/debugger.txt +++ b/runtime/doc/debugger.txt @@ -139,4 +139,4 @@ Programming Environment. For Sun NetBeans support see |netbeans|. - vim:tw=78:sw=4:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
--- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -563,4 +563,4 @@ long 32 or 64 bit signed, can hold a Note that some compilers cannot handle long lines or strings. The C89 standard specifies a limit of 509 characters. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -441,4 +441,4 @@ evaluating 'patchexpr'. This hopefully 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:
--- a/runtime/doc/digraph.txt +++ b/runtime/doc/digraph.txt @@ -1488,4 +1488,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:
--- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1747,4 +1747,4 @@ 3) Combined up/downward search: 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:
--- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -9265,6 +9265,7 @@ amiga Amiga version of Vim. arabic Compiled with Arabic support |Arabic|. arp Compiled with ARP support (Amiga). autocmd Compiled with autocommand support. |autocommand| +autochdir Compiled with support for 'autochdir' autoservername Automatically enable |clientserver| balloon_eval Compiled with |balloon-eval| support. balloon_multiline GUI supports multiline balloons. @@ -11647,4 +11648,4 @@ without the |+eval| feature. Find more information in the file src/testdir/README.txt. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/farsi.txt +++ b/runtime/doc/farsi.txt @@ -266,4 +266,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:
--- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -695,4 +695,4 @@ The mappings can be disabled with: > < - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -601,4 +601,4 @@ used. Otherwise the values from the win are used. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -777,4 +777,4 @@ Setting the filetype back to Perl sets a as they were. -vim:tw=78:ts=8:ft=help:norl: +vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1075,4 +1075,4 @@ careful! For the Win32 GUI the external commands are executed in a separate window. See |gui-shell-win32|. - vim:tw=78:sw=4:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
--- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -451,4 +451,4 @@ To try out if XPM support works do this: :exe 'sign place 1 line=1 name=vimxpm file=' . expand('%:p') < - vim:tw=78:sw=4:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
--- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -721,4 +721,4 @@ and use CLIPBOARD ("+) for cut/copy/past both by choosing to use either of the "* or "+ registers. - vim:tw=78:sw=4:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
--- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -109,4 +109,4 @@ Send comments, patches and suggestions t SungHyun Nam <goweol@gmail.com> Chi-Deok Hwang <...> - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -139,4 +139,4 @@ The result is that all Hebrew characters problem, set isprint=@,128-255. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -225,4 +225,4 @@ will try to find help for it. Especiall 'compatible'. ------------------------------------------------------------------------------ - vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl: + vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl:
--- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -370,4 +370,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:
--- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -93,4 +93,4 @@ How to ... *howdoi* *how-do-i* *howto |2html.vim| convert a colored file to HTML |less| use Vim like less or more with syntax highlighting - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -484,4 +484,4 @@ For a cscope version for Win32 see (seem Win32 support was added by Sergey Khorev <sergey.khorev@gmail.com>. Contact him if you have Win32-specific issues. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_mzsch.txt +++ b/runtime/doc/if_mzsch.txt @@ -312,4 +312,4 @@ MzScheme's raco command: raco pkg install cext-lib # raco ctool command < ====================================================================== - vim:tw=78:ts=8:sts=4:ft=help:norl: + vim:tw=78:ts=8:noet:sts=4:ft=help:norl:
--- a/runtime/doc/if_ole.txt +++ b/runtime/doc/if_ole.txt @@ -202,4 +202,4 @@ In Vim > [.Net remarks provided by Dave Fishburn and Brian Sturk] ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -303,4 +303,4 @@ version of the shared library must match with. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -924,4 +924,4 @@ If you have more than one version of Pyt one you prefer, before running configure. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -234,4 +234,4 @@ version of the shared library must match with. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_sniff.txt +++ b/runtime/doc/if_sniff.txt @@ -8,4 +8,4 @@ The SNiFF+ support was removed at patch 7.4.1433. If you want to check it out sync to before that. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -544,4 +544,4 @@ of DYNAMIC_TCL_DLL file what was specifi the shared library must match the Tcl version Vim was compiled with. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1156,4 +1156,4 @@ indent for a continuation line, a line t Three times shiftwidth is the default value. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1657,4 +1657,4 @@ tag command action ~ |:~| :~ repeat last ":substitute" - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -2005,4 +2005,4 @@ self explanatory. Using the long or 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:
--- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -906,4 +906,4 @@ 4. ddd 4. ddd 4. cc 12. === status li 6. ~ ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1552,4 +1552,4 @@ local to the script and use mappings loc 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:
--- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1467,4 +1467,4 @@ Contributions specifically for the multi 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:
--- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -866,4 +866,4 @@ The |g<| command can be used to see the 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:
--- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -210,4 +210,4 @@ a message adapt to language preferences :endif < - vim:tw=78:sw=4:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
--- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1341,4 +1341,4 @@ L To line [count] from bottom of windo position is in a status line, that window is made the active window and the cursor is not moved. {not in Vi} - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1007,4 +1007,4 @@ Expert tab MIME Type property. NetBeans Editor will only open MIME types specified in this property. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -9204,4 +9204,4 @@ A jump table for the options with a shor screen. When non-zero, characters are sent to the terminal one by one. For MS-DOS pcterm this does not work. For debugging purposes. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -131,4 +131,4 @@ Also look at: ------------------------------------------------------------------------------ - vim:tw=78:fo=tcq2:ts=8:ft=help:norl: + vim:tw=78:fo=tcq2:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -144,4 +144,4 @@ 5) There is also a file named 'color-seq ;End VIM - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -317,4 +317,4 @@ it is about 1191K. <rhialto@polder.ubc.kun.nl> http://polder.ubc.kun.nl/~rhialto/be - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -295,4 +295,4 @@ When starting up, Vim checks for the pre option. If it is present, Vim sets the 'shellcmdflag' and 'shellquote' or 'shellxquote' options will be set as described above. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -179,4 +179,4 @@ the system clipboard, the darwin feature from hanging at runtime. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_mint.txt +++ b/runtime/doc/os_mint.txt @@ -36,4 +36,4 @@ Send bug reports to Jens M. Felderhoff, e-mail: <jmf@infko.uni-koblenz.de> - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -12,4 +12,4 @@ work, there is not enough memory. The D work on older systems. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -10,4 +10,4 @@ This file used to contain the particular The OS/2 support was removed in patch 7.4.1008. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_qnx.txt +++ b/runtime/doc/os_qnx.txt @@ -135,4 +135,4 @@ Todo: - Replace usage of fork() with spawn() when launching external programs. - vim:tw=78:sw=4:ts=8:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ts=8:ft=help:norl:
--- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -9,4 +9,4 @@ The RISC OS support has been removed fro If you would like to use Vim on RISC OS get the files from before that patch. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -57,4 +57,4 @@ For real color terminals the ":highlight The file "tools/vim132" is a shell script that can be used to put Vim in 132 column mode on a vt100 and lookalikes. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_vms.txt +++ b/runtime/doc/os_vms.txt @@ -952,4 +952,4 @@ of OS_VMS.TXT: Bruce Hunsaker <BNHunsaker@chq.byu.edu> Sandor Kopanyi <sandor.kopanyi@mailbox.hu> - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -303,4 +303,4 @@ A. Yes, place your favorite icon in bitm 'runtimepath'. For example ~/vimfiles/bitmaps/vim.ico. - vim:tw=78:fo=tcq2:ts=8:ft=help:norl: + vim:tw=78:fo=tcq2:ts=8:noet:ft=help:norl:
--- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1417,4 +1417,4 @@ 10. Highlighting matches *match-highl ":2match" for another plugin. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/pi_getscript.txt +++ b/runtime/doc/pi_getscript.txt @@ -479,4 +479,4 @@ v2 May 14, 2003 : extracts name of it and they became numbers. Fixes comparison. ============================================================================== -vim:tw=78:ts=8:ft=help:fdm=marker +vim:tw=78:ts=8:noet:ft=help:fdm=marker
--- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -40,4 +40,4 @@ compression. Thus editing the patchmode 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:
--- a/runtime/doc/pi_logipat.txt +++ b/runtime/doc/pi_logipat.txt @@ -118,4 +118,4 @@ 3. LogiPat History *logiPat-history* ============================================================================== -vim:tw=78:ts=8:ft=help +vim:tw=78:ts=8:noet:ft=help
--- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -4267,4 +4267,4 @@ 14. Credits *netrw-credits* {{{1 ============================================================================== Modelines: {{{1 - vim:tw=78:ts=8:ft=help:norl:fdm=marker + vim:tw=78:ts=8:noet:ft=help:norl:fdm=marker
--- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -57,4 +57,4 @@ comments. This is unrelated to the matc different mechanism. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -108,4 +108,4 @@ If you don't like the release updating f Good luck!! -vim:tw=78:ts=8:ft=help:norl: +vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -148,4 +148,4 @@ 4. History *tar-history* 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
--- a/runtime/doc/pi_vimball.txt +++ b/runtime/doc/pi_vimball.txt @@ -273,4 +273,4 @@ 4. Vimball History *vimball-history* ============================================================================== -vim:tw=78:ts=8:ft=help:fdm=marker +vim:tw=78:ts=8:noet:ft=help:fdm=marker
--- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -149,4 +149,4 @@ 4. History *zip-history* {{{1 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
--- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -752,4 +752,4 @@ to adjust the number of lines before a f accidental blank pages. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1794,4 +1794,4 @@ start of the file about how to use it. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1447,4 +1447,4 @@ Context-sensitive completion on the comm |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:
--- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -272,4 +272,4 @@ In summary: |____/ |_| \___/|_| |_| (_|_) (Tony Nugent, Australia) ` - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -234,4 +234,4 @@ Note that after recovery the key of the file. Thus if you write the text file, you need to use that new key. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -204,4 +204,4 @@ When using gvim, the --remote-wait only 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:
--- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1010,4 +1010,4 @@ mind there are various things that may c - 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:
--- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -121,4 +121,4 @@ o When both 'rightleft' and 'revins' ar 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:
--- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -71,4 +71,4 @@ 4. Known issues *russian-iss releases of gettext. =============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/scroll.txt +++ b/runtime/doc/scroll.txt @@ -332,4 +332,4 @@ Add these mappings to your vimrc file: > :map <M-Esc>[65~ <S-ScrollWheelDown> :map! <M-Esc>[65~ <S-ScrollWheelDown> < - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -202,4 +202,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:
--- a/runtime/doc/spell.txt +++ b/runtime/doc/spell.txt @@ -1646,4 +1646,4 @@ WORDCHARS (Hunspell) *spell-WORDCHARS is no need to separate words before checking them (using a trie instead of a hashtable). - vim:tw=78:sw=4:ts=8:ft=help:norl: + vim:tw=78:sw=4:ts=8:noet:ft=help:norl:
--- a/runtime/doc/sponsor.txt +++ b/runtime/doc/sponsor.txt @@ -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:
--- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1687,4 +1687,4 @@ most of the information will be restored Use ! to abandon a modified buffer. |abandon| {not when compiled with tiny or small features} - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -2876,17 +2876,17 @@ This covers syntax highlighting for the 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>: @@ -5478,4 +5478,4 @@ literal text specify the size of that te "<\@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:
--- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -472,4 +472,4 @@ If you want to show something specific f tab page local variable. |t:var| - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4621,6 +4621,7 @@ E953 eval.txt /*E953* E954 options.txt /*E954* E955 eval.txt /*E955* E956 pattern.txt /*E956* +E957 eval.txt /*E957* E96 diff.txt /*E96* E97 diff.txt /*E97* E98 diff.txt /*E98*
--- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -854,4 +854,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:
--- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -977,4 +977,4 @@ To swap the meaning of the left and righ :noremap! <RightDrag> <LeftDrag> :noremap! <RightRelease> <LeftRelease> < - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -909,4 +909,4 @@ for when the terminal can't be resized b - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -530,4 +530,4 @@ A slightly more advanced version is used autocmd InsertEnter * match none < - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -50,14 +50,15 @@ Terminal debugger: initializing mzscheme avoid the problem, thus it's not some #ifdef. Terminal emulator window: +- When the job in the terminal doesn't use mouse events, let the scroll wheel + scroll the scrollback, like a terminal does at the shell prompt. #2490 + And use modeless selection. #2962 - With a vertical split only one window is updated. (Linwei, 2018 Jun 2, #2977) - When pasting should call vterm_keyboard_start_paste(), e.g. when using K_MIDDLEMOUSE, calling insert_reg(). - Users expect parsing the :term argument like a shell does, also support single quotes. E.g. with: :term grep 'alice says "hello"' (#1999) -- How to access selection in Terminal running a shell? (damnskippy, 2018 May - 27, #29620 When terminal doesn't use the mouse, use modeless selection. - Win32: Redirecting input does not work, half of Test_terminal_redir_file() is disabled. - Win32: Redirecting output works but includes escape sequences. @@ -78,6 +79,7 @@ Does not build with MinGW out of the box - WINVER conflict, should use 0x0600 by default? Patches for Python: #3162, #3263 (Ozaki Kiichi) + Needs update. Crash when mixing matchadd and substitute()? (Max Christian Pohle, 2018 May 13, #2910) Can't reproduce? @@ -88,41 +90,65 @@ On Win32 when not in the console and t_C Errors found with random data: heap-buffer-overflow in alist_add (#2472) -Patch to fix that +packages is always in output of :version. -(thinca, #3198) reported by Takuya Fujiwara +Improve fallback for menu translations, to avoid having to create lots of +files that source the actual file. E.g. menu_da_de -> menu_da +Include part of #3242? + +Inlcude Chinese-Taiwan translations. (bystar, #3261) + +Using mouse for inputlist() doesn't work after patch 8.0.1756. (Dominique +Pelle, 2018 Jul 22, #3239) Also see 8.0.0722. Check both console and GUI. More warnings from static analysis: https://lgtm.com/projects/g/vim/vim/alerts/?mode=list -Patch for Perl 5.28 on Windows. (#3196) +When handle_drop() is called while the updating_screen is true, it fails +completely. Should store the file list and use it when updating_screen is set +to false in reset_updating_screen(). Pasting foo} causes Vim to behave weird. (John Little, 2018 Jun 17) Related to bracketed paste. I cannot reproduce it. -Patch replacing imp with importlib. (#3163) - -Patch to make CTRL-S in mswin.vim work better. (#3211) -But use "gi" instead of "a". - Using ":file" in quickfix window during an autocommand doesn't work. (Jason Franklin, 2018 May 23) Allow for using it when there is no argument. Patch in pull request #2967: Allow white space in sign text. (Ben Jackson) +Test fails in AppVeyor. Removing flags from 'cpoptions' breaks the Winbar buttons in termdebug. (Dominique Pelle, 2018 Jul 16) -Whenever the file name is "~" then expand('%:p') returns $HOME. (Aidan -Shafran, 2018 Jun 23, #3072) Proposed patch by Aidan, 2018 Jun 24. - -Patch to set w_set_curswant when setting the cursor in language interfaces. -(David Hotham, 2018 Jun 22, #3060) - Problem with two buffers with the same name a/b, if it didn't exist before and is created outside of Vim. (dskloetg, 2018 Jul 16, #3219) -Patch to make CTRL-W <CR> work properly in a quickfix window. (Jason Franklin, -2018 May 30) +Memory leak in test_assert: +==19127== by 0x2640D7: alloc (misc2.c:874) +==19127== by 0x2646D6: vim_strsave (misc2.c:1315) +==19127== by 0x1B68D2: f_getcwd (evalfunc.c:4950) +And: +==19127== by 0x2640D7: alloc (misc2.c:874) +==19127== by 0x1A9477: set_var (eval.c:7601) +==19127== by 0x19F96F: set_var_lval (eval.c:2233) +==19127== by 0x19EA3A: ex_let_one (eval.c:1810) +==19127== by 0x19D737: ex_let_vars (eval.c:1294) +==19127== by 0x19D6B4: ex_let (eval.c:1259) +Memory leaks in test_channel? (or is it because of fork()) +Using uninitialized value in test_crypt. +Memory leaks in test_escaped_glob +==20651== by 0x2640D7: alloc (misc2.c:874) +==20651== by 0x2646D6: vim_strsave (misc2.c:1315) +==20651== by 0x3741EA: get_function_args (userfunc.c:131) +==20651== by 0x378779: ex_function (userfunc.c:2036) +Memory leak in test_terminal: +==23530== by 0x2640D7: alloc (misc2.c:874) +==23530== by 0x2646D6: vim_strsave (misc2.c:1315) +==23530== by 0x25841D: FullName_save (misc1.c:5443) +==23530== by 0x17CB4F: fix_fname (buffer.c:4794) +==23530== by 0x17CB9A: fname_expand (buffer.c:4838) +==23530== by 0x1759AB: buflist_new (buffer.c:1889) +==23530== by 0x35C923: term_start (terminal.c:421) +==23530== by 0x2AFF30: mch_call_shell_terminal (os_unix.c:4377) +==23530== by 0x2B16BE: mch_call_shell (os_unix.c:5383) gethostbyname() is old, use getaddrinfo() if available. (#3227) @@ -152,12 +178,20 @@ Compiler warnings (geeknik, 2017 Oct 26) - signed integer overflow in getdecchrs() (#2254) - undefined left shift in get_string_tv() (#2250) +Win32 console: <F11> and <F12> typed in Insert mode don't result in normal +characters. (#3246) + Patch for more quickfix refactoring. (Yegappan Lakshmanan, #2950) Tests failing for "make testgui" with GTK: - Test_setbufvar_options() - Test_exit_callback_interval() +When using CTRL-W CR in the quickfix window, the jumplist in the opened window +is cleared, to avoid going back to the list of errors buffer (would have two +windows with it). Can we just remove the jump list entries for the quickfix +buffer? + Patch to stack and pop the window title and icon. (IWAMOTO Kouichi, 2018 Jun 22, #3059) 8 For xterm need to open a connection to the X server to get the window @@ -446,10 +480,6 @@ The ":move" command does not honor close Patch to fix increment/decrement not working properly when 'virtualedit' is set. (Hirohito Higashi, 2016 Aug 1, #923) -Memory leaks in test_channel? (or is it because of fork()) -Using uninitialized value in test_crypt. -Memory leaks in test_escaped_glob - Patch to make gM move to middle of line. (Yasuhiro Matsumoto, Sep 8, #2070) Cannot copy modeless selection when cursor is inside it. (lkintact, #2300)
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1462,7 +1462,7 @@ au BufNewFile,BufRead sgml.catalog* cal " 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))
--- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: man " Maintainer: SungHyun Nam <goweol@gmail.com> -" Last Change: 2018 May 2 +" Last Change: 2018 Jul 25 " To make the ":Man" command available before editing a manual page, source " this script from your startup vimrc file. @@ -14,32 +14,47 @@ if &filetype == "man" finish endif let b:did_ftplugin = 1 +endif +let s:cpo_save = &cpo +set cpo-=C + +if &filetype == "man" " allow dot and dash in manual page name. setlocal iskeyword+=\.,- + let b:undo_ftplugin = "setlocal iskeyword<" " Add mappings, unless the user didn't want this. if !exists("no_plugin_maps") && !exists("no_man_maps") if !hasmapto('<Plug>ManBS') nmap <buffer> <LocalLeader>h <Plug>ManBS + let b:undo_ftplugin = b:undo_ftplugin + \ . '|silent! nunmap <buffer> <LocalLeader>h' endif nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>'' nnoremap <buffer> <c-]> :call <SID>PreGetPage(v:count)<CR> nnoremap <buffer> <c-t> :call <SID>PopPage()<CR> nnoremap <buffer> <silent> q :q<CR> + + " Add undo commands for the maps + let b:undo_ftplugin = b:undo_ftplugin + \ . '|silent! nunmap <buffer> <Plug>ManBS' + \ . '|silent! nunmap <buffer> <c-]>' + \ . '|silent! nunmap <buffer> <c-t>' + \ . '|silent! nunmap <buffer> q' endif if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1) setlocal foldmethod=indent foldnestmax=1 foldenable + let b:undo_ftplugin = b:undo_ftplugin + \ . '|silent! setl fdm< fdn< fen<' endif - let b:undo_ftplugin = "setlocal iskeyword<" - endif if exists(":Man") != 2 - com -nargs=+ -complete=shellcmd Man call s:GetPage(<f-args>) + com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>) nmap <Leader>K :call <SID>PreGetPage(0)<CR> nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR> endif @@ -100,7 +115,7 @@ func <SID>FindPage(sect, page) return 1 endfunc -func <SID>GetPage(...) +func <SID>GetPage(cmdmods, ...) if a:0 >= 2 let sect = a:1 let page = a:2 @@ -154,7 +169,11 @@ func <SID>GetPage(...) new endif else - new + if a:cmdmods != '' + exe a:cmdmods . ' new' + else + new + endif endif setl nonu fdc=0 endif @@ -218,4 +237,7 @@ endfunc endif +let &cpo = s:cpo_save +unlet s:cpo_save + " vim: set sw=2 ts=8 noet:
--- a/runtime/ftplugin/rst.vim +++ b/runtime/ftplugin/rst.vim @@ -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 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
--- a/runtime/indent/sh.vim +++ b/runtime/indent/sh.vim @@ -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
--- a/runtime/indent/xml.vim +++ b/runtime/indent/xml.vim @@ -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
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -877,7 +877,7 @@ func s:HandleNewBreakpoint(msg) return endif - let nr = substitute(a:msg, '.*number="\([0-9]\)*\".*', '\1', '') + 0 + let nr = substitute(a:msg, '.*number="\([0-9]*\)".*', '\1', '') + 0 if nr == 0 return endif
--- a/runtime/syntax/java.vim +++ b/runtime/syntax/java.vim @@ -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\> 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 StorageCla 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'
--- a/runtime/syntax/javascript.vim +++ b/runtime/syntax/javascript.vim @@ -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 sta 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 e 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 Except 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"
--- a/runtime/syntax/readline.vim +++ b/runtime/syntax/readline.vim @@ -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 containe \ nextgroup=readlineVariable \ skipwhite -syn keyword readlineVariable contained +syn keyword readlineVariable contained \ nextgroup=readlineBellStyle \ skipwhite \ bell-style @@ -120,12 +120,15 @@ syn keyword readlineVariable containe \ 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 containe \ 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 containe 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
--- a/runtime/syntax/rst.vim +++ b/runtime/syntax/rst.vim @@ -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 cont 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 conta \ ' 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, sta 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 cont \ "\<\%(\%(\%(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 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 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"
--- a/src/po/ja.euc-jp.po +++ b/src/po/ja.euc-jp.po @@ -4,7 +4,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. # @@ -14,14 +14,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" @@ -204,6 +204,9 @@ msgstr "" msgid "E382: Cannot write, 'buftype' option is set" msgstr "E382: 'buftype' ¥ª¥×¥·¥ç¥ó¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë¤Î¤Ç½ñ¹þ¤á¤Þ¤»¤ó" +msgid "[Prompt]" +msgstr "[¥×¥í¥ó¥×¥È]" + msgid "[Scratch]" msgstr "[²¼½ñ¤]" @@ -258,10 +261,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 ¤ÎÀßÄ꤬ɬÍפǤ¹" @@ -521,7 +524,6 @@ msgstr "E710: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë¥¿¡¼¥²¥Ã¥È¤è¤ê¤â¿¤¤Í×ÁǤ¬¤¢¤ê¤Þ¤¹" msgid "E711: List value has not enough items" msgstr "E711: ¥ê¥¹¥È·¿ÊÑ¿ô¤Ë½½Ê¬¤Ê¿ô¤ÎÍ×ÁǤ¬¤¢¤ê¤Þ¤»¤ó" -# msgid "E690: Missing \"in\" after :for" msgstr "E690: :for ¤Î¸å¤Ë \"in\" ¤¬¤¢¤ê¤Þ¤»¤ó" @@ -590,7 +592,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: ´Ø¿ô»²¾È·¿¤òÉâÆ°¾®¿ôÅÀ¿ô¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" @@ -611,7 +613,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: ´Ø¿ô»²¾È·¿¤òʸ»úÎó¤È¤·¤Æ°·¤Ã¤Æ¤¤¤Þ¤¹" @@ -1424,6 +1426,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 "¿·¤·¤¤¥¦¥£¥ó¥É¥¦¤Ç¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹" @@ -2284,10 +2289,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" @@ -2705,6 +2710,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 ¤ò»È¤¨¤Þ¤»¤ó" @@ -4703,7 +4721,6 @@ msgstr "E777: ʸ»úÎ󤫥ꥹ¥È¤¬É¬ÍפǤ¹" msgid "E369: invalid item in %s%%[]" msgstr "E369: ̵¸ú¤Ê¹àÌܤǤ¹: %s%%[]" -# #, c-format msgid "E769: Missing ] after %s[" msgstr "E769: %s[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó" @@ -4726,15 +4743,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%%[ ¤Î¸å¤Ë ] ¤¬¤¢¤ê¤Þ¤»¤ó" @@ -4743,7 +4757,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: ÉÔÀµ¤Ê¸åÊý»²¾È¤Ç¤¹" @@ -4776,7 +4792,6 @@ msgstr "E61:%s* ¤¬Æþ¤ì»Ò¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" msgid "E62: Nested %s%c" msgstr "E62:%s%c ¤¬Æþ¤ì»Ò¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -# msgid "E63: invalid use of \\_" msgstr "E63: \\_ ¤Î̵¸ú¤Ê»ÈÍÑÊýË¡¤Ç¤¹" @@ -4784,16 +4799,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%% ¤Î¸å¤ËÉÔÀµ¤Êʸ»ú¤¬¤¢¤ê¤Þ¤·¤¿" @@ -4826,7 +4838,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" @@ -4864,6 +4875,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) ¥¹¥¿¥Ã¥¯¤ò¥Ý¥Ã¥×¤Ç¤¤Þ¤»¤ó!" @@ -4880,19 +4896,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 " ²¾ÁÛÃÖ´¹" @@ -4983,7 +4986,7 @@ msgstr "¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¥¹¥¥ã¥óÃæ: %s" #, c-format msgid "Searching included file %s" -msgstr "¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¥¹¥¥ã¥óÃæ %s" +msgstr "¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤ò¸¡º÷Ãæ %s" msgid "E387: Match is on current line" msgstr "E387: ¸½ºß¹Ô¤Ë³ºÅö¤¬¤¢¤ê¤Þ¤¹" @@ -5251,7 +5254,7 @@ msgstr "ÃÍ %s ¤Ï¾¤Î .aff ¥Õ¥¡¥¤¥ë¤Ç»ÈÍѤµ¤ì¤¿¤Î¤È°Û¤Ê¤ê¤Þ¤¹" #, c-format msgid "Reading dictionary file %s..." -msgstr "¼½ñ¥Õ¥¡¥¤¥ë %s ¤ò¥¹¥¥ã¥óÃæ..." +msgstr "¼½ñ¥Õ¥¡¥¤¥ë %s ¤òÆɹþ¤ßÃæ..." #, c-format msgid "E760: No word count in %s" @@ -5279,7 +5282,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" @@ -6030,6 +6033,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" @@ -6353,19 +6360,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)"
--- a/src/po/ja.po +++ b/src/po/ja.po @@ -4,7 +4,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. # @@ -14,14 +14,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" @@ -204,6 +204,9 @@ msgstr "" msgid "E382: Cannot write, 'buftype' option is set" msgstr "E382: 'buftype' オプションãŒè¨å®šã•ã‚Œã¦ã„ã‚‹ã®ã§æ›¸è¾¼ã‚ã¾ã›ã‚“" +msgid "[Prompt]" +msgstr "[プãƒãƒ³ãƒ—ト]" + msgid "[Scratch]" msgstr "[下書ã]" @@ -258,10 +261,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 ã®è¨å®šãŒå¿…è¦ã§ã™" @@ -521,7 +524,6 @@ msgstr "E710: リスト型変数ã«ã‚¿ãƒ¼ã‚²ãƒƒãƒˆã‚ˆã‚Šã‚‚多ã„è¦ç´ ãŒã‚ã‚Šã¾ã™" msgid "E711: List value has not enough items" msgstr "E711: リスト型変数ã«å分ãªæ•°ã®è¦ç´ ãŒã‚ã‚Šã¾ã›ã‚“" -# msgid "E690: Missing \"in\" after :for" msgstr "E690: :for ã®å¾Œã« \"in\" ãŒã‚ã‚Šã¾ã›ã‚“" @@ -590,7 +592,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: 関数å‚照型を浮動å°æ•°ç‚¹æ•°ã¨ã—ã¦æ‰±ã£ã¦ã„ã¾ã™" @@ -611,7 +613,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: 関数å‚照型を文å—列ã¨ã—ã¦æ‰±ã£ã¦ã„ã¾ã™" @@ -1424,6 +1426,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 "æ–°ã—ã„ウィンドウã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’編集ã—ã¾ã™" @@ -2284,10 +2289,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" @@ -2705,6 +2710,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 を使ãˆã¾ã›ã‚“" @@ -4703,7 +4721,6 @@ msgstr "E777: æ–‡å—列ã‹ãƒªã‚¹ãƒˆãŒå¿…è¦ã§ã™" msgid "E369: invalid item in %s%%[]" msgstr "E369: 無効ãªé …ç›®ã§ã™: %s%%[]" -# #, c-format msgid "E769: Missing ] after %s[" msgstr "E769: %s[ ã®å¾Œã« ] ãŒã‚ã‚Šã¾ã›ã‚“" @@ -4726,15 +4743,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%%[ ã®å¾Œã« ] ãŒã‚ã‚Šã¾ã›ã‚“" @@ -4743,7 +4757,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: ä¸æ£ãªå¾Œæ–¹å‚ç…§ã§ã™" @@ -4776,7 +4792,6 @@ msgstr "E61:%s* ãŒå…¥ã‚Œåã«ãªã£ã¦ã„ã¾ã™" msgid "E62: Nested %s%c" msgstr "E62:%s%c ãŒå…¥ã‚Œåã«ãªã£ã¦ã„ã¾ã™" -# msgid "E63: invalid use of \\_" msgstr "E63: \\_ ã®ç„¡åŠ¹ãªä½¿ç”¨æ–¹æ³•ã§ã™" @@ -4784,16 +4799,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%% ã®å¾Œã«ä¸æ£ãªæ–‡å—ãŒã‚ã‚Šã¾ã—ãŸ" @@ -4826,7 +4838,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" @@ -4864,6 +4875,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) スタックをãƒãƒƒãƒ—ã§ãã¾ã›ã‚“!" @@ -4880,19 +4896,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 " 仮想置æ›" @@ -4983,7 +4986,7 @@ msgstr "インクルードã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’スã‚ャンä¸: %s" #, c-format msgid "Searching included file %s" -msgstr "インクルードã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’スã‚ãƒ£ãƒ³ä¸ %s" +msgstr "インクルードã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¤œç´¢ä¸ %s" msgid "E387: Match is on current line" msgstr "E387: ç¾åœ¨è¡Œã«è©²å½“ãŒã‚ã‚Šã¾ã™" @@ -5251,7 +5254,7 @@ msgstr "値 %s ã¯ä»–ã® .aff ファイルã§ä½¿ç”¨ã•ã‚ŒãŸã®ã¨ç•°ãªã‚Šã¾ã™" #, c-format msgid "Reading dictionary file %s..." -msgstr "辞書ファイル %s をスã‚ャンä¸..." +msgstr "辞書ファイル %s ã‚’èªè¾¼ã¿ä¸..." #, c-format msgid "E760: No word count in %s" @@ -5279,7 +5282,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" @@ -6030,6 +6033,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" @@ -6353,19 +6360,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)"
--- a/src/po/ja.sjis.po +++ b/src/po/ja.sjis.po @@ -4,7 +4,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. # @@ -14,14 +14,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=cp932\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" @@ -204,6 +204,9 @@ msgstr "" msgid "E382: Cannot write, 'buftype' option is set" msgstr "E382: 'buftype' ƒIƒvƒVƒ‡ƒ“‚ªÝ’肳‚ê‚Ä‚¢‚é‚Ì‚Å‘ž‚ß‚Ü‚¹‚ñ" +msgid "[Prompt]" +msgstr "[ƒvƒƒ“ƒvƒg]" + msgid "[Scratch]" msgstr "[‰º‘‚«]" @@ -258,10 +261,10 @@ msgstr "E917: %s() ‚ɃR[ƒ‹ƒoƒbƒN‚ÍŽg‚¦‚Ü‚¹‚ñ" msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel" msgstr "" -"E912: raw ‚â nl ƒ‚[ƒh‚̃`ƒƒƒ“ƒlƒ‹‚É ch_evalexpr()/ch_sendexpr() ‚ÍŽg‚¦‚Ü‚¹‚ñ" +"E912: raw ‚â nl ƒ‚[ƒh‚̃`ƒƒƒlƒ‹‚É ch_evalexpr()/ch_sendexpr() ‚ÍŽg‚¦‚Ü‚¹‚ñ" msgid "E906: not an open channel" -msgstr "E906: ŠJ‚¢‚Ä‚¢‚È‚¢ƒ`ƒƒƒ“ƒlƒ‹‚Å‚·" +msgstr "E906: ŠJ‚¢‚Ä‚¢‚È‚¢ƒ`ƒƒƒlƒ‹‚Å‚·" msgid "E920: _io file requires _name to be set" msgstr "E920: _io ƒtƒ@ƒCƒ‹‚Í _name ‚Ìݒ肪•K—v‚Å‚·" @@ -521,7 +524,6 @@ msgstr "E710: ƒŠƒXƒgŒ^•Ï”‚Ƀ^[ƒQƒbƒg‚æ‚è‚à‘½‚¢—v‘f‚ª‚ ‚è‚Ü‚·" msgid "E711: List value has not enough items" msgstr "E711: ƒŠƒXƒgŒ^•Ï”‚É\\•ª‚È”‚Ì—v‘f‚ª‚ ‚è‚Ü‚¹‚ñ" -# msgid "E690: Missing \"in\" after :for" msgstr "E690: :for ‚ÌŒã‚É \"in\" ‚ª‚ ‚è‚Ü‚¹‚ñ" @@ -590,7 +592,7 @@ msgid "E910: Using a Job as a Number" msgstr "E910: ƒWƒ‡ƒu‚ð”’l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" msgid "E913: Using a Channel as a Number" -msgstr "E913: ƒ`ƒƒƒ“ƒlƒ‹‚ð”’l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" +msgstr "E913: ƒ`ƒƒƒlƒ‹‚ð”’l‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" msgid "E891: Using a Funcref as a Float" msgstr "E891: ŠÖ”ŽQÆŒ^‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" @@ -611,7 +613,7 @@ msgid "E911: Using a Job as a Float" msgstr "E911: ƒWƒ‡ƒu‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" msgid "E914: Using a Channel as a Float" -msgstr "E914: ƒ`ƒƒƒ“ƒlƒ‹‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" +msgstr "E914: ƒ`ƒƒƒlƒ‹‚ð•‚“®¬”“_”‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" msgid "E729: using Funcref as a String" msgstr "E729: ŠÖ”ŽQÆŒ^‚𕶎š—ñ‚Æ‚µ‚Ĉµ‚Á‚Ä‚¢‚Ü‚·" @@ -1424,6 +1426,9 @@ msgstr "E784: ÅŒã‚̃^ƒuƒy[ƒW‚ð•Â‚¶‚邱‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ" msgid "Already only one tab page" msgstr "Šù‚Ƀ^ƒuƒy[ƒW‚Í1‚‚µ‚©‚ ‚è‚Ü‚¹‚ñ" +msgid "Edit File in new tab page" +msgstr "V‚µ‚¢ƒ^ƒuƒy[ƒW‚Ńtƒ@ƒCƒ‹‚ð•ÒW‚µ‚Ü‚·" + msgid "Edit File in new window" msgstr "V‚µ‚¢ƒEƒBƒ“ƒhƒE‚Ńtƒ@ƒCƒ‹‚ð•ÒW‚µ‚Ü‚·" @@ -2284,10 +2289,10 @@ msgstr "ƒAƒ“ƒhƒD(&U)" msgid "Open tab..." msgstr "ƒ^ƒuƒy[ƒW‚ðŠJ‚" -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 "ŒŸõE’uŠ· ('\\' ‚ðŒŸõ‚·‚é‚É‚Í '\\\\')" msgid "Not Used" @@ -2705,6 +2710,19 @@ msgstr "”͈͊O‚Ìs”Ô†‚Å‚·" msgid "not allowed in the Vim sandbox" msgstr "ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í‹–‚³‚ê‚Ü‚¹‚ñ" +#, c-format +msgid "E370: Could not load library %s" +msgstr "E370: ƒ‰ƒCƒuƒ‰ƒŠ %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½" + +msgid "Sorry, this command is disabled: the Perl library could not be loaded." +msgstr "" +"‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·A‚²‚ß‚ñ‚È‚³‚¢: Perlƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½." + +msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" +msgstr "" +"E299: ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í Safe ƒ‚ƒWƒ…[ƒ‹‚ðŽg—p‚µ‚È‚¢PerlƒXƒNƒŠƒvƒg‚Í‹Ö‚¶‚ç‚ê" +"‚Ä‚¢‚Ü‚·" + msgid "E836: This Vim cannot execute :python after using :py3" msgstr "E836: ‚±‚ÌVim‚Å‚Í :py3 ‚ðŽg‚Á‚½Œã‚É :python ‚ðŽg‚¦‚Ü‚¹‚ñ" @@ -4703,7 +4721,6 @@ msgstr "E777: •¶Žš—ñ‚©ƒŠƒXƒg‚ª•K—v‚Å‚·" msgid "E369: invalid item in %s%%[]" msgstr "E369: –³Œø‚È€–Ú‚Å‚·: %s%%[]" -# #, c-format msgid "E769: Missing ] after %s[" msgstr "E769: %s[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ" @@ -4726,15 +4743,12 @@ msgstr "E54: %s( ‚ª’ނ臂Á‚Ä‚¢‚Ü‚¹‚ñ" msgid "E55: Unmatched %s)" msgstr "E55: %s) ‚ª’ނ臂Á‚Ä‚¢‚Ü‚¹‚ñ" -# msgid "E66: \\z( not allowed here" msgstr "E66: \\z( ‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ" -# msgid "E67: \\z1 - \\z9 not allowed here" -msgstr "E67: \\z1 ‚»‚Ì‘¼‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ" - -# +msgstr "E67: \\z1 - \\z9 ‚̓RƒR‚Å‚Í‹–‰Â‚³‚ê‚Ä‚¢‚Ü‚¹‚ñ" + #, c-format msgid "E69: Missing ] after %s%%[" msgstr "E69: %s%%[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ" @@ -4743,7 +4757,9 @@ msgstr "E69: %s%%[ ‚ÌŒã‚É ] ‚ª‚ ‚è‚Ü‚¹‚ñ" msgid "E70: Empty %s%%[]" msgstr "E70: %s%%[] ‚ª‹ó‚Å‚·" -# +msgid "E956: Cannot use pattern recursively" +msgstr "E956: ƒpƒ^[ƒ“‚ðÄ‹A“I‚ÉŽg‚¤‚±‚Æ‚Í‚Å‚«‚Ü‚¹‚ñ" + msgid "E65: Illegal back reference" msgstr "E65: •s³‚ÈŒã•ûŽQÆ‚Å‚·" @@ -4776,7 +4792,6 @@ msgstr "E61:%s* ‚ª“ü‚êŽq‚É‚È‚Á‚Ä‚¢‚Ü‚·" msgid "E62: Nested %s%c" msgstr "E62:%s%c ‚ª“ü‚êŽq‚É‚È‚Á‚Ä‚¢‚Ü‚·" -# msgid "E63: invalid use of \\_" msgstr "E63: \\_ ‚Ì–³Œø‚ÈŽg—p•û–@‚Å‚·" @@ -4784,16 +4799,13 @@ msgstr "E63: \\_ ‚Ì–³Œø‚ÈŽg—p•û–@‚Å‚·" msgid "E64: %s%c follows nothing" msgstr "E64:%s%c ‚ÌŒã‚É‚È‚É‚à‚ ‚è‚Ü‚¹‚ñ" -# msgid "E68: Invalid character after \\z" msgstr "E68: \\z ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½" -# #, c-format msgid "E678: Invalid character after %s%%[dxouU]" msgstr "E678: %s%%[dxouU] ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½" -# #, c-format msgid "E71: Invalid character after %s%%" msgstr "E71: %s%% ‚ÌŒã‚É•s³‚È•¶Žš‚ª‚ ‚è‚Ü‚µ‚½" @@ -4826,7 +4838,6 @@ msgstr "E865: (NFA) Šú‘Ò‚æ‚è‘‚³‹K•\\Œ»‚ÌI’[‚É“ž’B‚µ‚Ü‚µ‚½" msgid "E866: (NFA regexp) Misplaced %c" msgstr "E866: (NFA ³‹K•\\Œ») ˆÊ’u‚ªŒë‚Á‚Ä‚¢‚Ü‚·: %c" -# #, c-format msgid "E877: (NFA regexp) Invalid character class: %ld" msgstr "E877: (NFA ³‹K•\\Œ») –³Œø‚È•¶ŽšƒNƒ‰ƒX: %ld" @@ -4853,7 +4864,7 @@ msgid "E870: (NFA regexp) Error reading msgstr "E870: (NFA ³‹K•\\Œ») ŒJ‚è•Ô‚µ‚̧ŒÀ‰ñ”‚ð“Çž’†‚ɃGƒ‰[" msgid "E871: (NFA regexp) Can't have a multi follow a multi" -msgstr "E871: (NFA ³‹K•\\Œ») ŒJ‚è•Ô‚µ ‚ÌŒã‚É ŒJ‚è•Ô‚µ ‚Í‚Å‚«‚Ü‚¹‚ñ!" +msgstr "E871: (NFA ³‹K•\\Œ») ŒJ‚è•Ô‚µ ‚ÌŒã‚É ŒJ‚è•Ô‚µ ‚Í‚Å‚«‚Ü‚¹‚ñ" msgid "E872: (NFA regexp) Too many '('" msgstr "E872: (NFA ³‹K•\\Œ») '(' ‚ª‘½‰ß‚¬‚Ü‚·" @@ -4864,6 +4875,11 @@ msgstr "E879: (NFA ³‹K•\\Œ») \\z( ‚ª‘½‰ß‚¬‚Ü‚·" msgid "E873: (NFA regexp) proper termination error" msgstr "E873: (NFA ³‹K•\\Œ») I’[‹L†‚ª‚ ‚è‚Ü‚¹‚ñ" +msgid "Could not open temporary log file for writing, displaying on stderr... " +msgstr "" +"NFA³‹K•\\Œ»ƒGƒ“ƒWƒ“—p‚̃ƒOƒtƒ@ƒCƒ‹‚ð‘ž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñBƒƒO‚Í•W€ƒGƒ‰[" +"o—Í‚Éo—Í‚µ‚Ü‚·B" + msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) ƒXƒ^ƒbƒN‚ðƒ|ƒbƒv‚Å‚«‚Ü‚¹‚ñ!" @@ -4880,19 +4896,6 @@ msgstr "E876: (NFA ³‹K•\\Œ») NFA‘S‘Ì‚ð•Û‘¶‚·‚é‚ɂ͋󂫃Xƒy[ƒX‚ª‘«‚è‚Ü‚¹‚ñ" msgid "E878: (NFA) Could not allocate memory for branch traversal!" msgstr "E878: (NFA) Œ»Ý‰¡’f’†‚̃uƒ‰ƒ“ƒ`‚É\\•ª‚ȃƒ‚ƒŠ‚ðŠ„‚è“–‚Ä‚ç‚ê‚Ü‚¹‚ñ!" -msgid "" -"Could not open temporary log file for writing, displaying on stderr... " -msgstr "" -"NFA³‹K•\\Œ»ƒGƒ“ƒWƒ“—p‚̃ƒOƒtƒ@ƒCƒ‹‚ð‘ž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñBƒƒO‚Í•W€o—Í‚É" -"o—Í‚µ‚Ü‚·B" - -#, c-format -msgid "(NFA) COULD NOT OPEN %s !" -msgstr "(NFA) ƒƒOƒtƒ@ƒCƒ‹ %s ‚ðŠJ‚¯‚Ü‚¹‚ñ!" - -msgid "Could not open temporary log file for writing " -msgstr "NFA³‹K•\\Œ»ƒGƒ“ƒWƒ“—p‚̃ƒOƒtƒ@ƒCƒ‹‚ð‘ž—p‚Æ‚µ‚ÄŠJ‚¯‚Ü‚¹‚ñB" - msgid " VREPLACE" msgstr " ‰¼‘z’uŠ·" @@ -4983,7 +4986,7 @@ msgstr "ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ðƒXƒLƒƒƒ“’†: %s" #, c-format msgid "Searching included file %s" -msgstr "ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ðƒXƒLƒƒƒ“’† %s" +msgstr "ƒCƒ“ƒNƒ‹[ƒh‚³‚ꂽƒtƒ@ƒCƒ‹‚ðŒŸõ’† %s" msgid "E387: Match is on current line" msgstr "E387: Œ»Ýs‚ÉŠY“–‚ª‚ ‚è‚Ü‚·" @@ -5251,7 +5254,7 @@ msgstr "’l %s ‚Í‘¼‚Ì .aff ƒtƒ@ƒCƒ‹‚ÅŽg—p‚³‚ꂽ‚̂ƈقȂè‚Ü‚·" #, c-format msgid "Reading dictionary file %s..." -msgstr "Ž«‘ƒtƒ@ƒCƒ‹ %s ‚ðƒXƒLƒƒƒ“’†..." +msgstr "Ž«‘ƒtƒ@ƒCƒ‹ %s ‚ð“Çž‚Ý’†..." #, c-format msgid "E760: No word count in %s" @@ -5279,7 +5282,7 @@ msgstr "”ñASCII•¶Žš‚ðŠÜ‚Þ %d ŒÂ‚Ì’PŒê‚𖳎‹‚µ‚Ü‚µ‚½ (%s “à)" #, c-format msgid "Reading word file %s..." -msgstr "•W€“ü—Í‚©‚ç“Çž‚Ý’† %s..." +msgstr "’PŒêƒtƒ@ƒCƒ‹ %s ‚ð“Çž‚Ý’†..." #, c-format msgid "Duplicate /encoding= line ignored in %s line %d: %s" @@ -6030,6 +6033,10 @@ msgstr "E133: ŠÖ”ŠO‚É :return ‚ª‚ ‚è‚Ü‚µ‚½" msgid "E107: Missing parentheses: %s" msgstr "E107: ƒJƒbƒR '(' ‚ª‚ ‚è‚Ü‚¹‚ñ: %s" +#, c-format +msgid "%s (%s, compiled %s)" +msgstr "%s (%s, compiled %s)" + msgid "" "\n" "MS-Windows 64-bit GUI version" @@ -6353,19 +6360,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: ƒ‰ƒCƒuƒ‰ƒŠ %s ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½" - -msgid "Sorry, this command is disabled: the Perl library could not be loaded." -msgstr "" -"‚±‚̃Rƒ}ƒ“ƒh‚Í–³Œø‚Å‚·A‚²‚ß‚ñ‚È‚³‚¢: Perlƒ‰ƒCƒuƒ‰ƒŠ‚ðƒ[ƒh‚Å‚«‚Ü‚¹‚ñ‚Å‚µ‚½." - -msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" -msgstr "" -"E299: ƒTƒ“ƒhƒ{ƒbƒNƒX‚Å‚Í Safe ƒ‚ƒWƒ…[ƒ‹‚ðŽg—p‚µ‚È‚¢PerlƒXƒNƒŠƒvƒg‚Í‹Ö‚¶‚ç‚ê" -"‚Ä‚¢‚Ü‚·" - msgid "Edit with &multiple Vims" msgstr "•¡”‚ÌVim‚Å•ÒW‚·‚é (&M)"