diff options
103 files changed, 531 insertions, 326 deletions
diff --git a/runtime/autoload/RstFold.vim b/runtime/autoload/RstFold.vim new file mode 100644 index 000000000..5becb0468 --- /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 diff --git a/runtime/autoload/xmlformat.vim b/runtime/autoload/xmlformat.vim index 83ba49a07..f227b5ee2 100644 --- 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 diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 0572b85f8..2303a2b86 100644 --- 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: diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 051dedbdb..8d1dca2ff 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1593,4 +1593,4 @@ This will write the file without triggering the autocommands defined by the gzip plugin. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index b59f28f47..703d33664 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1884,4 +1884,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: diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index 72887fea0..4cc36258c 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -816,4 +816,4 @@ the cursor to the last line. "A" will move to the end of the line, "I" to the start of the line. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index ae364c323..df18ec6c4 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1164,4 +1164,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: diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 6d2cea5d8..b03bf1517 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -172,4 +172,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: diff --git a/runtime/doc/debugger.txt b/runtime/doc/debugger.txt index 9aa2fb846..3370cf098 100644 --- 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: diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 20a623f36..b1b3cc49e 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -563,4 +563,4 @@ long 32 or 64 bit signed, can hold a pointer 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: diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index e263e6b83..502fb4918 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -441,4 +441,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: diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt index 2a232228e..62f23a2f8 100644 --- 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: diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 4e974579f..04bf4b1fd 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1747,4 +1747,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: diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index fb9093e1c..964eab125 100644 --- 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: diff --git a/runtime/doc/farsi.txt b/runtime/doc/farsi.txt index 1bb9f2072..493714e4d 100644 --- 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: diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 0c33845f5..b08e3d73f 100644 --- 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: diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt index ad3f51466..c3ee97e16 100644 --- a/runtime/doc/fold.txt +++ b/runtime/doc/fold.txt @@ -601,4 +601,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: diff --git a/runtime/doc/ft_sql.txt b/runtime/doc/ft_sql.txt index 9819c066a..f461b7eab 100644 --- a/runtime/doc/ft_sql.txt +++ b/runtime/doc/ft_sql.txt @@ -777,4 +777,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: diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index c30aa33c0..603a4d4ad 100644 --- 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: diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index 7bd12aa61..15dd275a0 100644 --- 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: diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index 8a5e9bfe0..6b7a77307 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -721,4 +721,4 @@ and use CLIPBOARD ("+) for cut/copy/paste operations. You thus have access to 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: diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index 56f188b2d..708cfe9ac 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -109,4 +109,4 @@ Send comments, patches and suggestions to: 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: diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt index 5400b4932..f2c3a3db4 100644 --- a/runtime/doc/hebrew.txt +++ b/runtime/doc/hebrew.txt @@ -139,4 +139,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: diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 4c8eb94ef..239de9d81 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -225,4 +225,4 @@ will try to find help for it. Especially for options in single quotes, e.g. 'compatible'. ------------------------------------------------------------------------------ - vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl: + vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:noet:ft=help:norl: diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index 29941c1ae..f6c6ab744 100644 --- 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: diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt index f6973102c..26d611ef0 100644 --- a/runtime/doc/howto.txt +++ b/runtime/doc/howto.txt @@ -93,4 +93,4 @@ How to ... *howdoi* *how-do-i* *howto* *how-to* |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: diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt index cf2aff2bc..ba0f1d5d1 100644 --- a/runtime/doc/if_cscop.txt +++ b/runtime/doc/if_cscop.txt @@ -484,4 +484,4 @@ For a cscope version for Win32 see (seems abandoned): 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: diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt index f118b17dc..9d27683f7 100644 --- 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: diff --git a/runtime/doc/if_ole.txt b/runtime/doc/if_ole.txt index 4ec9ac5f1..e734df984 100644 --- 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: diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index a06954e17..b82ee832f 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -303,4 +303,4 @@ version of the shared library must match the Perl version Vim was compiled with. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 89baef42f..30a3a726a 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -924,4 +924,4 @@ If you have more than one version of Python 3, you need to link python3 to the one you prefer, before running configure. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt index 572a6ec15..b1404769f 100644 --- a/runtime/doc/if_ruby.txt +++ b/runtime/doc/if_ruby.txt @@ -234,4 +234,4 @@ version of the shared library must match the Ruby version Vim was compiled with. ============================================================================== - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/if_sniff.txt b/runtime/doc/if_sniff.txt index cf6ed1c98..d0e16a8da 100644 --- 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: diff --git a/runtime/doc/if_tcl.txt b/runtime/doc/if_tcl.txt index 979a19b47..e822dfd17 100644 --- a/runtime/doc/if_tcl.txt +++ b/runtime/doc/if_tcl.txt @@ -544,4 +544,4 @@ of DYNAMIC_TCL_DLL file what was specified at compile time. The version of 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: diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index 180d932b3..54fb52618 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -1156,4 +1156,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: diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index f569ec5e8..1a0d22526 100644 --- 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: diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index ca1913673..e145cacf3 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -2005,4 +2005,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: diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 8325bb33b..a000482e5 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -906,4 +906,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: diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 18b61df00..d6dbd5032 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1552,4 +1552,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: diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 99ce10fab..24fed6d7d 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1467,4 +1467,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: diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index b4a72ff64..c23ae65d0 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -866,4 +866,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: diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt index 3d590e0e0..4d85bbd43 100644 --- a/runtime/doc/mlang.txt +++ b/runtime/doc/mlang.txt @@ -210,4 +210,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: diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index 2c0fd5530..b2105206b 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1341,4 +1341,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. {not in Vi} - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt index 25fba4d5a..61e58c245 100644 --- a/runtime/doc/netbeans.txt +++ b/runtime/doc/netbeans.txt @@ -1007,4 +1007,4 @@ Expert tab MIME Type property. NetBeans is MIME oriented and the External 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: diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 469c363bc..8645c4733 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -9204,4 +9204,4 @@ A jump table for the options with a short description can be found at |Q_op|. 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: diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index 5b4b9f7a6..ab88cc671 100644 --- 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: diff --git a/runtime/doc/os_amiga.txt b/runtime/doc/os_amiga.txt index ad083b58a..26aec5fe9 100644 --- a/runtime/doc/os_amiga.txt +++ b/runtime/doc/os_amiga.txt @@ -144,4 +144,4 @@ Installation ~ ;End VIM - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index 148f5fe0e..1356a6b71 100644 --- 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: diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt index b95095302..d24efdf07 100644 --- a/runtime/doc/os_dos.txt +++ b/runtime/doc/os_dos.txt @@ -295,4 +295,4 @@ When starting up, Vim checks for the presence of "sh" anywhere in the 'shell' 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: diff --git a/runtime/doc/os_mac.txt b/runtime/doc/os_mac.txt index 72c0c160b..28ebe6601 100644 --- a/runtime/doc/os_mac.txt +++ b/runtime/doc/os_mac.txt @@ -179,4 +179,4 @@ the system clipboard, the darwin feature should be disabled to prevent Vim from hanging at runtime. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/os_mint.txt b/runtime/doc/os_mint.txt index 96e139d3e..ed33491bb 100644 --- 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: diff --git a/runtime/doc/os_msdos.txt b/runtime/doc/os_msdos.txt index 50fb4e899..d5be05f3a 100644 --- a/runtime/doc/os_msdos.txt +++ b/runtime/doc/os_msdos.txt @@ -12,4 +12,4 @@ work, there is not enough memory. The DOS32 version (using DJGPP) might still work on older systems. - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt index 789175661..2f094cfa2 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -10,4 +10,4 @@ This file used to contain the particularities for the OS/2 version of Vim. 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: diff --git a/runtime/doc/os_qnx.txt b/runtime/doc/os_qnx.txt index 466699fcf..4cbc7ead0 100644 --- 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: diff --git a/runtime/doc/os_risc.txt b/runtime/doc/os_risc.txt index 095d5a985..d951b8e8d 100644 --- a/runtime/doc/os_risc.txt +++ b/runtime/doc/os_risc.txt @@ -9,4 +9,4 @@ The RISC OS support has been removed from Vim with patch 7.3.187. 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: diff --git a/runtime/doc/os_unix.txt b/runtime/doc/os_unix.txt index 4b69af5aa..5067b1e44 100644 --- a/runtime/doc/os_unix.txt +++ b/runtime/doc/os_unix.txt @@ -57,4 +57,4 @@ For real color terminals the ":highlight" command can be used. 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: diff --git a/runtime/doc/os_vms.txt b/runtime/doc/os_vms.txt index 3e723b677..fc6da6175 100644 --- 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: diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt index e9953339a..9a5f748af 100644 --- a/runtime/doc/os_win32.txt +++ b/runtime/doc/os_win32.txt @@ -303,4 +303,4 @@ A. Yes, place your favorite icon in bitmaps/vim.ico in a directory of '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: diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 09b4c2c1a..e7e510f3a 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1417,4 +1417,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: diff --git a/runtime/doc/pi_getscript.txt b/runtime/doc/pi_getscript.txt index 419070682..ae38a3b1b 100644 --- a/runtime/doc/pi_getscript.txt +++ b/runtime/doc/pi_getscript.txt @@ -479,4 +479,4 @@ v2 May 14, 2003 : extracts name of item to be obtained from the 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 diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt index 21b6520ee..6017efa89 100644 --- a/runtime/doc/pi_gzip.txt +++ b/runtime/doc/pi_gzip.txt @@ -40,4 +40,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: diff --git a/runtime/doc/pi_logipat.txt b/runtime/doc/pi_logipat.txt index f8d666234..8d33a565a 100644 --- a/runtime/doc/pi_logipat.txt +++ b/runtime/doc/pi_logipat.txt @@ -118,4 +118,4 @@ Copyright: (c) 2004-2015 by Charles E. Campbell *logiPat-copyright* ============================================================================== -vim:tw=78:ts=8:ft=help +vim:tw=78:ts=8:noet:ft=help diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index b4f2f2693..478338ed4 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -4267,4 +4267,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 diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt index d4ab4a08c..8c4f04a1b 100644 --- a/runtime/doc/pi_paren.txt +++ b/runtime/doc/pi_paren.txt @@ -57,4 +57,4 @@ 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: diff --git a/runtime/doc/pi_spec.txt b/runtime/doc/pi_spec.txt index abe5f1159..aaede1e97 100644 --- a/runtime/doc/pi_spec.txt +++ b/runtime/doc/pi_spec.txt @@ -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: diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index 7a6faf167..f39e0c475 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -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 diff --git a/runtime/doc/pi_vimball.txt b/runtime/doc/pi_vimball.txt index 563b12a96..fec16a4d8 100644 --- a/runtime/doc/pi_vimball.txt +++ b/runtime/doc/pi_vimball.txt @@ -273,4 +273,4 @@ WINDOWS *vimball-windows* ============================================================================== -vim:tw=78:ts=8:ft=help:fdm=marker +vim:tw=78:ts=8:noet:ft=help:fdm=marker diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index c5fa391bf..351773573 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -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 diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index b93a2305f..07a95031e 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -752,4 +752,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: diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 2955edac9..95bcfa06d 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1794,4 +1794,4 @@ start of the file about how to use it. (This script is deprecated, see - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index f2c540b29..03ac35772 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1447,4 +1447,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: diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt index 063a3148b..04e2aec2d 100644 --- 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: diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt index 89703fdde..c4007db93 100644 --- a/runtime/doc/recover.txt +++ b/runtime/doc/recover.txt @@ -234,4 +234,4 @@ Note that after recovery the key of the swap file will be used for the text 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: diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt index 15219e0b9..03e0d9759 100644 --- a/runtime/doc/remote.txt +++ b/runtime/doc/remote.txt @@ -204,4 +204,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: diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index ff1d68d38..55aed248b 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1010,4 +1010,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: diff --git a/runtime/doc/rileft.txt b/runtime/doc/rileft.txt index 17bfdba7b..f5ec8e876 100644 --- a/runtime/doc/rileft.txt +++ b/runtime/doc/rileft.txt @@ -121,4 +121,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: diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt index cf6487319..fae8690df 100644 --- a/runtime/doc/russian.txt +++ b/runtime/doc/russian.txt @@ -71,4 +71,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: diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt index 971fec8e9..1415e2f91 100644 --- 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: diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index dab63b1e4..bd63ea9ad 100644 --- 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: diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt index 6f42eb398..2b096e3be 100644 --- 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: diff --git a/runtime/doc/sponsor.txt b/runtime/doc/sponsor.txt index 6e42d157d..50148e1c9 100644 --- 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: diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 7757088c8..3c2d86805 100644 --- 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: diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 526231f70..b1a1e7258 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -2876,17 +2876,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>: @@ -5478,4 +5478,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: diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt index 31fcc4356..a80d7c3b4 100644 --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -472,4 +472,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: diff --git a/runtime/doc/tags b/runtime/doc/tags index 859db2170..135c3908e 100644 --- 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* diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index 555beb509..d3ceac662 100644 --- 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: diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index dbf7e6483..77cd933b4 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -977,4 +977,4 @@ To swap the meaning of the left and right mouse buttons: > :noremap! <RightDrag> <LeftDrag> :noremap! <RightRelease> <LeftRelease> < - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index cd2c664f5..f9fc0ee5e 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -909,4 +909,4 @@ for when the terminal can't be resized by Vim). - vim:tw=78:ts=8:ft=help:norl: + vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt index 619c95506..bbe341cf2 100644 --- a/runtime/doc/tips.txt +++ b/runtime/doc/tips.txt @@ -530,4 +530,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: diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 9b08aef8d..69294172d 100644 --- 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_Co >= 256, allow using 'tgc'. 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 closed folds. (Ryan Lue, #2351) 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) diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 541f613ac..46bf5673a 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1462,7 +1462,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)) diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index ea3f9ac6c..dc0321191 100644 --- 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: diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim index e61213e7a..9d737cde4 100644 --- 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< 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 diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim index fb398cafb..32bc9f35b 100644 --- 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 diff --git a/runtime/indent/xml.vim b/runtime/indent/xml.vim index 87ffb329b..dcafb467a 100644 --- 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 diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index ec55cf676..9f4c26a0e 100644 --- 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 diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim index 89320597f..c9bb5dc2d 100644 --- 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\>"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' diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim index a95ecacb0..78714d017 100644 --- 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 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" diff --git a/runtime/syntax/readline.vim b/runtime/syntax/readline.vim index 78472cdbf..3831ae114 100644 --- 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 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 diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim index 232d2a7de..d620d91f4 100644 --- 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 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" diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po index f902a99af..477a817b0 100644 --- 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)" diff --git a/src/po/ja.po b/src/po/ja.po index 874ee84c8..2dfad1c45 100644 --- 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)" diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po index 840dcda47..538db7249 100644 --- 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' IvVݒ肳Ă̂ŏ߂܂" +msgid "[Prompt]" +msgstr "[vvg]" + msgid "[Scratch]" msgstr "[]" @@ -258,10 +261,10 @@ msgstr "E917: %s() ɃR[obN͎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 ̐ݒ肪Kvł" @@ -521,7 +524,6 @@ msgstr "E710: Xg^ϐɃ^[Qbgvf܂" msgid "E711: List value has not enough items" msgstr "E711: Xg^ϐɏ\\Ȑ̗vf܂" -# msgid "E690: Missing \"in\" after :for" msgstr "E690: :for ̌ \"in\" ܂" @@ -590,7 +592,7 @@ msgid "E910: Using a Job as a Number" msgstr "E910: Wu𐔒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: Wu_ƂĈĂ܂" 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: Ō̃^uy[W邱Ƃ͂ł܂" msgid "Already only one tab page" msgstr "Ƀ^uy[W1܂" +msgid "Edit File in new tab page" +msgstr "V^uy[WŃt@CҏW܂" + msgid "Edit File in new window" msgstr "VEBhEŃt@CҏW܂" @@ -2284,10 +2289,10 @@ msgstr "AhD(&U)" msgid "Open tab..." msgstr "^uy[WJ" -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 "Eu ('\\' ɂ '\\\\')" msgid "Not Used" @@ -2705,6 +2710,19 @@ msgstr "͈͊O̍sԍł" msgid "not allowed in the Vim sandbox" msgstr "Th{bNXł͋܂" +#, c-format +msgid "E370: Could not load library %s" +msgstr "E370: Cu %s [hł܂ł" + +msgid "Sorry, this command is disabled: the Perl library could not be loaded." +msgstr "" +"̃R}h͖łA߂Ȃ: PerlCu[hł܂ł." + +msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" +msgstr "" +"E299: Th{bNXł Safe W[gpȂPerlXNvg͋ւ" +"Ă܂" + msgid "E836: This Vim cannot execute :python after using :py3" msgstr "E836: Vimł :py3 g :python g܂" @@ -4703,7 +4721,6 @@ msgstr "E777: XgKvł" 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( ̓RRł͋Ă܂" -# msgid "E67: \\z1 - \\z9 not allowed here" -msgstr "E67: \\z1 ̑̓RRł͋Ă܂" +msgstr "E67: \\z1 - \\z9 ̓RRł͋Ă܂" -# #, 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^[ċAIɎ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: \\_ ̖Ȏgp@ł" @@ -4784,16 +4799,13 @@ msgstr "E63: \\_ ̖Ȏgp@ł" 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\\) ȕNX: %ld" @@ -4853,7 +4864,7 @@ msgid "E870: (NFA regexp) Error reading repetition limits" 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 "" +"NFAK\\GWp̃Ot@CpƂĊJ܂BO͕WG[" +"o͂ɏo͂܂B" + msgid "E874: (NFA) Could not pop the stack!" msgstr "E874: (NFA) X^bN|bvł܂!" @@ -4880,19 +4896,6 @@ msgstr "E876: (NFA K\\) NFAŜۑɂ͋Xy[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 "" -"NFAK\\GWp̃Ot@CpƂĊJ܂BO͕Wo͂" -"o͂܂B" - -#, c-format -msgid "(NFA) COULD NOT OPEN %s !" -msgstr "(NFA) Ot@C %s J܂!" - -msgid "Could not open temporary log file for writing " -msgstr "NFAK\\GWp̃Ot@CpƂĊJ܂B" - msgid " VREPLACE" msgstr " zu" @@ -4983,7 +4986,7 @@ msgstr "CN[hꂽt@CXL: %s" #, c-format msgid "Searching included file %s" -msgstr "CN[hꂽt@CXL %s" +msgstr "CN[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Ŏgpꂽ̂ƈقȂ܂" #, c-format msgid "Reading dictionary file %s..." -msgstr "t@C %s XL..." +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 "Pt@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: JbR '(' ܂: %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: Cu %s [hł܂ł" - -msgid "Sorry, this command is disabled: the Perl library could not be loaded." -msgstr "" -"̃R}h͖łA߂Ȃ: PerlCu[hł܂ł." - -msgid "E299: Perl evaluation forbidden in sandbox without the Safe module" -msgstr "" -"E299: Th{bNXł Safe W[gpȂPerlXNvg͋ւ" -"Ă܂" - msgid "Edit with &multiple Vims" msgstr "VimŕҏW (&M)" |