# HG changeset patch # User Christian Brabandt # Date 1463758206 -7200 # Node ID 071f9da012fb2e8ec5c16dcaedd8b5ab39334837 # Parent e6ecaa231a5db6932ae7d3604757f993795470ba commit https://github.com/vim/vim/commit/06d2d38ab7564e1f784b1058a4ef4580cd6d1810 Author: Bram Moolenaar Date: Fri May 20 17:24:11 2016 +0200 Updated runtime files. diff --git a/runtime/doc/channel.txt b/runtime/doc/channel.txt --- a/runtime/doc/channel.txt +++ b/runtime/doc/channel.txt @@ -1,4 +1,4 @@ -*channel.txt* For Vim version 7.4. Last change: 2016 Apr 30 +*channel.txt* For Vim version 7.4. Last change: 2016 May 19 VIM REFERENCE MANUAL by Bram Moolenaar @@ -146,11 +146,19 @@ Use |ch_status()| to see if the channel For all callbacks: Use |function()| to bind it to arguments and/or a Dictionary. Or use the form "dict.function" to bind the Dictionary. + + Callbacks are only called at a "safe" moment, usually when Vim + is waiting for the user to type a character. Vim does not use + multi-threading. + *close_cb* "close_cb" A function that is called when the channel gets closed, other than by calling ch_close(). It should be defined like this: > func MyCloseHandler(channel) -< *waittime* +< Vim will invoke callbacks that handle data before invoking + close_cb, thus when this function is called no more data will + be received. + *waittime* "waittime" The time to wait for the connection to be made in milliseconds. A negative number waits forever. @@ -572,6 +580,8 @@ See |job_setoptions()| and |ch_setoption Vim checks about every 10 seconds for jobs that ended. The callback can also be triggered by calling |job_status()|. + Note that data can be buffered, callbacks may still be + called after the process ends. *job-timeout* "timeout" The time to wait for a request when blocking, E.g. when using ch_evalexpr(). In milliseconds. The diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2016 May 05 +*eval.txt* For Vim version 7.4. Last change: 2016 May 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3645,7 +3645,7 @@ function({name} [, {arglist}] [, {dict}] let Broken = function(dict.Func, [arg], dict) < When {arglist} or {dict} is present this creates a partial. - That mans the argument list and/or the dictionary is stored in + That means the argument list and/or the dictionary is stored in the Funcref and will be used when the Funcref is called. The arguments are passed to the function in front of other @@ -7188,8 +7188,9 @@ timer_start({time}, {callback} [, {optio {only available when compiled with the |+timers| feature} timer_stop({timer}) *timer_stop()* - Stop a timer. {timer} is an ID returned by timer_start(). - The timer callback will no longer be invoked. + Stop a timer. The timer callback will no longer be invoked. + {timer} is an ID returned by timer_start(), thus it must be a + Number. tolower({expr}) *tolower()* The result is a copy of the String given, with all uppercase diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2016 Apr 21 +*options.txt* For Vim version 7.4. Last change: 2016 May 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3635,7 +3635,7 @@ A jump table for the options with a shor SYMBOL, THAI, TURKISH, VIETNAMESE ANSI and BALTIC. Normally you would use "cDEFAULT". qXX - quality XX. Valid quality names are: PROOF, DRAFT, - ANTIALIASED, UNANTIALIASED, CLEARTYPE, DEFAULT. + ANTIALIASED, NONANTIALIASED, CLEARTYPE, DEFAULT. Normally you would use "qDEFAULT". Some quality values isn't supported in legacy OSs. diff --git a/runtime/doc/tags b/runtime/doc/tags --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1261,6 +1261,7 @@ +mzscheme/dyn various.txt /*+mzscheme\/dyn* +netbeans_intg various.txt /*+netbeans_intg* +ole various.txt /*+ole* ++packages various.txt /*+packages* +path_extra various.txt /*+path_extra* +perl various.txt /*+perl* +perl/dyn various.txt /*+perl\/dyn* 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 May 08 +*todo.txt* For Vim version 7.4. Last change: 2016 May 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,7 +34,13 @@ not be repeated below, unless there is e *known-bugs* -------------------- Known bugs and current work ----------------------- -Crash when running a job a second time. (stewart, May 4) +Close_cb crash. (Luc Hermitte, 2016 May 10) +Stack trace by Dominique, May 10. +Reference count in partial dict wrong? + +Any other callbacks that could be invoked at the wrong moment? + +If removing buffer that's being read from, close channel? problem with "Ignore" after adding 'guicolors'. (Charles Campbell, 2016 Apr 27) @@ -55,14 +61,37 @@ Packages: Vim.org: when a user already has a homepage, do show the field so that it can be deleted. +Patch to fix memory leak (Justin Keyes, 2016 May 16, #811) +Instead free before assigning, set to NULL after free. + +Comparing partials doesn't work well. (Nikolai Pavlov, 2016 May 17, #813) +Examples in the form of a test (May 19) + +Documentation for partials is lacking. +- Add "partial" and "partials" tag. +- Assigning to a dict member creates a partial. + How to store a partial associated with dictA in dictB? Add help for this. + See comments on #812. +- using dict.Func for function() is broken: not true (Nikolai Pavlov, May 20) + +Patch to fix that BufUnload is triggered twice. (Hirohito Higashi, 2016 May +14) + +channel: -- When running "echo hello" the job remains defunc. (Nicola, May 7) - Feedback from Ramel Eshed, May 7. Occasional crashes. +- Close_cb isn't invoked when output goes to a buffer. (Luc Hermitte) +- close_cb and exit_cb not invoked when using jo_stop() on Windows. + (Linwei, 2016 May 18, #817) + Similar problem, related to keeping reference to job. (Skywind, May 18) +- Recursive callback call? (Luc Hermitte, 2016 May 17) - GUI:cursor blinking is irregular when invoking callbacks. (Ramel Eshed, 2016 Apr 16) somehow remember the previous state? - 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. +- Inefficiency in ch_read() with very long lines. Reallocating buffer with + small increments in channel_collapse(). Avoid calling strlen() too often. + Add an option to drop text of very long lines? Default to 1 Mbyte. - Add remark about undo sync, is there a way to force it? - 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, @@ -148,7 +177,13 @@ Patch to fix escaping special characters Invalid behavior with NULL list. (Nikolai Pavlov, #768) -After patch 7.4.1818 the language is removed too often. (Ken Takata, 2016 May +Patch to fix using CTRL-] on "{address}." in help. (Hirohito Higashi, 2016 May +18, #814) + +&t_ut not used with 'termguicolors' is set. (Jacob Niehus, 2016 May 14, #804) +Patch to fix this, Jacob Niehus, 2016 May 14, #805) + +For current Windows build .pdb file is missing. (Gabriele Fava, 2016 May 11) 5) When 'autochdir' is set, writing new file does not change the current dir. @@ -181,6 +216,10 @@ Patch for C syntax HL. (Bradley Garagan, Patch to make matchit work better, respect 'matchpairs'. (Ken Takata, 2016 Mar 25) +Possibly wrong value for seq_cur. (Florent Fayolle, 2016 May 15, #806) + +Patch to improve map documentation. Issue #799. + We can use '. to go to the last change in the current buffer, but how about the last change in any buffer? Can we use ', (, is next to .)? @@ -206,6 +245,12 @@ Update 2016 Mar 28. Can include all par Patch to support 64 bit ints for Number. (Ken Takata, 2016 Jan 21) Update 2016 Apr 24. +Patch for groovy multi-line comment highlighting. (Justin M. Keyes, 2016 May +20 #644) + +When doing "vi buf.md" a BufNew autocommand for *.md is not triggered. +Because of using the initial buffer? (Dun Peal, 2016 May 12) + Patch to add the :bvimgrep command. (Christian Brabandt, 2014 Nov 12) Updated 2016 Feb 10 diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -1,4 +1,4 @@ -*version8.txt* For Vim version 8.0. Last change: 2016 Apr 14 +*version8.txt* For Vim version 8.0. Last change: 2016 May 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -13,10 +13,8 @@ found below |vim-7.4|. Use this command :version See |vi_diff.txt| for an overview of differences between Vi and Vim 7.0. -See |version4.txt| for differences between Vim 3.x and Vim 4.x. -See |version5.txt| for differences between Vim 4.x and Vim 5.x. -See |version6.txt| for differences between Vim 5.x and Vim 6.x. -See |version7.txt| for differences between Vim 6.x and Vim 7.x. +See |version4.txt|, |version5.txt|, |version6.txt| and |version7.txt| for +differences between other versions. INCOMPATIBLE CHANGES |incompatible-8| diff --git a/runtime/pack/dist/opt/matchit/plugin/matchit.vim b/runtime/pack/dist/opt/matchit/plugin/matchit.vim --- a/runtime/pack/dist/opt/matchit/plugin/matchit.vim +++ b/runtime/pack/dist/opt/matchit/plugin/matchit.vim @@ -2,6 +2,7 @@ " Last Change: Fri Jan 25 10:00 AM 2008 EST " Maintainer: Benji Fisher PhD " Version: 1.13.2, for Vim 6.3+ +" Fix from Fernando Torres included. " URL: http://www.vim.org/script.php?script_id=39 " Documentation: @@ -122,7 +123,6 @@ function! s:Match_wrapper(word, forward, " Thanks to Preben "Peppe" Guldberg and Bram Moolenaar for this suggestion! if (match_words != s:last_words) || (&mps != s:last_mps) || \ exists("b:match_debug") - let s:last_words = match_words let s:last_mps = &mps " The next several lines were here before " BF started messing with this script. @@ -134,6 +134,7 @@ function! s:Match_wrapper(word, forward, \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>' " s:all = pattern with all the keywords let match_words = match_words . (strlen(match_words) ? "," : "") . default + let s:last_words = match_words if match_words !~ s:notslash . '\\\d' let s:do_BR = 0 let s:pat = match_words diff --git a/runtime/plugin/manpager.vim b/runtime/plugin/manpager.vim --- a/runtime/plugin/manpager.vim +++ b/runtime/plugin/manpager.vim @@ -1,6 +1,6 @@ " Vim plugin for using Vim as manpager. " Maintainer: Enno Nagel -" Last Change: 2016 May 07 +" Last Change: 2016 May 20 " $MAN_PN is supposed to be set by MANPAGER, see ":help manpager.vim". if empty($MAN_PN) @@ -25,5 +25,5 @@ function! s:MANPAGER() bwipe! setlocal filetype=man - exe 'Man' page_sec[1] page_sec[0] + exe 'Man' page_sec[2] page_sec[1] endfunction diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim --- a/runtime/syntax/debchangelog.vim +++ b/runtime/syntax/debchangelog.vim @@ -3,7 +3,7 @@ " Maintainer: Debian Vim Maintainers " Former Maintainers: Gerfried Fuchs " Wichert Akkerman -" Last Change: 2015 Oct 24 +" Last Change: 2016 Apr 24 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim " Standard syntax initialization @@ -23,7 +23,7 @@ let binNMU='binary-only=yes' syn match debchangelogName contained "^[[:alnum:]][[:alnum:].+-]\+ " exe 'syn match debchangelogFirstKV contained "; \('.urgency.'\|'.binNMU.'\)"' exe 'syn match debchangelogOtherKV contained ", \('.urgency.'\|'.binNMU.'\)"' -syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial)%(-%(security|proposed|updates|backports|commercial|partner))=)+" +syn match debchangelogTarget contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety)%(-%(security|proposed|updates|backports|commercial|partner))=)+" syn match debchangelogVersion contained "(.\{-})" syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*" syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*" diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim --- a/runtime/syntax/debsources.vim +++ b/runtime/syntax/debsources.vim @@ -2,7 +2,7 @@ " Language: Debian sources.list " Maintainer: Debian Vim Maintainers " Former Maintainer: Matthijs Mohlmann -" Last Change: 2015 Oct 24 +" Last Change: 2016 Apr 24 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim " Standard syntax initialization @@ -27,7 +27,7 @@ let s:supported = [ \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental', \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy', \ - \ 'precise', 'trusty', 'vivid', 'wily', 'xenial', 'devel' + \ 'precise', 'trusty', 'wily', 'xenial', 'yakkety', 'devel' \ ] let s:unsupported = [ \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', @@ -36,7 +36,7 @@ let s:unsupported = [ \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty', \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid', \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy', - \ 'utopic' + \ 'utopic', 'vivid' \ ] let &cpo=s:cpo diff --git a/runtime/tools/ccfilter.c b/runtime/tools/ccfilter.c --- a/runtime/tools/ccfilter.c +++ b/runtime/tools/ccfilter.c @@ -309,7 +309,7 @@ int main( int argc, char *argv[] ) ok = sscanf( p, "make[%*d]: Entering directory `%[^']", BasePath ); if (verbose) - printf( "[%u]?%s\n", ok, Line ); + printf( "[%u]?%s\n", (unsigned)ok, Line ); } else {