diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-08-29 15:53:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-08-29 15:53:52 +0200 |
| commit | 52a7246f015be40e54007c0c3a1d9e37dc14045a (patch) | |
| tree | fe02ec88208f11b62e7e38c9621de3ffb1b9985d | |
| parent | 96f3a49b3bab421edebff24f070634ae876edd7f (diff) | |
| download | vim-git-52a7246f015be40e54007c0c3a1d9e37dc14045a.tar.gz | |
updated for version 7.4.427v7.4.427
Problem: When an InsertCharPre autocommand executes system() typeahead may
be echoed and messes up the display. (Jacob Niehus)
Solution: Do not set cooked mode when invoked from ":silent".
| -rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
| -rw-r--r-- | src/eval.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9aa97b7f7..688fc38eb 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -6093,6 +6093,12 @@ system({expr} [, {input}]) *system()* *E677* list items converted to NULs). Pipes are not used. + When prepended by |:silent| the shell will not be set to + cooked mode. This is meant to be used for commands that do + not need the user to type. It avoids stray characters showing + up on the screen which require |CTRL-L| to remove. > + :silent let f = system('ls *.vim') +< Note: Use |shellescape()| or |::S| with |expand()| or |fnamemodify()| to escape special characters in a command argument. Newlines in {expr} may cause the command to fail. diff --git a/src/eval.c b/src/eval.c index a8e94639d..7bf52c5f3 100644 --- a/src/eval.c +++ b/src/eval.c @@ -18594,6 +18594,7 @@ get_cmd_output_as_rettv(argvars, rettv, retlist) int err = FALSE; FILE *fd; list_T *list = NULL; + int flags = SHELL_SILENT; rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; @@ -18643,6 +18644,11 @@ get_cmd_output_as_rettv(argvars, rettv, retlist) } } + /* Omit SHELL_COOKED when invoked with ":silent". Avoids that the shell + * echoes typeahead, that messes up the display. */ + if (!msg_silent) + flags += SHELL_COOKED; + if (retlist) { int len; @@ -18652,8 +18658,7 @@ get_cmd_output_as_rettv(argvars, rettv, retlist) char_u *end; int i; - res = get_cmd_output(get_tv_string(&argvars[0]), infile, - SHELL_SILENT | SHELL_COOKED, &len); + res = get_cmd_output(get_tv_string(&argvars[0]), infile, flags, &len); if (res == NULL) goto errret; @@ -18694,8 +18699,7 @@ get_cmd_output_as_rettv(argvars, rettv, retlist) } else { - res = get_cmd_output(get_tv_string(&argvars[0]), infile, - SHELL_SILENT | SHELL_COOKED, NULL); + res = get_cmd_output(get_tv_string(&argvars[0]), infile, flags, NULL); #ifdef USE_CR /* translate <CR> into <NL> */ if (res != NULL) diff --git a/src/version.c b/src/version.c index 0d569f7f9..d43534a11 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 427, +/**/ 426, /**/ 425, |