From b50d8f2c89d5955fd923722d8f65a5be3b96b7ca Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Sun, 10 Dec 2017 01:28:15 +0000
Subject: [PATCH] Fix installing `gocode` on Windows (#1606)

Was missing a space in composing the command, so this would get run:

  go get -v -u -ldflags -H=windowsgui"github.com/nsf/gocode"
---
 CHANGELOG.md  | 2 ++
 plugin/go.vim | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86fc2b8d2..e73b8c64db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,6 +59,8 @@ BUG FIXES:
   [[GH-1581]](https://github.com/fatih/vim-go/pull/1581).
 * Add `g:go_highlight_function_arguments` to highlight function arguments.
   [[GH-1587]](https://github.com/fatih/vim-go/pull/1587).
+* Fix installation of `gocode` on MS-Windows.
+  [[GH-1606]](https://github.com/fatih/vim-go/pull/1606).
 
 BACKWARDS INCOMPATIBILITIES:
 
diff --git a/plugin/go.vim b/plugin/go.vim
index 3754090acb..bb88608f4f 100644
--- a/plugin/go.vim
+++ b/plugin/go.vim
@@ -146,7 +146,7 @@ function! s:GoInstallBinaries(updateBinaries, ...)
         echo "vim-go: ". binary ." not found. Installing ". importPath . " to folder " . go_bin_path
       endif
 
-      let out = go#util#System(cmd . l:goGetFlags . shellescape(importPath))
+      let out = go#util#System(printf('%s %s %s', cmd, l:goGetFlags, shellescape(importPath)))
       if go#util#ShellError() != 0
         echom "Error installing " . importPath . ": " . out
       endif