diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-07-29 10:22:12 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-07-29 10:22:12 +0000 |
| commit | 2bf6a2d7818bff5620ac47d99eaafd1b62a003e5 (patch) | |
| tree | 8d2782d6c5a52f918b520897e1b12f1653c2263c | |
| parent | 9bf749bc5b94d739da0c6e1900737361b9464a7e (diff) | |
updated for version 7.2b-024v7.2b.024
| -rw-r--r-- | src/term.c | 47 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 34 insertions, 15 deletions
diff --git a/src/term.c b/src/term.c index cbf406cb45..f795144881 100644 --- a/src/term.c +++ b/src/term.c @@ -3196,11 +3196,17 @@ settmode(tmode) if (tmode != TMODE_COOK || cur_tmode != TMODE_COOK) { #ifdef FEAT_TERMRESPONSE - /* May need to check for T_CRV response and termcodes, it doesn't - * work in Cooked mode, an external program may get them. */ - if (tmode != TMODE_RAW && crv_status == CRV_SENT) - (void)vpeekc_nomap(); - check_for_codes_from_term(); +# ifdef FEAT_GUI + if (!gui.in_use && !gui.starting) +# endif + { + /* May need to check for T_CRV response and termcodes, it + * doesn't work in Cooked mode, an external program may get + * them. */ + if (tmode != TMODE_RAW && crv_status == CRV_SENT) + (void)vpeekc_nomap(); + check_for_codes_from_term(); + } #endif #ifdef FEAT_MOUSE_TTY if (tmode != TMODE_RAW) @@ -3232,10 +3238,16 @@ starttermcap() termcap_active = TRUE; screen_start(); /* don't know where cursor is now */ #ifdef FEAT_TERMRESPONSE - may_req_termresponse(); - /* Immediately check for a response. If t_Co changes, we don't want - * to redraw with wrong colors first. */ - check_for_codes_from_term(); +# ifdef FEAT_GUI + if (!gui.in_use && !gui.starting) +# endif + { + may_req_termresponse(); + /* Immediately check for a response. If t_Co changes, we don't + * want to redraw with wrong colors first. */ + if (crv_status != CRV_GET) + check_for_codes_from_term(); + } #endif } } @@ -3248,12 +3260,17 @@ stoptermcap() if (termcap_active) { #ifdef FEAT_TERMRESPONSE - /* May need to check for T_CRV response. */ - if (crv_status == CRV_SENT) - (void)vpeekc_nomap(); - /* Check for termcodes first, otherwise an external program may get - * them. */ - check_for_codes_from_term(); +# ifdef FEAT_GUI + if (!gui.in_use && !gui.starting) +# endif + { + /* May need to check for T_CRV response. */ + if (crv_status == CRV_SENT) + (void)vpeekc_nomap(); + /* Check for termcodes first, otherwise an external program may + * get them. */ + check_for_codes_from_term(); + } #endif out_str(T_KE); /* stop "keypad transmit" mode */ out_flush(); diff --git a/src/version.c b/src/version.c index e15aa43384..4d2baa4265 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 24, +/**/ 23, /**/ 22, |