diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-08-29 22:44:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-08-29 22:44:59 +0200 |
| commit | e561a7e2fa511d643c9692d26f4cf65378fd1983 (patch) | |
| tree | cf6dc86878bcd2fa7a9d8baf467e66e3427f390c /src | |
| parent | 48340b62e812dc9280f621a2eb6db76d43555c66 (diff) | |
patch 8.0.1013: terminal window behaves different from a buffer with changesv8.0.1013
Problem: A terminal window with a running job behaves different from a
window containing a changed buffer.
Solution: Do not set 'bufhidden' to "hide". Fix that a buffer where a
terminal used to run is listed as "[Scratch]".
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.c | 4 | ||||
| -rw-r--r-- | src/terminal.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/buffer.c b/src/buffer.c index f64255d785..e95abfa5af 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5825,8 +5825,8 @@ buf_spname(buf_T *buf) if (buf->b_term != NULL) return term_get_status_text(buf->b_term); #endif - if (buf->b_sfname != NULL) - return buf->b_sfname; + if (buf->b_fname != NULL) + return buf->b_fname; return (char_u *)_("[Scratch]"); } diff --git a/src/terminal.c b/src/terminal.c index 288ad28eb6..b2a3e7f3d3 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -44,10 +44,7 @@ * - add test for giving error for invalid 'termsize' value. * - support minimal size when 'termsize' is "rows*cols". * - support minimal size when 'termsize' is empty? - * - do not set bufhidden to "hide"? works like a buffer with changes. - * document that CTRL-W :hide can be used. * - GUI: when using tabs, focus in terminal, click on tab does not work. - * - When $HOME was set by Vim (MS-Windows), do not pass it to the job. * - GUI: when 'confirm' is set and trying to exit Vim, dialog offers to save * changes to "!shell". * (justrajdeep, 2017 Aug 22) @@ -399,10 +396,6 @@ term_start(typval_T *argvar, jobopt_T *opt, int forceit) * the job finished. */ curbuf->b_p_ma = FALSE; - /* Set 'bufhidden' to "hide": allow closing the window. */ - set_string_option_direct((char_u *)"bufhidden", -1, - (char_u *)"hide", OPT_FREE|OPT_LOCAL, 0); - set_term_and_win_size(term); setup_job_options(opt, term->tl_rows, term->tl_cols); diff --git a/src/version.c b/src/version.c index 3be91c249a..26604fd135 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1013, +/**/ 1012, /**/ 1011, |