# HG changeset patch # User Christian Brabandt # Date 1473599707 -7200 # Node ID a5ef9968638c7d4e13370edcc7e66844e28536f4 # Parent a93cbcaeb4bb88d4aac0ccbad21958ed36637885 commit https://github.com/vim/vim/commit/7e1479b86c590a66b63a274c079b7f18907d45a4 Author: Bram Moolenaar Date: Sun Sep 11 15:07:27 2016 +0200 Updated runtime files, Japanese translations. diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.4. Last change: 2016 Apr 12 +*change.txt* For Vim version 7.4. Last change: 2016 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -872,6 +872,7 @@ The numbering of "\1", "\2" etc. is done the pattern (going left to right). When a parentheses group matches several times, the last one will be used for "\1", "\2", etc. Example: > :s/\(\(a[a-d] \)*\)/\2/ modifies "aa ab x" to "ab x" +The "\2" is for "\(a[a-d] \)". At first it matches "aa ", secondly "ab ". When using parentheses in combination with '|', like in \([ab]\)\|\([cd]\), either the first or second pattern in parentheses did not match, so either diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.4. Last change: 2016 Jun 20 +*filetype.txt* For Vim version 7.4. Last change: 2016 Sep 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -644,6 +644,17 @@ These maps can be disabled with > :let g:no_pdf_maps = 1 < +PYTHON *ft-python-plugin* *PEP8* + +By default the following options are set, in accordance with PEP8: > + + setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8 + +To disable this behaviour, set the following variable in your vimrc: > + + let g:python_recommended_style = 0 + + RPM SPEC *ft-spec-plugin* Since the text for this plugin is rather long it has been put in a separate diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.4. Last change: 2016 Jul 21 +*repeat.txt* For Vim version 7.4. Last change: 2016 Sep 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -158,7 +158,7 @@ q Stops recording. (Implementation no :[addr]@: Repeat last command-line. First set cursor at line [addr] (default is current line). {not in Vi} - *:@@* +:[addr]@ *:@@* :[addr]@@ Repeat the previous :@{0-9a-z"}. First set cursor at line [addr] (default is current line). {Vi: only in some versions} diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.4. Last change: 2016 Sep 03 +*starting.txt* For Vim version 7.4. Last change: 2016 Sep 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1021,17 +1021,20 @@ patch 7.4.2111 to be exact). This should work well for new Vim users. If you create your own .vimrc, it is recommended to add this line somewhere near the top: > + unlet! skip_defaults_vim source $VIMRUNTIME/defaults.vim Then Vim works like before you had a .vimrc. Copying $VIMRUNTIME/vimrc_example is way to do this. Alternatively, you can copy defaults.vim to your .vimrc -and modify it. +and modify it (but then you won't get updates when it changes). If you don't like some of the defaults, you can still source defaults.vim and revert individual settings. See the defaults.vim file for hints on how to revert each item. - + *skip_defaults_vim* If you use a system-wide vimrc and don't want defaults.vim to change settings, -set the "skip_defaults_vim" variable. +set the "skip_defaults_vim" variable. If this was set and you want to load +defaults.vim from your .vimrc, first unlet skip_defaults_vim, as in the +example above. Avoiding trojan horses ~ diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.4. Last change: 2016 Aug 16 +*syntax.txt* For Vim version 7.4. Last change: 2016 Sep 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2669,7 +2669,76 @@ your .vimrc: *g:filetype_r* RUBY *ruby.vim* *ft-ruby-syntax* -There are a number of options to the Ruby syntax highlighting. + Ruby: Operator highlighting |ruby_operators| + Ruby: Whitespace errors |ruby_space_errors| + Ruby: Folding |ruby_fold| |ruby_foldable_groups| + Ruby: Reducing expensive operations |ruby_no_expensive| |ruby_minlines| + Ruby: Spellchecking strings |ruby_spellcheck_strings| + + *ruby_operators* + Ruby: Operator highlighting ~ + +Operators can be highlighted by defining "ruby_operators": > + + :let ruby_operators = 1 +< + *ruby_space_errors* + Ruby: Whitespace errors ~ + +Whitespace errors can be highlighted by defining "ruby_space_errors": > + + :let ruby_space_errors = 1 +< +This will highlight trailing whitespace and tabs preceded by a space character +as errors. This can be refined by defining "ruby_no_trail_space_error" and +"ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after +spaces respectively. + + *ruby_fold* *ruby_foldable_groups* + Ruby: Folding ~ + +Folding can be enabled by defining "ruby_fold": > + + :let ruby_fold = 1 +< +This will set the value of 'foldmethod' to "syntax" locally to the current +buffer or window, which will enable syntax-based folding when editing Ruby +filetypes. + + *ruby_foldable_groups* +Default folding is rather detailed, i.e., small syntax units like "if", "do", +"%w[]" may create corresponding fold levels. + +You can set "ruby_foldable_groups" to restrict which groups are foldable: > + + :let ruby_foldable_groups = 'if case %' +< +The value is a space-separated list of keywords: + + keyword meaning ~ + -------- ------------------------------------- ~ + ALL Most block syntax (default) + NONE Nothing + if "if" or "unless" block + def "def" block + class "class" block + module "module" block + do "do" block + begin "begin" block + case "case" block + for "for", "while", "until" loops + { Curly bracket block or hash literal + [ Array literal + % Literal with "%" notation, e.g.: %w(STRING), %!STRING! + / Regexp + string String and shell command output (surrounded by ', ", `) + : Symbol + # Multiline comment + << Here documents + __END__ Source code after "__END__" directive + + *ruby_no_expensive* + Ruby: Reducing expensive operations ~ By default, the "end" keyword is colorized according to the opening statement of the block it closes. While useful, this feature can be expensive; if you @@ -2680,6 +2749,8 @@ you may want to turn it off by defining < In this case the same color will be used for all control keywords. + *ruby_minlines* + If you do want this feature enabled, but notice highlighting errors while scrolling backwards, which are fixed when redrawing with CTRL-L, try setting the "ruby_minlines" variable to a value larger than 50: > @@ -2689,48 +2760,13 @@ the "ruby_minlines" variable to a value Ideally, this value should be a number of lines large enough to embrace your largest class or module. -Highlighting of special identifiers can be disabled by removing the -rubyIdentifier highlighting: > - - :hi link rubyIdentifier NONE -< -This will prevent highlighting of special identifiers like "ConstantName", -"$global_var", "@@class_var", "@instance_var", "| block_param |", and -":symbol". - -Significant methods of Kernel, Module and Object are highlighted by default. -This can be disabled by defining "ruby_no_special_methods": > - - :let ruby_no_special_methods = 1 -< -This will prevent highlighting of important methods such as "require", "attr", -"private", "raise" and "proc". - -Ruby operators can be highlighted. This is enabled by defining -"ruby_operators": > - - :let ruby_operators = 1 -< -Whitespace errors can be highlighted by defining "ruby_space_errors": > - - :let ruby_space_errors = 1 -< -This will highlight trailing whitespace and tabs preceded by a space character -as errors. This can be refined by defining "ruby_no_trail_space_error" and -"ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after -spaces respectively. - -Folding can be enabled by defining "ruby_fold": > - - :let ruby_fold = 1 -< -This will set the 'foldmethod' option to "syntax" and allow folding of -classes, modules, methods, code blocks, heredocs and comments. - -Folding of multiline comments can be disabled by defining -"ruby_no_comment_fold": > - - :let ruby_no_comment_fold = 1 + *ruby_spellcheck_strings* + Ruby: Spellchecking strings ~ + +Ruby syntax will perform spellchecking of strings if you define +"ruby_spellcheck_strings": > + + :let ruby_spellcheck_strings = 1 < SCHEME *scheme.vim* *ft-scheme-syntax* diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt --- a/runtime/doc/tabpage.txt +++ b/runtime/doc/tabpage.txt @@ -1,4 +1,4 @@ -*tabpage.txt* For Vim version 7.4. Last change: 2015 Jan 04 +*tabpage.txt* For Vim version 7.4. Last change: 2016 Sep 09 VIM REFERENCE MANUAL by Bram Moolenaar @@ -201,6 +201,12 @@ Other commands: :tabs List the tab pages and the windows they contain. Shows a ">" for the current window. Shows a "+" for modified buffers. + For example: + Tab page 1 ~ + + tabpage.txt ~ + ex_docmd.c ~ + Tab page 2 ~ + > main.c ~ REORDERING TAB PAGES: diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4617,6 +4617,7 @@ OptionSet autocmd.txt /*OptionSet* OverTheSpot mbyte.txt /*OverTheSpot* P change.txt /*P* PATHEXT eval.txt /*PATHEXT* +PEP8 filetype.txt /*PEP8* PHP_BracesAtCodeLevel indent.txt /*PHP_BracesAtCodeLevel* PHP_autoformatcomment indent.txt /*PHP_autoformatcomment* PHP_default_indenting indent.txt /*PHP_default_indenting* @@ -6090,6 +6091,7 @@ ft-printcap-syntax syntax.txt /*ft-print ft-progress-syntax syntax.txt /*ft-progress-syntax* ft-ptcap-syntax syntax.txt /*ft-ptcap-syntax* ft-python-indent indent.txt /*ft-python-indent* +ft-python-plugin filetype.txt /*ft-python-plugin* ft-python-syntax syntax.txt /*ft-python-syntax* ft-quake-syntax syntax.txt /*ft-quake-syntax* ft-r-indent indent.txt /*ft-r-indent* @@ -8025,6 +8027,14 @@ ruby-set_option if_ruby.txt /*ruby-set_o ruby-vim if_ruby.txt /*ruby-vim* ruby-window if_ruby.txt /*ruby-window* ruby.vim syntax.txt /*ruby.vim* +ruby_fold syntax.txt /*ruby_fold* +ruby_foldable_groups syntax.txt /*ruby_foldable_groups* +ruby_foldable_groups syntax.txt /*ruby_foldable_groups* +ruby_minlines syntax.txt /*ruby_minlines* +ruby_no_expensive syntax.txt /*ruby_no_expensive* +ruby_operators syntax.txt /*ruby_operators* +ruby_space_errors syntax.txt /*ruby_space_errors* +ruby_spellcheck_strings syntax.txt /*ruby_spellcheck_strings* russian russian.txt /*russian* russian-intro russian.txt /*russian-intro* russian-issues russian.txt /*russian-issues* @@ -8159,6 +8169,7 @@ sin() eval.txt /*sin()* single-repeat repeat.txt /*single-repeat* sinh() eval.txt /*sinh()* skeleton autocmd.txt /*skeleton* +skip_defaults_vim starting.txt /*skip_defaults_vim* slice eval.txt /*slice* slow-fast-terminal term.txt /*slow-fast-terminal* slow-start starting.txt /*slow-start* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2016 Sep 08 +*todo.txt* For Vim version 7.4. Last change: 2016 Sep 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,20 +34,6 @@ not be repeated below, unless there is e *known-bugs* -------------------- Known bugs and current work ----------------------- -Invalid memory access in do_pending_operator. (Dominique, 2016 Sep 5) - -Invalid memory access in msg_puts_printf (Dominique, 2016 Sep 6) - -Crash after wiping a buffer. (Dominique, Sep 7) - -With MS-Windows gvim: - test_netbeans.vim fails. Nb_basic line 12 and 13. - test86 fails partial fix - test87 fails - -Make ":filter" work with more commands. -Search for: msg_putchar('\n') - +channel: - channel_wait() may return an error while there is still something to read. Perhaps try to read once? @@ -71,8 +57,6 @@ Later With xterm could use -S{pty}. Regexp problems: -- The new engine does not do the example in change.txt correctly, where the - meaning of \1 and \2 is explained. (Harm te Hennepe, #990) - Since 7.4.704 the old regex engine fails to match [[:print:]] in 0xf6. (Manuel Ortega, 2016 Apr 24) Test fails on Mac. Avoid using isalpha(), isalnum(), etc? Depends on @@ -92,8 +76,6 @@ Regexp problems: 2013 Dec 11) - Using \@> and \?. (Brett Stahlman, 2013 Dec 21) Remark from Marcin Szamotulski Remark from Brett 2014 Jan 6 and 7. -- Difference in NFA and old engine. (Brett Stahlman, 2014 Nov 5) -- Bug when using \>. (Ramel, 2014 Feb 2) (Aaron Bohannon, 2014 Feb 13) - NFA regexp doesn't handle \%\)\?". (Ramel) +Solution: When a state is already in the list, but addstate_here() is used + and the existing state comes later, add the new state anyway. +Files: src/regexp_nfa.c, src/testdir/test_regexp_latin.vim + +Patch 7.4.2356 +Problem: Reading past end of line when using previous substitute pattern. + (Dominique Pelle) +Solution: Don't set "pat" only set "searchstr". +Files: src/search.c, src/testdir/test_search.vim + +Patch 7.4.2357 +Problem: Attempt to read history entry while not initialized. +Solution: Skip when the index is negative. +Files: src/ex_getln.c + +Patch 7.4.2358 +Problem: Compiler warnings with Solaris Studio when using GTK3. +Solution: Define FUNC2GENERIC depending on the system. (Kazunobu Kuriyama) +Files: src/gui.h, src/gui_beval.c, src/gui_gtk_f.c + [STILL MORE COMING!] vim:tw=78:ts=8:ft=help:norl: diff --git a/src/po/ja.euc-jp.po b/src/po/ja.euc-jp.po --- a/src/po/ja.euc-jp.po +++ b/src/po/ja.euc-jp.po @@ -14,14 +14,15 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-31 18:10+0900\n" -"PO-Revision-Date: 2016-08-31 21:20+0900\n" +"POT-Creation-Date: 2016-09-10 21:10+0900\n" +"PO-Revision-Date: 2016-09-10 21:20+0900\n" "Last-Translator: MURAOKA Taro \n" "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "E831: bf_key_init() called with empty password" msgstr "E831: bf_key_init() が空パスワードで呼び出されました" @@ -56,6 +57,9 @@ msgstr "E83: バッファを作成できないので, 他のを使用します..." msgid "E931: Buffer cannot be registered" msgstr "E931: バッファを登録できません" +msgid "E937: Attempt to delete a buffer that is in use" +msgstr "E937: 使用中のバッファを削除しようと試みました" + msgid "E515: No buffers were unloaded" msgstr "E515: 解放されたバッファはありません" @@ -695,7 +699,6 @@ msgstr "&Ok" msgid "+-%s%3ld line: " msgid_plural "+-%s%3ld lines: " msgstr[0] "+-%s%3ld 行: " -msgstr[1] "+-%s%3ld 行: " #, c-format msgid "E700: Unknown function: %s" @@ -1948,6 +1951,9 @@ msgstr "E462: \"%s\" をリロードする準備ができませんでした" msgid "E321: Could not reload \"%s\"" msgstr "E321: \"%s\" はリロードできませんでした" +msgid "--Deleted--" +msgstr "--削除済--" + #, c-format msgid "auto-removing autocommand: %s " msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます" @@ -1957,12 +1963,12 @@ msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます" msgid "E367: No such group: \"%s\"" msgstr "E367: そのグループはありません: \"%s\"" +msgid "E936: Cannot delete the current group" +msgstr "E936: 現在のグループは削除できません" + msgid "W19: Deleting augroup that is still in use" msgstr "W19: 使用中の augroup を消そうとしています" -msgid "--Deleted--" -msgstr "--削除済--" - #, c-format msgid "E215: Illegal character after *: %s" msgstr "E215: * の後に不正な文字がありました: %s" @@ -2027,7 +2033,6 @@ msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません" msgid "+--%3ld line folded " msgid_plural "+--%3ld lines folded " msgstr[0] "+--%3ld 行が折畳まれました " -msgstr[1] "+--%3ld 行が折畳まれました " msgid "E222: Add to read buffer" msgstr "E222: 読込バッファへ追加" diff --git a/src/po/ja.po b/src/po/ja.po --- a/src/po/ja.po +++ b/src/po/ja.po @@ -14,14 +14,15 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-31 18:10+0900\n" -"PO-Revision-Date: 2016-08-31 21:20+0900\n" +"POT-Creation-Date: 2016-09-10 21:10+0900\n" +"PO-Revision-Date: 2016-09-10 21:20+0900\n" "Last-Translator: MURAOKA Taro \n" "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "E831: bf_key_init() called with empty password" msgstr "E831: bf_key_init() 腥冴鴻若у若喝冴障" @@ -56,6 +57,9 @@ msgstr "E83: ＜篏с, 篁篏睡障..." msgid "E931: Buffer cannot be registered" msgstr "E931: ＜脂蚊с障" +msgid "E937: Attempt to delete a buffer that is in use" +msgstr "E937: 篏睡筝＜ゃ荅帥障" + msgid "E515: No buffers were unloaded" msgstr "E515: 茹ｆ障＜障" @@ -695,7 +699,6 @@ msgstr "&Ok" msgid "+-%s%3ld line: " msgid_plural "+-%s%3ld lines: " msgstr[0] "+-%s%3ld 茵: " -msgstr[1] "+-%s%3ld 茵: " #, c-format msgid "E700: Unknown function: %s" @@ -1948,6 +1951,9 @@ msgstr "E462: \"%s\" 若羣с障с" msgid "E321: Could not reload \"%s\"" msgstr "E321: \"%s\" 若с障с" +msgid "--Deleted--" +msgstr "--ゆ--" + #, c-format msgid "auto-removing autocommand: %s " msgstr "autocommand: %s <=%d> ゃ障" @@ -1957,12 +1963,12 @@ msgstr "autocommand: %s <=%d> ゃ障" msgid "E367: No such group: \"%s\"" msgstr "E367: 違若障: \"%s\"" +msgid "E936: Cannot delete the current group" +msgstr "E936: 憜違若ゃс障" + msgid "W19: Deleting augroup that is still in use" msgstr "W19: 篏睡筝 augroup 羔障" -msgid "--Deleted--" -msgstr "--ゆ--" - #, c-format msgid "E215: Illegal character after *: %s" msgstr "E215: * 緇筝罩ｃ絖障: %s" @@ -2027,7 +2033,6 @@ msgstr "E351: 憜 'foldmethod' с潟帥ゃс障" msgid "+--%3ld line folded " msgid_plural "+--%3ld lines folded " msgstr[0] "+--%3ld 茵潟障障 " -msgstr[1] "+--%3ld 茵潟障障 " msgid "E222: Add to read buffer" msgstr "E222: 茯莨若＜梧申" diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po --- a/src/po/ja.sjis.po +++ b/src/po/ja.sjis.po @@ -14,14 +14,15 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-31 18:10+0900\n" -"PO-Revision-Date: 2016-08-31 21:20+0900\n" +"POT-Creation-Date: 2016-09-10 21:10+0900\n" +"PO-Revision-Date: 2016-09-10 21:20+0900\n" "Last-Translator: MURAOKA Taro \n" "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=cp932\n" "Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" msgid "E831: bf_key_init() called with empty password" msgstr "E831: bf_key_init() pX[ho" @@ -56,6 +57,9 @@ msgstr "E83: obt@, gp..." msgid "E931: Buffer cannot be registered" msgstr "E931: obt@o^" +msgid "E937: Attempt to delete a buffer that is in use" +msgstr "E937: gpobt@" + msgid "E515: No buffers were unloaded" msgstr "E515: obt@" @@ -695,7 +699,6 @@ msgstr "&Ok" msgid "+-%s%3ld line: " msgid_plural "+-%s%3ld lines: " msgstr[0] "+-%s%3ld s: " -msgstr[1] "+-%s%3ld s: " #, c-format msgid "E700: Unknown function: %s" @@ -1948,6 +1951,9 @@ msgstr "E462: \"%s\" [h" msgid "E321: Could not reload \"%s\"" msgstr "E321: \"%s\" [h" +msgid "--Deleted--" +msgstr "----" + #, c-format msgid "auto-removing autocommand: %s " msgstr "autocommand: %s ｩI" @@ -1957,12 +1963,12 @@ msgstr "autocommand: %s ｩI" msgid "E367: No such group: \"%s\"" msgstr "E367: O[v: \"%s\"" +msgid "E936: Cannot delete the current group" +msgstr "E936: O[v" + msgid "W19: Deleting augroup that is still in use" msgstr "W19: gp augroup " -msgid "--Deleted--" -msgstr "----" - #, c-format msgid "E215: Illegal character after *: %s" msgstr "E215: * s: %s" @@ -2027,7 +2033,6 @@ msgstr "E351: 'foldmethod' " msgid "+--%3ld line folded " msgid_plural "+--%3ld lines folded " msgstr[0] "+--%3ld s " -msgstr[1] "+--%3ld s " msgid "E222: Add to read buffer" msgstr "E222: obt@"