# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1405015519 25200
# Node ID 095fb39b2096816abe594a50ed943cc9f4a83812
# Parent  393449253540a285390252c59adbf6fc87346eba# Parent  7b34721d0d3db49cdc72c121977972fd7a30408a
Merged changes.

diff -r 7b34721d0d3d -r 095fb39b2096 .hgsubstate
--- a/.hgsubstate	Sat Jun 07 18:14:56 2014 -0700
+++ b/.hgsubstate	Thu Jul 10 11:05:19 2014 -0700
@@ -15,12 +15,12 @@
 b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
-1a93cbb14f537c001a52a43b94309d6c625b5953 vim/bundle/ragtag
+a90b2b60454fabe9a969d00b5d7f8d752ab61bd4 vim/bundle/ragtag
 2a3c5f8e3c26a57b8eb4cfc4be79615a1c508ef6 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
-1852b5d386cdee4ba8aa8447e032e0bd01aaeef3 vim/bundle/syntastic
-dbc05b24a3da1541a211a2f6513777145258577a vim/bundle/tagbar
+ffe3085a804f6a668987af45ff5edf953ff2ff58 vim/bundle/syntastic
+614b5b244f3a7a9e0174ebcf73c809de6e62e32c vim/bundle/tagbar
 869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
diff -r 7b34721d0d3d -r 095fb39b2096 vim/vimrc
--- a/vim/vimrc	Sat Jun 07 18:14:56 2014 -0700
+++ b/vim/vimrc	Thu Jul 10 11:05:19 2014 -0700
@@ -217,7 +217,7 @@
 let g:ctrlp_map = ''
 
 " Ctrl-P should manage the working directory.
-let g:ctrlp_working_path_mode = 2
+let g:ctrlp_working_path_mode = 'ra'
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
@@ -447,3 +447,12 @@
 
 " }}}
 
+" Local override {{{
+
+let s:local_vimrc = s:vim_home.'/vimrc.local'
+if filereadable(s:local_vimrc)
+    execute 'source' s:local_vimrc
+endif
+
+" }}}
+
diff -r 7b34721d0d3d -r 095fb39b2096 vimperatorrc
--- a/vimperatorrc	Sat Jun 07 18:14:56 2014 -0700
+++ b/vimperatorrc	Thu Jul 10 11:05:19 2014 -0700
@@ -49,6 +49,7 @@
 ignorekeys add -except=:,J,K,b fastmail.fm
 ignorekeys add -except=:,J,K,b feedly.com
 ignorekeys add -except=:,J,K,b mnmlrdr.com
+ignorekeys add -except=:,J,K,b newsblur.com
 
 " The new Firefox fucked up vimperator's ability to hide
 " things. Let's do it ourselves for now.