summaryrefslogtreecommitdiff
path: root/src/term.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-02-12 14:29:27 +0000
committerBram Moolenaar <Bram@vim.org>2005-02-12 14:29:27 +0000
commit4399ef4764584a24080670b4869cb8b5d31a4f78 (patch)
treec47e4671d16eeeadc9aa0b9a9cb19576e7c653b9 /src/term.c
parentb11bd7e43f6cdca944dceebaa3c8012d6bf1a74e (diff)
downloadvim-git-4399ef4764584a24080670b4869cb8b5d31a4f78.tar.gz
updated for version 7.0050
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/term.c b/src/term.c
index a471c1e0c..386b05cf5 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2991,6 +2991,9 @@ win_new_shellsize()
ui_new_shellsize();
if (old_Rows != Rows)
{
+ /* if 'window' uses the whole screen, keep it using that */
+ if (p_window == old_Rows - 1)
+ p_window = Rows - 1;
old_Rows = Rows;
shell_new_rows(); /* update window sizes */
}
@@ -3234,6 +3237,8 @@ stoptermcap()
* echoed.
* Only do this after termcap mode has been started, otherwise the codes for
* the cursor keys may be wrong.
+ * On Unix only do it when both output and input are a tty (avoid writing
+ * request to terminal while reading from a file).
* The result is caught in check_termcode().
*/
static void
@@ -3244,6 +3249,7 @@ may_req_termresponse()
&& termcap_active
#ifdef UNIX
&& isatty(1)
+ && isatty(read_cmd_fd)
#endif
&& *T_CRV != NUL)
{