Mercurial > vim

diff src/evalwindow.c @ 19291:1d6bc6b31c2e v8.2.0204

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0204: crash when using winnr('j') in a popup window Commit: https://github.com/vim/vim/commit/631ebc48149a0446dd9ffbddd3e2822252085885 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Feb 3 22:15:26 2020 +0100 patch 8.2.0204: crash when using winnr('j') in a popup window Problem: Crash when using winnr('j') in a popup window. Solution: Do not search for neighbors in a popup window. (closes https://github.com/vim/vim/issues/5568)
author Bram Moolenaar <Bram@vim.org>
date Mon, 03 Feb 2020 22:30:03 +0100
parents 3856047f2211
children f0033a10b613
line wrap: on
line diff
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -332,8 +332,6 @@ get_winnr(tabpage_T *tp, typval_T *argva
 	else if (STRCMP(arg, "#") == 0)
 	{
 	    twin = (tp == curtab) ? prevwin : tp->tp_prevwin;
-	    if (twin == NULL)
-		nr = 0;
 	}
 	else
 	{
@@ -360,6 +358,8 @@ get_winnr(tabpage_T *tp, typval_T *argva
 	    else
 		invalid_arg = TRUE;
 	}
+	if (twin == NULL)
+	    nr = 0;
 
 	if (invalid_arg)
 	{