To: vim-dev@vim.org Subject: Patch 7.2b.024 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 7.2b.024 Problem: Using ":gui" while the netrw plugin is active causes a delay in updating the display. Solution: Don't check for terminal codes when starting the GUI. Files: src/term.c *** ../vim-7.2b.023/src/term.c Wed Jun 25 00:11:58 2008 --- src/term.c Sun Jul 27 13:48:06 2008 *************** *** 3196,3206 **** 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(); #endif #ifdef FEAT_MOUSE_TTY if (tmode != TMODE_RAW) --- 3196,3212 ---- if (tmode != TMODE_COOK || cur_tmode != TMODE_COOK) { #ifdef FEAT_TERMRESPONSE ! # 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,3241 **** 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(); #endif } } --- 3238,3253 ---- termcap_active = TRUE; screen_start(); /* don't know where cursor is now */ #ifdef FEAT_TERMRESPONSE ! # 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,3259 **** 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(); #endif out_str(T_KE); /* stop "keypad transmit" mode */ out_flush(); --- 3260,3276 ---- if (termcap_active) { #ifdef FEAT_TERMRESPONSE ! # 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(); *** ../vim-7.2b.023/src/version.c Sun Jul 27 15:56:25 2008 --- src/version.c Tue Jul 29 12:19:40 2008 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 24, /**/ -- A poem: read aloud: <> !*''# Waka waka bang splat tick tick hash, ^"`$$- Caret quote back-tick dollar dollar dash, !*=@$_ Bang splat equal at dollar under-score, %*<> ~#4 Percent splat waka waka tilde number four, &[]../ Ampersand bracket bracket dot dot slash, |{,,SYSTEM HALTED Vertical-bar curly-bracket comma comma CRASH. Fred Bremmer and Steve Kroese (Calvin College & Seminary of Grand Rapids, MI.) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///