From 838c9aa31d7ad996206dc7879b18c13b2f8c5555 Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Sun, 19 Apr 2015 20:14:01 -0300
Subject: vim-patch:7.4.580

Problem:    ":52wincmd v" still gives an invalid range error. (Charles
            Campbell)
Solution:   Skip over white space.

https://code.google.com/p/vim/source/detail?name=v7-4-580
---
 src/nvim/ex_docmd.c | 4 ++--
 src/nvim/version.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 8c293efd58..646d64f9f8 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1518,8 +1518,8 @@ static char_u * do_one_cmd(char_u **cmdlinep,
       ea.addr_type = ADDR_LINES;
     }
     // :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);
     }
   }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index fd5f17a838..84a01585fd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -199,7 +199,7 @@ static int included_patches[] = {
   //583 NA
   //582,
   //581,
-  //580,
+  580,
   //579,
   578,
   //577,
-- 
cgit