Updated plugins. Added vim-golang as a mode

sources_non_forked/vim-snippets/UltiSnips/all.snippets

@@ -1,6 +1,11 @@
 # This file contains snippets that are always defined. I personally
 # have snippets for signatures and often needed texts
 
+# sligthly lower priority than everything else since specialized versions
+# should overwrite. The user needs to adjust her priority in her snippets to
+# ~-55 so that other filetypes will still overwrite.
+priority -60
+
 ##############
 # NICE BOXES #
 ##############
@@ -12,71 +17,62 @@ Automatically filled during usage"""
 _commentDict = { }
 
 def _parse_comments(s):
-    """ Parses vim's comments option to extract comment format """
-    i = iter(s.split(","))
+	""" Parses vim's comments option to extract comment format """
+	i = iter(s.split(","))
 
-    rv = []
-    try:
-        while True:
-            # get the flags and text of a comment part
-            flags,text = i.next().split(':', 1)
+	rv = []
+	try:
+		while True:
+			# get the flags and text of a comment part
+			flags, text = next(i).split(':', 1)
 
-            if len(flags) == 0:
-                if len(text) == 1:
-                    rv.append((text,text,text, ""))
-            # parse 3-part comment, but ignore those with O flag
-            elif flags[0] == 's' and 'O' not in flags:
-                ctriple = []
-                indent = ""
+			if len(flags) == 0:
+				rv.append((text, text, text, ""))
+			# parse 3-part comment, but ignore those with O flag
+			elif flags[0] == 's' and 'O' not in flags:
+				ctriple = []
+				indent = ""
 
-                if flags[-1] in string.digits:
-                    indent = " " * int(flags[-1])
-                ctriple.append(text)
+				if flags[-1] in string.digits:
+					indent = " " * int(flags[-1])
+				ctriple.append(text)
 
-                flags,text = i.next().split(':', 1)
-                assert(flags[0] == 'm')
-                ctriple.append(text)
+				flags,text = next(i).split(':', 1)
+				assert(flags[0] == 'm')
+				ctriple.append(text)
 
-                flags,text = i.next().split(':', 1)
-                assert(flags[0] == 'e')
-                ctriple.append(text)
-                ctriple.append(indent)
+				flags,text = next(i).split(':', 1)
+				assert(flags[0] == 'e')
+				ctriple.append(text)
+				ctriple.append(indent)
 
-                rv.append(ctriple)
-
-            elif flags[0] == 'b':
-                if len(text) == 1:
-                    rv.insert(0, (text,text,text, ""))
-
-    except StopIteration:
-       return rv
+				rv.append(ctriple)
+			elif flags[0] == 'b':
+				if len(text) == 1:
+					rv.insert(0, (text,text,text, ""))
+	except StopIteration:
+		return rv
 
 def _get_comment_format():
-    """ Returns a 4-element tuple representing the comment format for
-    the current file. """
-
-    ft = vim.eval("&filetype")
-    # check if the comment dict has the format for the current file
-    if _commentDict.has_key(ft):
-        return _commentDict[ft]
-
-    # otherwise parse vim's comments and add it for later use
-    commentformat = _parse_comments(vim.eval("&comments"))[0]
-    _commentDict[ft] = commentformat
-
-    return commentformat
+	""" Returns a 4-element tuple representing the comment format for
+	the current file. """
+	return _parse_comments(vim.eval("&comments"))[0]
 
 
-def make_box(twidth, bwidth = None):
-   if bwidth is None:
-      bwidth = twidth + 2
-   b,m,e,i = _get_comment_format()
-   sline = b + m + bwidth*m + 2*m
-   nspaces = (bwidth - twidth)//2 
-   mlines = i + m + " " + " "*nspaces
-   mlinee = " " + " "*(bwidth-twidth-nspaces) + m
-   eline = i + 2*m + bwidth*m + m + e
-   return sline, mlines, mlinee, eline
+def make_box(twidth, bwidth=None):
+	b, m, e, i = _get_comment_format()
+	bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
+	sline = b + m + bwidth_inner * m[0] + 2 * m[0]
+	nspaces = (bwidth_inner - twidth) // 2
+	mlines = i + m + " " + " " * nspaces
+	mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
+	eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
+	return sline, mlines, mlinee, eline
+
+def foldmarker():
+	"Return a tuple of (open fold marker, close fold marker)"
+	return vim.eval("&foldmarker").split(",")
+
 endglobal
 
 snippet box "A nice box with the current comment symbol" b
@@ -91,14 +87,29 @@ endsnippet
 
 snippet bbox "A nice box over the full width" b
 `!p
-box = make_box(len(t[1]), 71)
+width = int(vim.eval("&textwidth")) or 71
+box = make_box(len(t[1]), width)
 snip.rv = box[0] + '\n' + box[1]
 `${1:content}`!p
-box = make_box(len(t[1]), 71)
+box = make_box(len(t[1]), width)
 snip.rv = box[2] + '\n' + box[3]`
 $0
 endsnippet
 
+snippet fold "Insert a vim fold marker" b
+`!p snip.rv = _get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]`${2:1} `!p snip.rv = _get_comment_format()[2]`
+endsnippet
+
+snippet foldc "Insert a vim fold close marker" b
+`!p snip.rv = _get_comment_format()[0]` ${2:1}`!p snip.rv = foldmarker()[1]` `!p snip.rv = _get_comment_format()[2]`
+endsnippet
+
+snippet foldp "Insert a vim fold marker pair" b
+`!p snip.rv = _get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]` `!p snip.rv = _get_comment_format()[2]`
+${2:${VISUAL:Content}}
+`!p snip.rv = _get_comment_format()[0]` `!p snip.rv = foldmarker()[1]` $1 `!p snip.rv = _get_comment_format()[2]`
+endsnippet
+
 ##########################
 # LOREM IPSUM GENERATORS #
 ##########################