patch 9.1.0664: MS-Windows: console vim did not switch back to main screen on exit
Commit: https://github.com/vim/vim/commit/568cbc92a6637ef9272490fb0361adb73f158cfc Author: Ken Takata <ken...@csc.jp> Date: Wed Aug 7 21:18:24 2024 +0200 patch 9.1.0664: MS-Windows: console vim did not switch back to main screen on exit Problem: MS-Windows: console vim did not switch back to main screen on exit Solution: switch back to main screen on exit (Ken Takata) `vim.exe --cmd quit` quitted without switching back to the main screen buffer and the alternate screen buffer was kept shown. Restore the main screen buffer even when termcap mode has not been started. closes: #15443 Signed-off-by: Ken Takata <ken...@csc.jp> Signed-off-by: Christian Brabandt <c...@256bit.org> diff --git a/src/os_win32.c b/src/os_win32.c index 44d92c0f4..6384ac873 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -3561,6 +3561,10 @@ mch_exit_c(int r) vtp_exit(); stoptermcap(); + // Switch back to main screen buffer. + if (use_alternate_screen_buffer) + vtp_printf(" [?1049l"); + if (g_fWindInitCalled) settmode(TMODE_COOK); @@ -6334,10 +6338,6 @@ termcap_mode_end(void) RestoreConsoleBuffer(cb, p_rs); restore_console_color_rgb(); - // Switch back to main screen buffer. - if (exiting && use_alternate_screen_buffer) - vtp_printf(" [?1049l"); - if (!USE_WT && (p_rs || exiting)) { /* diff --git a/src/version.c b/src/version.c index c4ade6f4f..ce5894f89 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 664, /**/ 663, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/E1sbmMK-003yrD-E6%40256bit.org.