From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 9 Dec 2017 14:11:24 +0000 (+0100)
Subject: patch 8.0.1380: using "vim -r swapfile" the hit-enter prompt is misplaced.
X-Git-Tag: v8.0.1380
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05684310a53c8a4804441c1c6f8b7fc9e8194940;p=vim

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.
---

diff --git a/src/term.c b/src/term.c
index 4e38bae5f..ffa3944d6 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 6cb6e2cd3..fad2fdc05 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1390,
 /**/
     1379,
 /**/