mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-12 01:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

term: use an argument vector for termopen().

Browse Source 
Old behaviour: termopen('cmd') would run `&shell &shcf "cmd"`, which
caused the functional tests to fail on some systems due to the process
not "owning" the terminal. Also, it is inconsistent with jobstart().

Modify termopen() so that &shell is not invoked, but maintain the old
behaviour with :terminal. Factor the common code for building the
argument vector from jobstart() and modify the functional tests to call
termopen() instead of :terminal (fixes #2354).

Also:
 * Add a 'name' option for termopen() so that `:terminal {cmd}` produces
   a buffer named "term//{cwd}/{cmd}" and termopen() users can customize
   the name.
 * Update the documentation.
 * Add functional tests for `:terminal` sinse its behaviour now differs
   from termopen(). Add "test/functional/fixtures/shell-test.c" and move
   "test/functional/job/tty-test.c" there, too.

Helped-by: Justin M. Keyes <@justinmk>
This commit is contained in:
Scott Prager
2015-04-13 23:53:16 -04:00
parent 2054668302
commit 74aef89720
13 changed files with 187 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/ex_docmd.c
View File

@@ -9410,9 +9410,26 @@ static void ex_folddo(exarg_T *eap)
static void ex_terminal(exarg_T *eap)
{
char *name = NULL;
char cmd[512];
snprintf(cmd, sizeof(cmd), ":enew%s | call termopen('%s') | startinsert",
eap->forceit==TRUE ? "!" : "",
strcmp((char *)eap->arg, "") ? (char *)eap->arg : (char *)p_sh);
do_cmdline_cmd((uint8_t *)cmd);
if (strcmp((char *)eap->arg, "") == 0) {
snprintf(cmd, sizeof(cmd), "['%s']", (char *)p_sh);
name = (char *)p_sh;
} else {
// Escape quotes and slashes so they get sent literally.
name = (char *)vim_strsave_escaped(eap->arg, (char_u *)"\"\\");
snprintf(cmd, sizeof(cmd), "['%s','%s',\"%s\"]",
(char *)p_sh, (char *)p_shcf, name);
}
char ex_cmd[512];
snprintf(ex_cmd, sizeof(ex_cmd),
":enew%s | call termopen(%s, {'name':\"%s\"}) | startinsert",
eap->forceit==TRUE ? "!" : "", cmd, name);
do_cmdline_cmd((uint8_t *)ex_cmd);
if (name != (char *)p_sh) {
xfree(name);
}
}