diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 3edc1a224..a59bbd1bb 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2140,8 +2140,8 @@ do_one_cmd(cmdlinep, sourcing,
 
 #ifdef FEAT_WINDOWS
 	/* :wincmd range depends on the argument. */
-	if (ea.cmdidx == CMD_wincmd)
-	    get_wincmd_addr_type(p, &ea);
+	if (ea.cmdidx == CMD_wincmd && p != NULL)
+	    get_wincmd_addr_type(skipwhite(p), &ea);
 #endif
     }
 
diff --git a/src/version.c b/src/version.c
index e6ab37e5a..cdde7ca52 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    580,
 /**/
     579,
 /**/