From 9755a2ffd5727c7fc0576e60a21368618978c504 Mon Sep 17 00:00:00 2001
From: Grzegorz Milka <grzegorzmilka@gmail.com>
Date: Tue, 18 Oct 2016 02:02:47 +0200
Subject: vim-patch:7.4.2312

Problem:    Crash when autocommand moves to another tab. (Dominique Pelle)
Solution:   When navigating to another window halfway the :edit command go
            back to the right window.

https://github.com/vim/vim/commit/5a49789a9b1f6447aeafbbbdd5b235dd10c471d5
---
 src/nvim/ex_getln.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/nvim/ex_getln.c')

diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 7444eb8a38..a58cdd5c6b 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -1688,10 +1688,14 @@ int text_locked(void) {
  */
 void text_locked_msg(void)
 {
+  EMSG(_(get_text_locked_msg()));
+}
+
+char_u * get_text_locked_msg(void) {
   if (cmdwin_type != 0)
-    EMSG(_(e_cmdwin));
+    return e_cmdwin;
   else
-    EMSG(_(e_secure));
+    return e_secure;
 }
 
 /*
-- 
cgit