diff options
| -rw-r--r-- | runtime/doc/channel.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/editing.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/helphelp.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/os_beos.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/repeat.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/tags | 2 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 35 | ||||
| -rw-r--r-- | runtime/doc/usr_05.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/usr_25.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/usr_41.txt | 3 | ||||
| -rw-r--r-- | runtime/pack/dist/opt/matchit/doc/matchit.txt | 13 | ||||
| -rw-r--r-- | runtime/syntax/sh.vim | 9 | ||||
| -rw-r--r-- | runtime/syntax/tex.vim | 8 |
14 files changed, 56 insertions, 59 deletions
diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt index 7d684fbc0c..cc4bc904ae 100644 --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 7.4. Last change: 2016 Mar 26 +*channel.txt* For Vim version 7.4. Last change: 2016 Mar 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -616,6 +616,9 @@ See |job_setoptions()| and |ch_setoptions()|. "err_name": "/path/file" the name of the file or buffer to write to "err_buf": number the number of the buffer to write to +"block_write": number only for testing: pretend every other write to stdin + will block + Writing to a buffer ~ diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 98a0bb9823..d9ce12a8a5 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.4. Last change: 2016 Feb 16 +*editing.txt* For Vim version 7.4. Last change: 2016 Mar 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -393,7 +393,7 @@ These are the common ones: To avoid the special meaning of the wildcards prepend a backslash. However, on MS-Windows the backslash is a path separator and "path\[abc]" is still seen as a wildcard when "[" is in the 'isfname' option. A simple way to avoid this -is to use "path\[[]abc]". Then the file "path[abc]" literally. +is to use "path\[[]abc]", this matches the file "path\[abc]". *starstar-wildcard* Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 80395ed45f..f1425bae36 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2016 Mar 27 +*eval.txt* For Vim version 7.4. Last change: 2016 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt index 3a9ec6875c..2d52d13f4a 100644 --- a/runtime/doc/helphelp.txt +++ b/runtime/doc/helphelp.txt @@ -1,4 +1,4 @@ -*helphelp.txt* For Vim version 7.4. Last change: 2016 Mar 26 +*helphelp.txt* For Vim version 7.4. Last change: 2016 Mar 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -263,7 +263,9 @@ The second one finds the English user manual, even when 'helplang' is set to When using command-line completion for the ":help" command, the "@en" extension is only shown when a tag exists for multiple languages. When the -tag only exists for English "@en" is omitted. +tag only exists for English "@en" is omitted. When the first candidate has an +"@ab" extension and it matches the first language in 'helplang' "@ab" is also +omitted. When using |CTRL-]| or ":help!" in a non-English help file Vim will try to find the tag in the same language. If not found then 'helplang' will be used diff --git a/runtime/doc/os_beos.txt b/runtime/doc/os_beos.txt index 5099ae6126..f023bd0c7d 100644 --- a/runtime/doc/os_beos.txt +++ b/runtime/doc/os_beos.txt @@ -1,4 +1,4 @@ -*os_beos.txt* For Vim version 7.4. Last change: 2010 Aug 14 +*os_beos.txt* For Vim version 7.4. Last change: 2016 Mar 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -248,8 +248,9 @@ reality. Vim uses this mapping: Button 3 -> MiddleMouse. If your mouse has fewer than 3 buttons you can provide your own mapping from -mouse clicks with modifier(s) to other mouse buttons. See the file -vim-5.x/macros/swapmous.vim for an example. |gui-mouse-mapping| +mouse clicks with modifier(s) to other mouse buttons. See the swapmouse +package for an example: |gui-mouse-mapping| +$VIMRUNTIME/pack/dist/opt/swapmouse/plugin/swapmouse.vim 12. Color names *beos-colors* diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index df94a74128..e2c4c2f5f4 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 26 +*repeat.txt* For Vim version 7.4. Last change: 2016 Mar 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -260,7 +260,7 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|. Packages will be loaded only once. After this command it won't happen again. When the optional ! is added this command will load packages even when done before. - An Error only causes sourcing the script where it + An error only causes sourcing the script where it happens to be aborted, further plugins will be loaded. See |packages|. diff --git a/runtime/doc/tags b/runtime/doc/tags index 1840ff6eba..a11cf6ca86 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4951,6 +4951,7 @@ assert_equal() eval.txt /*assert_equal()* assert_exception() eval.txt /*assert_exception()* assert_fails() eval.txt /*assert_fails()* assert_false() eval.txt /*assert_false()* +assert_match() eval.txt /*assert_match()* assert_true() eval.txt /*assert_true()* at motion.txt /*at* atan() eval.txt /*atan()* @@ -7104,6 +7105,7 @@ matchit-install usr_05.txt /*matchit-install* matchlist() eval.txt /*matchlist()* matchparen pi_paren.txt /*matchparen* matchstr() eval.txt /*matchstr()* +matchstrpos() eval.txt /*matchstrpos()* max() eval.txt /*max()* mbyte-IME mbyte.txt /*mbyte-IME* mbyte-XIM mbyte.txt /*mbyte-XIM* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 00ba71f824..e9a6d911c6 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2016 Mar 26 +*todo.txt* For Vim version 7.4. Last change: 2016 Mar 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,11 +34,9 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- -assert_matches('pattern', value) +Using free memory. (Dominique, 2016 Mar 27) +channel: -- When decoding json, don't read all the typeahead at once, use the reader - properly. - When a message in the queue but there is no callback, drop it after a while? Add timestamp to queued messages and callbacks with ID, remove after a minute. Option to set the droptime. @@ -46,7 +44,6 @@ assert_matches('pattern', value) - When starting a job, have an option to open the server socket, so we know the port, and pass it to the command with --socket-fd {nr}. (Olaf Dabrunz, Feb 9) How to do this on MS-Windows? -- Make sure errors lead to a useful error msg. ["ex","foobar"] - For connection to server, a "keep open" flag would be useful. Retry connecting in the main loop with zero timeout. Later @@ -56,19 +53,10 @@ Later Partial: - Maybe we also need VAR_PARTIAL support in if_mzsch. -Packages: -- make package for editexisting, others? - Make it so that the window ID can be used where currently a window nr is used -Fix to support --nofork for Windows batch files. (Kevin Cantú, 2016 Feb 23, -#658, #659) Also add "setlocal" at top of batch file? - -Patch to add matchstrpos(). (Ozaki Kiichi, 2016 Feb 28) - -Why does this: echo "a" . 1.1 -result in: a11 -Should recognize float (so long as it's not ".1.1"). +Patch to add "q" item to guifont. #720, Kim Brouer, 2016 Mar 29 +Better patch from Yasuhiro Matsumoto, 2016 Jan 4. Patch to make tag jump work on function({expr}). (Hirohito Higashi, 2016 Mar 25) @@ -170,10 +158,13 @@ Reject the value? #710. Win32: patch to use 64 bit stat() if possible. (Ken Takata, 2014 May 12) More tests May 14. Update May 29. Update Aug 10. Now part of large file patches. (Ken Takata, 2016 Feb 1) -Two patches now? New update Feb 24. +Win64: Seek error in swap file for a very big file (3 Gbyte). Check storing +pointer in long and seek offset in 64 bit var. +Patches from Ken Takata might help (2014 Apr 17) +Update 2016 Mar 28. Can include all parts into one dist patch. Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21) -Also in update of Feb 24? +Update 2016 Mar 28. After 7.5 is released: - Drop support for older MS-Windows systems, before XP. @@ -267,7 +258,7 @@ https://gist.github.com/presuku/d3d6b230b9b6dcfc0477 Patch to make the behavior of "w" more straightforward, but not Vi compatible. With a 'cpo' flag. (Christian Brabandt, 2016 Feb 8) -Patch to add optionproperties(). (Anton Lindqvist, 2016 Mar 26) +Patch to add optionproperties(). (Anton Lindqvist, 2016 Mar 27) Patch to add TagNotFound autocommand. (Anton Lindqvist, 2016 Feb 3) @@ -1926,10 +1917,6 @@ Win32: using "gvim --remote-tab-silent fname" sometimes gives an empty screen with the more prompt. Caused by setting the guitablabel? (Thomas Michael Engelke, 2007 Dec 20 - 2008 Jan 17) -Win64: Seek error in swap file for a very big file (3 Gbyte). Check storing -pointer in long and seek offset in 64 bit var. -Patches from Ken Takata might help (2014 Apr 17) - Win32: patch for fullscreen mode. (Liushaolin, 2008 April 17) Win32: When 'shell' is bash shellescape() doesn't always do the right thing. @@ -4863,7 +4850,7 @@ Searching: lines 23 to 45? Or does this conflict with Ex range syntax? 8 Allow identical pairs in 'matchpairs'. Restrict the search to the current line. -7 Allow longer pairs in 'matchpairs'. Use ~/vim/macros/matchit.vim as an +7 Allow longer pairs in 'matchpairs'. Use matchit.vim as an example. 8 Make it possible to define the character that "%" checks for in #if/#endif. For nmake it's !if/!endif. diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index 126edc57d2..ebac474b56 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -1,4 +1,4 @@ -*usr_05.txt* For Vim version 7.4. Last change: 2016 Mar 25 +*usr_05.txt* For Vim version 7.4. Last change: 2016 Mar 28 VIM USER MANUAL - by Bram Moolenaar @@ -363,10 +363,9 @@ Example for Unix (assuming you didn't have a plugin directory yet): > mkdir ~/.vim mkdir ~/.vim/plugin - cp /usr/local/share/vim/vim60/macros/justify.vim ~/.vim/plugin + cp /tmp/yourplugin.vim ~/.vim/plugin -That's all! Now you can use the commands defined in this plugin to justify -text. +That's all! Now you can use the commands defined in this plugin. Instead of putting plugins directly into the plugin/ directory, you may better organize them by putting them into subdirectories under plugin/. diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt index 23d76a8b0f..24420353dd 100644 --- a/runtime/doc/usr_25.txt +++ b/runtime/doc/usr_25.txt @@ -1,4 +1,4 @@ -*usr_25.txt* For Vim version 7.4. Last change: 2014 Oct 29 +*usr_25.txt* For Vim version 7.4. Last change: 2016 Mar 28 VIM USER MANUAL - by Bram Moolenaar @@ -196,12 +196,16 @@ Vim has no built-in way of justifying text. However, there is a neat macro package that does the job. To use this package, execute the following command: > - :runtime macros/justify.vim + :packadd justify + +Or put this line in your |vimrc|: > + + packadd! justify This Vim script file defines a new visual command "_j". To justify a block of text, highlight the text in Visual mode and then execute "_j". Look in the file for more explanations. To go there, do "gf" on this name: -$VIMRUNTIME/macros/justify.vim. +$VIMRUNTIME/pack/dist/opt/justify/plugin/justify.vim. An alternative is to filter the text through an external program. Example: > diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 140a8ad888..4ce4c235e1 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -1,4 +1,4 @@ -*usr_41.txt* For Vim version 7.4. Last change: 2016 Mar 15 +*usr_41.txt* For Vim version 7.4. Last change: 2016 Mar 27 VIM USER MANUAL - by Bram Moolenaar @@ -891,6 +891,7 @@ Mappings: *mapping-functions* Testing: *test-functions* assert_equal() assert that two expressions values are equal + assert_match() assert that a pattern matches the value assert_false() assert that an expression is false assert_true() assert that an expression is true assert_exception() assert that a command throws an exception diff --git a/runtime/pack/dist/opt/matchit/doc/matchit.txt b/runtime/pack/dist/opt/matchit/doc/matchit.txt index 8a3a96e260..935370fd40 100644 --- a/runtime/pack/dist/opt/matchit/doc/matchit.txt +++ b/runtime/pack/dist/opt/matchit/doc/matchit.txt @@ -4,7 +4,7 @@ For instructions on installing this file, type :help matchit-install inside Vim. -For Vim version 6.3. Last change: 2007 Aug 29 +For Vim version 6.3. Last change: 2016 Mar 28 VIM REFERENCE MANUAL by Benji Fisher @@ -152,13 +152,10 @@ setting |b:match_skip|. ============================================================================== 2. Activation *matchit-activate* -You can use this script as a plugin, by copying it to your plugin directory. -See |add-global-plugin| for instructions. You can also add a line to your -|vimrc| file, such as > - :source $VIMRUNTIME/macros/matchit.vim -or > - :runtime macros/matchit.vim -Either way, the script should start working the next time you start up Vim. +To use the matchit plugin add this line to your |vimrc|: > + packadd! matchit + +The script should start working the next time you start Vim. (Earlier versions of the script did nothing unless a |buffer-variable| named |b:match_words| was defined. Even earlier versions contained autocommands diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 3fc236f033..8b0a91f674 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -2,8 +2,8 @@ " Language: shell (sh) Korn shell (ksh) bash (sh) " Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz> " Previous Maintainer: Lennart Schultz <Lennart.Schultz@ecmwf.int> -" Last Change: Feb 18, 2016 -" Version: 145 +" Last Change: Mar 12, 2016 +" Version: 146 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH " For options and settings, please use: :help ft-sh-syntax " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr) @@ -185,7 +185,7 @@ endif " Options: {{{1 " ==================== -syn match shOption "\s\zs[-+][-_a-zA-Z0-9#]\+" +syn match shOption "\s\zs[-+][-_a-zA-Z#@]\+" syn match shOption "\s\zs--[^ \t$`'"|);]\+" " File Redirection Highlighted As Operators: {{{1 @@ -317,7 +317,8 @@ syn match shColon '^\s*\zs:' " String And Character Constants: {{{1 "================================ -syn match shNumber "-\=\<\d\+\>#\=" +syn match shNumber "\<\d\+\>#\=" +syn match shNumber "-\=\.\=\d\+\>#\=" syn match shCtrlSeq "\\\d\d\d\|\\[abcfnrtv0]" contained if exists("b:is_bash") syn match shSpecial "\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]" contained diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim index cef28d65ed..5af5882a56 100644 --- a/runtime/syntax/tex.vim +++ b/runtime/syntax/tex.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: TeX " Maintainer: Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM> -" Last Change: Feb 18, 2016 -" Version: 92 +" Last Change: Mar 07, 2016 +" Version: 93 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX " " Notes: {{{1 @@ -296,7 +296,7 @@ syn match texTypeStyle "\\sc\>" syn match texTypeStyle "\\tt\>" " Type Styles: attributes, commands, families, etc (LaTeX2E): {{{1 -if s:tex_conceal !~ 'b' +if s:tex_conceal !~# 'b' syn match texTypeStyle "\\textbf\>" syn match texTypeStyle "\\textit\>" endif @@ -541,7 +541,7 @@ if !exists("g:tex_no_math") syn match texOnlyMath "[_^]" endif syn match texSpecialChar "\^\^[0-9a-f]\{2}\|\^\^\S" -if s:tex_conceal !~ 'S' +if s:tex_conceal !~# 'S' syn match texSpecialChar '\\glq\>' contained conceal cchar=‚ syn match texSpecialChar '\\grq\>' contained conceal cchar=‘ syn match texSpecialChar '\\glqq\>' contained conceal cchar=„ |