# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1388806737 28800
# Node ID 254c4f068808d38b6e420e09b9169ddfa2a3b8fe
# Parent  2eca71d533ce0e2244abd94c3fedd162fd999efd# Parent  967328f9896b0c0c8adb22ddb38c9abf498ec98c
Merged changes.

diff -r 967328f9896b -r 254c4f068808 .hgsub
--- a/.hgsub	Mon Dec 16 14:43:14 2013 -0800
+++ b/.hgsub	Fri Jan 03 19:38:57 2014 -0800
@@ -19,6 +19,8 @@
 vim/bundle/fugitive = [git]https://github.com/tpope/vim-fugitive.git
 vim/bundle/syntastic = [git]https://github.com/scrooloose/syntastic.git
 vim/bundle/less = [git]https://github.com/groenewege/vim-less.git
+vim/bundle/twig = [git]https://github.com/beyondwords/vim-twig.git
+vim/bundle/tagbar = [git]https://github.com/majutsushi/tagbar.git
 
 vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium
 vim/bundle/piecrust = https://bitbucket.org/ludovicchabant/vim-piecrust
diff -r 967328f9896b -r 254c4f068808 .hgsubstate
--- a/.hgsubstate	Mon Dec 16 14:43:14 2013 -0800
+++ b/.hgsubstate	Fri Jan 03 19:38:57 2014 -0800
@@ -1,5 +1,5 @@
 f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths
-503d403fc0404b8cb2df568da6fcb14cb2879b15 lib/hg/hg-git
+711baa274f78c5cfd844bac60288f1527e6c3e98 lib/hg/hg-git
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 f134dd5726732a74e05edacc9a795006b984b82f vim/bundle/colorschemes
@@ -10,15 +10,17 @@
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml
 16e873b2a4a8421fcbcf9a1b57ee0bbfe6bbe358 vim/bundle/lawrencium
-63f039246b79669e9dd72d0693c52462c391ed13 vim/bundle/less
+5d965c221b90fb168bf9f447a332c9ff6f62e666 vim/bundle/less
 fccf76f68fa819629e9dac50a20f3369983e2a38 vim/bundle/markdown
 b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
-a90b2b60454fabe9a969d00b5d7f8d752ab61bd4 vim/bundle/ragtag
+1a93cbb14f537c001a52a43b94309d6c625b5953 vim/bundle/ragtag
 a81bef76031ca1c71766b516417480caeb01c932 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
-fa2e6b96d928e610b06f2e2936b6f4dc7535a1d9 vim/bundle/syntastic
+1852b5d386cdee4ba8aa8447e032e0bd01aaeef3 vim/bundle/syntastic
+dbc05b24a3da1541a211a2f6513777145258577a vim/bundle/tagbar
+869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
diff -r 967328f9896b -r 254c4f068808 vim/vimrc
--- a/vim/vimrc	Mon Dec 16 14:43:14 2013 -0800
+++ b/vim/vimrc	Fri Jan 03 19:38:57 2014 -0800
@@ -259,6 +259,12 @@
 
     augroup END
 
+    augroup VimRCTrailingWhitespaces
+        au!
+
+        autocmd FileType c,cpp,java,php,ruby,python,js,css,less autocmd BufWritePre <buffer> :call <SID>StripTrailingWhitespaces()
+    augroup END       
+
 endif
 
 " }}}
@@ -289,6 +295,9 @@
 " Switch buffers.
 nnoremap <F3> :execute ("buffer " . bufname("#"))<cr>
 
+" Tagbar.
+nnoremap <F8> :TagbarToggle<cr>
+
 " Common typos.
 nnoremap ; :
 
@@ -408,6 +417,14 @@
     endif
 endfunction
 
+function! s:StripTrailingWhitespaces() abort
+    let l = line(".")
+    let c = col(".")
+    %s/\s\+$//e
+    let @/=''
+    call cursor(l, c)
+endfunction
+
 " }}}
 
 " Temporary stuff {{{
diff -r 967328f9896b -r 254c4f068808 vimperatorrc
--- a/vimperatorrc	Mon Dec 16 14:43:14 2013 -0800
+++ b/vimperatorrc	Fri Jan 03 19:38:57 2014 -0800
@@ -39,6 +39,9 @@
 " Quickly hide search highlighting
 nnoremap <leader><Space> :noh<cr>
 
+" Quickly open some dialogs
+nnoremap <leader>b :downloads<cr>
+
 " Super minimal UI
 set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs