To: vim_dev@googlegroups.com Subject: Patch 8.2.2307 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2307 Problem: A shell command in the vimrc causes terminal output. Solution: Do not call starttermcap() after a shell command if the termcap wasn't active before. Files: src/ex_cmds.c *** ../vim-8.2.2306/src/ex_cmds.c 2021-01-04 12:41:49.503891371 +0100 --- src/ex_cmds.c 2021-01-07 14:34:24.127592614 +0100 *************** *** 1360,1367 **** #endif #ifdef MSWIN int winstart = FALSE; - int keep_termcap = FALSE; #endif /* * Disallow shell commands for "rvim". --- 1360,1367 ---- #endif #ifdef MSWIN int winstart = FALSE; #endif + int keep_termcap = !termcap_active; /* * Disallow shell commands for "rvim". *************** *** 1395,1403 **** msg_putchar('\r'); // put cursor at start of line if (!autocmd_busy) { - #ifdef MSWIN if (!keep_termcap) - #endif stoptermcap(); } #ifdef MSWIN --- 1395,1401 ---- *************** *** 1488,1496 **** } #endif // FEAT_GUI_MSWIN - #ifdef MSWIN if (!keep_termcap) // if keep_termcap is TRUE didn't stop termcap - #endif starttermcap(); // start termcap if not done by wait_return() /* --- 1486,1492 ---- *** ../vim-8.2.2306/src/version.c 2021-01-06 21:59:35.178021925 +0100 --- src/version.c 2021-01-07 14:29:21.140600723 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2307, /**/ -- hundred-and-one symptoms of being an internet addict: 97. Your mother tells you to remember something, and you look for a File/Save command. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///