summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-08 21:52:22 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-08 21:52:22 +0200
commit292d5699356dc4a22fcfbab92f0a558e90f7cfba (patch)
treed77d02f0b679077b13202c2da5eeb8c5551e4519
parent7fadbf83256bb823b994a52758127594dd82ab39 (diff)
downloadvim-git-292d5699356dc4a22fcfbab92f0a558e90f7cfba.tar.gz
patch 8.0.0892: when opening a terminal the pty size doesn't always matchv8.0.0892
Problem: When opening a terminal the pty size doesn't always match. Solution: Update the pty size after opening the terminal. (Ken Takata)
-rw-r--r--src/terminal.c7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 9743468f2..32f2266a7 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -43,9 +43,11 @@
* - add option values to the command:
* :term <24x80> <close> vim notes.txt
* - support different cursor shapes, colors and attributes
- * - MS-Windows: no redraw for 'updatetime' #1915
* - make term_getcursor() return type (none/block/bar/underline) and
* attributes (color, blink, etc.)
+ * - MS-Windows: no redraw for 'updatetime' #1915
+ * - term_getline() and term_scrape() don't work once the job exited. Use the
+ * buffer and scrollback, remembering the topline from when the job exited.
* - To set BS correctly, check get_stty(); Pass the fd of the pty.
* For the GUI fill termios with default values, perhaps like pangoterm:
* http://bazaar.launchpad.net/~leonerd/pangoterm/trunk/view/head:/main.c#L134
@@ -337,8 +339,9 @@ term_start(char_u *cmd, jobopt_T *opt)
/* System dependent: setup the vterm and start the job in it. */
if (term_and_job_init(term, term->tl_rows, term->tl_cols, cmd, opt) == OK)
{
- /* store the size we ended up with */
+ /* Get and remember the size we ended up with. Update the pty. */
vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols);
+ term_report_winsize(term, term->tl_rows, term->tl_cols);
}
else
{
diff --git a/src/version.c b/src/version.c
index 6b33c3bb6..30d76f1d5 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 */
/**/
+ 892,
+/**/
891,
/**/
890,