To: vim_dev@googlegroups.com Subject: Patch 8.0.1380 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1380 Problem: When recovering a file with "vim -r swapfile" the hit-enter prompt is at the top of the window. Solution: Invalidate the cursor position. Files: src/term.c *** ../vim-8.0.1379/src/term.c 2017-11-20 21:52:18.308289863 +0100 --- src/term.c 2017-12-09 15:11:11.095967983 +0100 *************** *** 3510,3515 **** --- 3510,3518 ---- out_str((char_u *)" "); term_windgoto(0, 0); + /* Need to reset the known cursor position. */ + screen_start(); + /* check for the characters now, otherwise they might be eaten by * get_keystroke() */ out_flush(); *************** *** 4585,4591 **** is_mac_terminal = TRUE; } # ifdef FEAT_MOUSE_SGR ! /* Iterm2 sends 0;95;0 */ if (STRNCMP(tp + extra - 2, "0;95;0c", 7) == 0) is_iterm2 = TRUE; # endif --- 4588,4594 ---- is_mac_terminal = TRUE; } # ifdef FEAT_MOUSE_SGR ! /* iTerm2 sends 0;95;0 */ if (STRNCMP(tp + extra - 2, "0;95;0c", 7) == 0) is_iterm2 = TRUE; # endif *************** *** 4597,4603 **** { # ifdef FEAT_MOUSE_SGR /* Xterm version 277 supports SGR. Also support ! * Terminal.app and iterm2. */ if (version >= 277 || is_iterm2 || is_mac_terminal) set_option_value((char_u *)"ttym", 0L, (char_u *)"sgr", 0); --- 4600,4606 ---- { # ifdef FEAT_MOUSE_SGR /* Xterm version 277 supports SGR. Also support ! * Terminal.app and iTerm2. */ if (version >= 277 || is_iterm2 || is_mac_terminal) set_option_value((char_u *)"ttym", 0L, (char_u *)"sgr", 0); *** ../vim-8.0.1379/src/version.c 2017-12-07 22:29:07.624581042 +0100 --- src/version.c 2017-12-09 15:09:34.056439150 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1380, /**/ -- From "know your smileys": (:-# Said something he shouldn't have /// 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 ///