From 8a39ee361feb9bf46d728ff1ba4f07ca1d9610b1 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Thu, 19 Jun 2014 09:22:53 +0200
Subject: Imported Upstream version 1.3

---
 misc/vim/ftplugin/go.vim     | 4 +++-
 misc/vim/ftplugin/go/fmt.vim | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'misc/vim/ftplugin')

diff --git a/misc/vim/ftplugin/go.vim b/misc/vim/ftplugin/go.vim
index 8066733cf..532fb1723 100644
--- a/misc/vim/ftplugin/go.vim
+++ b/misc/vim/ftplugin/go.vim
@@ -9,9 +9,11 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
+setlocal formatoptions-=t
+
 setlocal comments=s1:/*,mb:*,ex:*/,://
 setlocal commentstring=//\ %s
 
-let b:undo_ftplugin = "setl com< cms<"
+let b:undo_ftplugin = "setl fo< com< cms<"
 
 " vim:ts=4:sw=4:et
diff --git a/misc/vim/ftplugin/go/fmt.vim b/misc/vim/ftplugin/go/fmt.vim
index 5f7976f5f..359545bd4 100644
--- a/misc/vim/ftplugin/go/fmt.vim
+++ b/misc/vim/ftplugin/go/fmt.vim
@@ -57,7 +57,7 @@ function! s:GoFormat()
         endif
         undo
         if !empty(errors)
-            call setloclist(0, errors, 'r')
+            call setqflist(errors, 'r')
         endif
         echohl Error | echomsg "Gofmt returned error" | echohl None
     endif
-- 
cgit v1.2.3