fix(prompt): add missing changes from v8.1.0036

seandewar · seandewar · commit d6ea0741c92e · 2021-12-07T11:34:26.000Z
v8.1.0036 is already marked as ported, but missed out changes that depended on v8.1.0035.
diff --git a/src/nvim/window.c b/src/nvim/window.c
@@ -2241,12 +2241,21 @@ static void leaving_window(win_T *const win)
   // callback we need to break out of the Insert mode loop.
   if (State & INSERT) {
     stop_insert_mode = true;
+    if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert == NUL) {
+      win->w_buffer->b_prompt_insert = 'A';
+    }
   }
 }
 
 static void entering_window(win_T *const win)
   FUNC_ATTR_NONNULL_ALL
 {
+  // When switching to a prompt buffer that was in Insert mode, don't stop
+  // Insert mode, it may have been set in leaving_window().
+  if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert != NUL) {
+    stop_insert_mode = false;
+  }
+
   // When entering the prompt window may restart Insert mode.
   restart_edit = win->w_buffer->b_prompt_insert;
 }

Original file line number	Diff line number	Diff line change
`@@ -2241,12 +2241,21 @@ static void leaving_window(win_T *const win)`
`2241`	`2241`	`// callback we need to break out of the Insert mode loop.`
`2242`	`2242`	`if (State & INSERT) {`
`2243`	`2243`	`stop_insert_mode = true;`
	`2244`	`+ if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert == NUL) {`
	`2245`	`+ win->w_buffer->b_prompt_insert = 'A';`
	`2246`	`+ }`
`2244`	`2247`	`}`
`2245`	`2248`	`}`
`2246`	`2249`
`2247`	`2250`	`static void entering_window(win_T *const win)`
`2248`	`2251`	`FUNC_ATTR_NONNULL_ALL`
`2249`	`2252`	`{`
	`2253`	`+ // When switching to a prompt buffer that was in Insert mode, don't stop`
	`2254`	`+ // Insert mode, it may have been set in leaving_window().`
	`2255`	`+ if (bt_prompt(win->w_buffer) && win->w_buffer->b_prompt_insert != NUL) {`
	`2256`	`+ stop_insert_mode = false;`
	`2257`	`+ }`
	`2258`	`+`
`2250`	`2259`	`// When entering the prompt window may restart Insert mode.`
`2251`	`2260`	`restart_edit = win->w_buffer->b_prompt_insert;`
`2252`	`2261`	`}`