0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.0.0747: :terminal without an argument doesn't work

Problem:    :terminal without an argument doesn't work.
Solution:   Use the 'shell' option. (Yasuhiro Matsumoto, closes #1860)
This commit is contained in:
Bram Moolenaar
2017-07-22 19:03:32 +02:00
parent 61a6605ea1
commit e173fd0972
2 changed files with 7 additions and 2 deletions

View File

@@ -36,7 +36,6 @@
* up. * up.
* - set buffer options to be scratch, hidden, nomodifiable, etc. * - set buffer options to be scratch, hidden, nomodifiable, etc.
* - set buffer name to command, add (1) to avoid duplicates. * - set buffer name to command, add (1) to avoid duplicates.
* - If [command] is not given the 'shell' option is used.
* - Add a scrollback buffer (contains lines to scroll off the top). * - Add a scrollback buffer (contains lines to scroll off the top).
* Can use the buf_T lines, store attributes somewhere else? * Can use the buf_T lines, store attributes somewhere else?
* - When the job ends: * - When the job ends:
@@ -163,6 +162,7 @@ ex_terminal(exarg_T *eap)
exarg_T split_ea; exarg_T split_ea;
win_T *old_curwin = curwin; win_T *old_curwin = curwin;
term_T *term; term_T *term;
char_u *cmd = eap->arg;
if (check_restricted() || check_secure()) if (check_restricted() || check_secure())
return; return;
@@ -195,8 +195,11 @@ ex_terminal(exarg_T *eap)
set_term_and_win_size(term); set_term_and_win_size(term);
if (cmd == NULL || *cmd == NUL)
cmd = p_sh;
/* System dependent: setup the vterm and start the job in it. */ /* System dependent: setup the vterm and start the job in it. */
if (term_and_job_init(term, term->tl_rows, term->tl_cols, eap->arg) == OK) if (term_and_job_init(term, term->tl_rows, term->tl_cols, cmd) == OK)
{ {
/* store the size we ended up with */ /* store the size we ended up with */
vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols); vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols);

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 */
/**/
747,
/**/ /**/
746, 746,
/**/ /**/