From ae67b37b507430e27b94dbd31ae1477484abb752 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sun, 23 Mar 2014 14:24:57 -0400
Subject: [PATCH 1/2] no more angle matching

---
 .vim/filetype.vim          |  2 +-
 .vim/snippets/c.snippets   | 87 ----------------------------------------------
 .vim/snippets/cpp.snippets | 27 --------------
 .vim/usnips/c.snippets     | 87 ++++++++++++++++++++++++++++++++++++++++++++++
 .vim/usnips/cpp.snippets   | 27 ++++++++++++++
 .vimrc                     |  2 +-
 .ycm_extra_conf.py         |  1 -
 7 files changed, 116 insertions(+), 117 deletions(-)
 delete mode 100644 .vim/snippets/c.snippets
 delete mode 100644 .vim/snippets/cpp.snippets
 create mode 100644 .vim/usnips/c.snippets
 create mode 100644 .vim/usnips/cpp.snippets

diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index cb65c90..68fbaf1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -43,7 +43,7 @@ au Filetype html,xml,xsl source ~/.vim/closetag.vim
 
 au BufRead,BufNewFile *.go set filetype=go
 
-au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
+au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:}"
 
 "Settings per filetype
 augroup python
diff --git a/.vim/snippets/c.snippets b/.vim/snippets/c.snippets
deleted file mode 100644
index fa83259..0000000
--- a/.vim/snippets/c.snippets
+++ /dev/null
@@ -1,87 +0,0 @@
-###########################################################################
-#                            TextMate Snippets                            #
-###########################################################################
-
-snippet ifndef "#ifndef ... #define ... #endif" !b
-#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
-#define ${1:SYMBOL} ${2:value}
-#endif
-endsnippet
-
-snippet #if "#if #endif" !b
-#if ${1:0}
-${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
-#endif
-endsnippet
-
-snippet main "main() (main)" !
-int main(int argc, char *argv[]) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-  return 0;
-}
-endsnippet
-
-snippet for "for loop (for)" !
-for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-
-snippet enum "Enumeration" !
-enum ${1:name} { 
-  $0 
-};
-endsnippet
-
-snippet wh "while loop" !
-while(${1:/* condition */}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet do "do...while loop (do)" !
-do {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-} while(${1:/* condition */});
-endsnippet
-
-snippet if "if .. (if)" !
-if (${1:/* condition */}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet el "else .. (else)" !
-else {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet eli "else if .. (eli)" !
-else if (${1:/* condition */}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-snippet ife "if .. else (ife)" !
-if (${1:/* condition */}) {
-  ${2:/* code */}
-} else {
-  ${3:/* else */}
-}
-endsnippet
-
-snippet st "struct" !
-struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
-  ${0:/* data */}
-};
-endsnippet
-
-snippet fun "function" b!
-${1:void} ${2:function_name}(${3}) {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}
-endsnippet
-
-# vim:ft=snippets:
diff --git a/.vim/snippets/cpp.snippets b/.vim/snippets/cpp.snippets
deleted file mode 100644
index 556a954..0000000
--- a/.vim/snippets/cpp.snippets
+++ /dev/null
@@ -1,27 +0,0 @@
-extends c
-
-###########################################################################
-#                            TextMate Snippets                            #
-###########################################################################
-snippet beginend "$1.begin(), $1.end() (beginend)"
-${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
-endsnippet
-
-snippet cl "class .. (class)" !
-class ${1:`!p snip.rv = snip.basename or "name"`} {
- public:
-  ${1/(\w+).*/$1/}(${2:arguments});
-  virtual ~${1/(\w+).*/$1/}();
-
- private:
-  ${0:/* data */}
-};
-endsnippet
-
-snippet ns "namespace .. (namespace)" !
-namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
-  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
-}  // namespace $1
-endsnippet
-
-# vim:ft=snippets:
diff --git a/.vim/usnips/c.snippets b/.vim/usnips/c.snippets
new file mode 100644
index 0000000..fa83259
--- /dev/null
+++ b/.vim/usnips/c.snippets
@@ -0,0 +1,87 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet ifndef "#ifndef ... #define ... #endif" !b
+#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
+#define ${1:SYMBOL} ${2:value}
+#endif
+endsnippet
+
+snippet #if "#if #endif" !b
+#if ${1:0}
+${VISUAL}${0:${VISUAL/(.*)/(?1::code)/}}
+#endif
+endsnippet
+
+snippet main "main() (main)" !
+int main(int argc, char *argv[]) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+  return 0;
+}
+endsnippet
+
+snippet for "for loop (for)" !
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+
+snippet enum "Enumeration" !
+enum ${1:name} { 
+  $0 
+};
+endsnippet
+
+snippet wh "while loop" !
+while(${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet do "do...while loop (do)" !
+do {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+} while(${1:/* condition */});
+endsnippet
+
+snippet if "if .. (if)" !
+if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet el "else .. (else)" !
+else {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet eli "else if .. (eli)" !
+else if (${1:/* condition */}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+snippet ife "if .. else (ife)" !
+if (${1:/* condition */}) {
+  ${2:/* code */}
+} else {
+  ${3:/* else */}
+}
+endsnippet
+
+snippet st "struct" !
+struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
+  ${0:/* data */}
+};
+endsnippet
+
+snippet fun "function" b!
+${1:void} ${2:function_name}(${3}) {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/.vim/usnips/cpp.snippets b/.vim/usnips/cpp.snippets
new file mode 100644
index 0000000..556a954
--- /dev/null
+++ b/.vim/usnips/cpp.snippets
@@ -0,0 +1,27 @@
+extends c
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet beginend "$1.begin(), $1.end() (beginend)"
+${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
+endsnippet
+
+snippet cl "class .. (class)" !
+class ${1:`!p snip.rv = snip.basename or "name"`} {
+ public:
+  ${1/(\w+).*/$1/}(${2:arguments});
+  virtual ~${1/(\w+).*/$1/}();
+
+ private:
+  ${0:/* data */}
+};
+endsnippet
+
+snippet ns "namespace .. (namespace)" !
+namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`} {
+  ${VISUAL}${0:${VISUAL/(.*)/(?1::\/* code *\/)/}}
+}  // namespace $1
+endsnippet
+
+# vim:ft=snippets:
diff --git a/.vimrc b/.vimrc
index a632831..a2e1fb4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -182,7 +182,7 @@ let g:ycm_key_invoke_completion = "<Leader><Tab>"
 "let g:ycm_autoclose_preview_window_after_completion = 1
 
 " * UltiSnips
-let g:UltiSnipsSnippetDirectories=["UltiSnips", "snippets"]
+let g:UltiSnipsSnippetDirectories=["UltiSnips", "usnips"]
 let g:UltiSnipsExpandTrigger="<Leader>,"
 let g:UltiSnipsJumpForwardTrigger="<Leader>,"
 let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 33ac6f6..06a49f3 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -14,7 +14,6 @@ flags = [
 '-Wno-variadic-macros',
 '-fexceptions',
 '-DNDEBUG',
-'-DUSE_CLANG_COMPLETER',
 # THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
 # language to use when compiling headers. So it will guess. Badly. So C++
 # headers will be compiled as C headers. You don't want that so ALWAYS specify

From 7ed2ebe59a14242ef9bf48f8347fb9d6cb07b5ea Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sun, 23 Mar 2014 14:25:42 -0400
Subject: [PATCH 2/2] update all submodules

---
 .vim/bundle/NrrwRgn        | 2 +-
 .vim/bundle/YouCompleteMe  | 2 +-
 .vim/bundle/ack.vim        | 2 +-
 .vim/bundle/calendar-vim   | 2 +-
 .vim/bundle/delimitMate    | 2 +-
 .vim/bundle/ghcmod-vim     | 2 +-
 .vim/bundle/neco-ghc       | 2 +-
 .vim/bundle/syntastic      | 2 +-
 .vim/bundle/tagbar         | 2 +-
 .vim/bundle/ultisnips      | 2 +-
 .vim/bundle/vim-airline    | 2 +-
 .vim/bundle/vim-angry      | 2 +-
 .vim/bundle/vim-fugitive   | 2 +-
 .vim/bundle/vim-gitgutter  | 2 +-
 .vim/bundle/vim-gocode     | 2 +-
 .vim/bundle/vim-sparkup    | 2 +-
 .vim/bundle/vim-unimpaired | 2 +-
 .vim/bundle/vimproc        | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.vim/bundle/NrrwRgn b/.vim/bundle/NrrwRgn
index 161d734..0fb0fe9 160000
--- a/.vim/bundle/NrrwRgn
+++ b/.vim/bundle/NrrwRgn
@@ -1 +1 @@
-Subproject commit 161d73499845fd0d9b24d76ecbcb00d7d00d6120
+Subproject commit 0fb0fe948cedda7cbea330303c5a28e7375d268c
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index b1bba2e..9d3258d 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit b1bba2e2012efa81444bedafa12ddbdae2cccd93
+Subproject commit 9d3258df19b9d940576eda42899dbdbf9084f04a
diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim
index f183a34..0292109 160000
--- a/.vim/bundle/ack.vim
+++ b/.vim/bundle/ack.vim
@@ -1 +1 @@
-Subproject commit f183a345a0c10caed7684d07dabae33e007c7590
+Subproject commit 0292109f1f87497c7cf9b0994db47c8e95bd252c
diff --git a/.vim/bundle/calendar-vim b/.vim/bundle/calendar-vim
index 523c5b5..b340c43 160000
--- a/.vim/bundle/calendar-vim
+++ b/.vim/bundle/calendar-vim
@@ -1 +1 @@
-Subproject commit 523c5b532cc8ca509fc86c33ca1ca6b61ee18978
+Subproject commit b340c438355e70ba3a648ccfc0e2be9b94662808
diff --git a/.vim/bundle/delimitMate b/.vim/bundle/delimitMate
index 35280c1..38487bb 160000
--- a/.vim/bundle/delimitMate
+++ b/.vim/bundle/delimitMate
@@ -1 +1 @@
-Subproject commit 35280c1444bf62d651f56ccaf03ad8db29c02383
+Subproject commit 38487bbec8ba50834e257940b357de03991fa8f9
diff --git a/.vim/bundle/ghcmod-vim b/.vim/bundle/ghcmod-vim
index 788b193..6a88e49 160000
--- a/.vim/bundle/ghcmod-vim
+++ b/.vim/bundle/ghcmod-vim
@@ -1 +1 @@
-Subproject commit 788b193dbeb1bebe303b0d0c6b17c09fdd1ebabb
+Subproject commit 6a88e49d5766edf32592c9c4b24921ba42f619c8
diff --git a/.vim/bundle/neco-ghc b/.vim/bundle/neco-ghc
index 41c7160..00985af 160000
--- a/.vim/bundle/neco-ghc
+++ b/.vim/bundle/neco-ghc
@@ -1 +1 @@
-Subproject commit 41c7160ee129209b758c5a9f0fc196ffeeb866f9
+Subproject commit 00985af541d8880a6a54d39dc5778ec7e00c053e
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
index f23ddae..f6d584b 160000
--- a/.vim/bundle/syntastic
+++ b/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit f23ddae1a7982b40dbfbe55033c1817480f0a0ed
+Subproject commit f6d584bc639c2b799d5d7897d1e681b4e57cd476
diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar
index ace45ad..b2c5f0b 160000
--- a/.vim/bundle/tagbar
+++ b/.vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit ace45adc51d0e08d45761bb515a9ff23906cba65
+Subproject commit b2c5f0b9284f85e92d98efc97c780ad01ba81e0c
diff --git a/.vim/bundle/ultisnips b/.vim/bundle/ultisnips
index ae611cc..4b4ee48 160000
--- a/.vim/bundle/ultisnips
+++ b/.vim/bundle/ultisnips
@@ -1 +1 @@
-Subproject commit ae611ccf950a93f93cab64542cbe48029f1e9c02
+Subproject commit 4b4ee488580f7586e82a76bb392e4f79027ce049
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
index 5f1c245..5a2daf6 160000
--- a/.vim/bundle/vim-airline
+++ b/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit 5f1c24528c143c80e40016995fc902fb8b74eeee
+Subproject commit 5a2daf6dfbd6e0df21612a20f95b4285ae8a2603
diff --git a/.vim/bundle/vim-angry b/.vim/bundle/vim-angry
index 8705ee2..08e9e9a 160000
--- a/.vim/bundle/vim-angry
+++ b/.vim/bundle/vim-angry
@@ -1 +1 @@
-Subproject commit 8705ee2c4e619016a5abba2fb3c8886a6eb93426
+Subproject commit 08e9e9a50e6683ac7b0c1d6fddfb5f1235c75700
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
index 546a6bf..d6f1760 160000
--- a/.vim/bundle/vim-fugitive
+++ b/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 546a6bf2197529ed1bd402244cbf6e72ed62b2ca
+Subproject commit d6f17608ddbae06ed5867f58e322a16806fa7248
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
index ae81dcc..0ca3f7e 160000
--- a/.vim/bundle/vim-gitgutter
+++ b/.vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit ae81dccb679a423f871809d83c6829442760748a
+Subproject commit 0ca3f7e3cdbd3edf69d685ed463a6746fb0e8134
diff --git a/.vim/bundle/vim-gocode b/.vim/bundle/vim-gocode
index 05b9cc1..5a12617 160000
--- a/.vim/bundle/vim-gocode
+++ b/.vim/bundle/vim-gocode
@@ -1 +1 @@
-Subproject commit 05b9cc1b9e7497eef0add18d5adb034ecfeebec8
+Subproject commit 5a12617f085a32deec5eed80598e2165dc918615
diff --git a/.vim/bundle/vim-sparkup b/.vim/bundle/vim-sparkup
index 8078aff..0377b10 160000
--- a/.vim/bundle/vim-sparkup
+++ b/.vim/bundle/vim-sparkup
@@ -1 +1 @@
-Subproject commit 8078affa985f12b6fd35a715ced779c3fccaa0df
+Subproject commit 0377b100382c19295b42018289fe8d42a7d57e80
diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired
index 9a8be36..f4a9143 160000
--- a/.vim/bundle/vim-unimpaired
+++ b/.vim/bundle/vim-unimpaired
@@ -1 +1 @@
-Subproject commit 9a8be3696bc50064b9d9d146041ec4264e36e341
+Subproject commit f4a914308ab32b118441418fdc64ac41fa7dc53c
diff --git a/.vim/bundle/vimproc b/.vim/bundle/vimproc
index 11bd685..92b34f1 160000
--- a/.vim/bundle/vimproc
+++ b/.vim/bundle/vimproc
@@ -1 +1 @@
-Subproject commit 11bd6853b25f73f3729cccbb9282fecade2bf50a
+Subproject commit 92b34f1ed9d2f2900f6a2db964526d6f94fa3d86