diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-12-09 15:11:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-12-09 15:11:24 +0100 |
| commit | 05684310a53c8a4804441c1c6f8b7fc9e8194940 (patch) | |
| tree | 8dce40f552454f3d0c3aeb4a1ec736adcf655c23 | |
| parent | e4b78e2a42e9030348770764c478b73caa925539 (diff) | |
patch 8.0.1380: using "vim -r swapfile" the hit-enter prompt is misplaced.v8.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.
| -rw-r--r-- | src/term.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index 4e38bae5f9..ffa3944d69 100644 --- 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); diff --git a/src/version.c b/src/version.c index 6cb6e2cd36..fad2fdc05b 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1390, +/**/ 1379, /**/ 1378, |