folding improvements

syntax/go.vim

@@ -93,6 +93,8 @@ let s:fold_block = 1
 let s:fold_import = 1
 let s:fold_varconst = 1
 let s:fold_package_comment = 1
+let s:fold_comment = 1
+
 if exists("g:go_fold_enable")
   if index(g:go_fold_enable, 'block') == -1
     let s:fold_block = 0
@@ -103,6 +105,9 @@ if exists("g:go_fold_enable")
   if index(g:go_fold_enable, 'varconst') == -1
     let s:fold_varconst = 0
   endif
+  if index(g:go_fold_enable, 'comment') == -1
+    let s:fold_comment = 0
+  endif
   if index(g:go_fold_enable, 'package_comment') == -1
     let s:fold_package_comment = 0
   endif
@@ -159,6 +164,7 @@ hi def link     goPredefinedIdentifiers    goBoolean
 " Comments; their contents
 syn keyword     goTodo              contained TODO FIXME XXX BUG
 syn cluster     goCommentGroup      contains=goTodo
+
 syn region      goComment           start="/\*" end="\*/" contains=@goCommentGroup,@Spell
 syn region      goComment           start="//" end="$" contains=goGenerate,@goCommentGroup,@Spell
 
@@ -240,6 +246,13 @@ else
                         \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar
 endif
 
+if s:fold_comment
+	" changed this to comments instead of declaration_comment
+  syn region    goComment           start="/\*" end="\*/" contains=@goCommentGroup,@Spell fold
+  syn match     goComment           "\v(^\s*//.*\n)+" contains=goGenerate,@goCommentGroup,@Spell fold
+endif
+
+
 " Single-line var, const, and import.
 syn match       goSingleDecl        /\(import\|var\|const\) [^(]\@=/ contains=goImport,goVar,goConst
 
@@ -452,4 +465,5 @@ syn sync minlines=500
 
 let b:current_syntax = "go"
 
-" vim: sw=2 ts=2 et
+
+