aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.0.0884: can't specify the wait time for term_wait()

Browse Source 
Problem:    Can't specify the wait time for term_wait().
Solution:   Add an otional second argument.
This commit is contained in:
Bram Moolenaar
2017-08-06 19:07:08 +02:00
parent 1c864093f9
commit f3402b1b7f
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/eval.txt
View File

@@ -2381,7 +2381,7 @@ term_list() List get the list of terminal buffers
term_scrape({buf}, {row}) List get row of a terminal screen term_scrape({buf}, {row}) List get row of a terminal screen
term_sendkeys({buf}, {keys}) none send keystrokes to a terminal term_sendkeys({buf}, {keys}) none send keystrokes to a terminal
term_start({cmd}, {options}) Job open a terminal window and run a job term_start({cmd}, {options}) Job open a terminal window and run a job
term_wait({buf}) Number wait for screen to be updated term_wait({buf} [, {time}]) Number wait for screen to be updated
test_alloc_fail({id}, {countdown}, {repeat}) test_alloc_fail({id}, {countdown}, {repeat})
none make memory allocation fail none make memory allocation fail
test_autochdir() none enable 'autochdir' during startup test_autochdir() none enable 'autochdir' during startup
@@ -8041,9 +8041,11 @@ term_start({cmd}, {options}) *term_start()*
the command name. the command name.
{only available when compiled with the |+terminal| feature} {only available when compiled with the |+terminal| feature}
term_wait({buf}) *term_wait()* term_wait({buf} [, {time}]) *term_wait()*
Wait for pending updates of {buf} to be handled. Wait for pending updates of {buf} to be handled.
{buf} is used as with |term_getsize()|. {buf} is used as with |term_getsize()|.
{time} is how long to wait for updates to arrive in msec. If
not set then 10 msec will be used.
{only available when compiled with the |+terminal| feature} {only available when compiled with the |+terminal| feature}
test_alloc_fail({id}, {countdown}, {repeat}) *test_alloc_fail()* test_alloc_fail({id}, {countdown}, {repeat}) *test_alloc_fail()*

2
src/evalfunc.c
View File

@@ -843,7 +843,7 @@ static struct fst
{"term_scrape", 2, 2, f_term_scrape}, {"term_scrape", 2, 2, f_term_scrape},
{"term_sendkeys", 2, 2, f_term_sendkeys}, {"term_sendkeys", 2, 2, f_term_sendkeys},
{"term_start", 1, 2, f_term_start}, {"term_start", 1, 2, f_term_start},
{"term_wait", 1, 1, f_term_wait}, {"term_wait", 1, 2, f_term_wait},
#endif #endif
{"test_alloc_fail", 3, 3, f_test_alloc_fail}, {"test_alloc_fail", 3, 3, f_test_alloc_fail},
{"test_autochdir", 0, 0, f_test_autochdir}, {"test_autochdir", 0, 0, f_test_autochdir},

10
src/terminal.c
View File

@@ -36,7 +36,6 @@
* that buffer, attributes come from the scrollback buffer tl_scrollback. * that buffer, attributes come from the scrollback buffer tl_scrollback.
* *
* TODO: * TODO:
* - Add argument to term_wait() for waiting time.
* - For the scrollback buffer store lines in the buffer, only attributes in * - For the scrollback buffer store lines in the buffer, only attributes in
* tl_scrollback. * tl_scrollback.
* - When the job ends: * - When the job ends:
@@ -2248,12 +2247,15 @@ f_term_wait(typval_T *argvars, typval_T *rettv UNUSED)
} }
else else
{ {
long wait = 10L;
mch_check_messages(); mch_check_messages();
parse_queued_messages(); parse_queued_messages();
/* Wait for 10 msec for any channel I/O. */ /* Wait for some time for any channel I/O. */
/* TODO: use delay from optional argument */ if (argvars[1].v_type != VAR_UNKNOWN)
ui_delay(10L, TRUE); wait = get_tv_number(&argvars[1]);
ui_delay(wait, TRUE);
mch_check_messages(); mch_check_messages();
/* Flushing messages on channels is hopefully sufficient. /* Flushing messages on channels is hopefully sufficient.

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
884,
/**/ /**/
883, 883,
/**/ /**/