Mercurial > vim
changeset 13008:e775011b4c1e v8.0.1380
patch 8.0.1380: using "vim -r swapfile" the hit-enter prompt is misplaced.
commit https://github.com/vim/vim/commit/05684310a53c8a4804441c1c6f8b7fc9e8194940
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 9 15:11:24 2017 +0100
patch 8.0.1380: using "vim -r swapfile" the hit-enter prompt is misplaced.
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 09 Dec 2017 15:15:05 +0100 |
parents | 84c4f8a80bb6 |
children | 59e53800d1fa |
files | src/term.c src/version.c |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -3510,6 +3510,9 @@ may_req_ambiguous_char_width(void) 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,7 +4588,7 @@ check_termcode( is_mac_terminal = TRUE; } # ifdef FEAT_MOUSE_SGR - /* Iterm2 sends 0;95;0 */ + /* iTerm2 sends 0;95;0 */ if (STRNCMP(tp + extra - 2, "0;95;0c", 7) == 0) is_iterm2 = TRUE; # endif @@ -4597,7 +4600,7 @@ check_termcode( { # ifdef FEAT_MOUSE_SGR /* Xterm version 277 supports SGR. Also support - * Terminal.app and iterm2. */ + * Terminal.app and iTerm2. */ if (version >= 277 || is_iterm2 || is_mac_terminal) set_option_value((char_u *)"ttym", 0L, (char_u *)"sgr", 0);