# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1439256789 25200
# Node ID 8f49f36b76efb4e49e7743199c35202a79908226
# Parent  5cee1ee030cbe05427ecc2d94ef1f83df10cfdeb# Parent  52d4d0fa195b3461d5edce8b8ef0d18eb62e7810
Merge changes.

diff -r 52d4d0fa195b -r 8f49f36b76ef .hgsubstate
--- a/.hgsubstate	Mon Aug 10 11:58:52 2015 -0700
+++ b/.hgsubstate	Mon Aug 10 18:33:09 2015 -0700
@@ -17,7 +17,7 @@
 9f1c449edfce6d61c7f620e3a9c1389b7b7e334f vim/bundle/easymotion
 e065e4f841f4a033ac9a6156573a446007617b1d vim/bundle/fugitive
 eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
-9e768b83d701bda056028cdabf731107f805a787 vim/bundle/gutentags
+d9bf24ba7f3524f2cf0a293bfa8fa40374fe3b52 vim/bundle/gutentags
 204e32721154766e03e99ff857bc798aa5b741dc vim/bundle/haml
 b266c43a06c1bd55d0f642a90475640ae2c1eb15 vim/bundle/interestingwords
 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja
diff -r 52d4d0fa195b -r 8f49f36b76ef fish/config.fish
--- a/fish/config.fish	Mon Aug 10 11:58:52 2015 -0700
+++ b/fish/config.fish	Mon Aug 10 18:33:09 2015 -0700
@@ -11,6 +11,8 @@
 
 set -g -x VIRTUAL_ENV_DISABLE_PROMPT 1
 
+set -g -x GOPATH /usr/local/Cellar/go/1.4/gocode
+
 set -g -x OS MacOSX
 
 set -g -x EDITOR vim
diff -r 52d4d0fa195b -r 8f49f36b76ef pentadactyl/pentadactylrc
--- a/pentadactyl/pentadactylrc	Mon Aug 10 11:58:52 2015 -0700
+++ b/pentadactyl/pentadactylrc	Mon Aug 10 18:33:09 2015 -0700
@@ -53,7 +53,7 @@
 
 " On keyboards like the Leopold FC660C, for some obscure reason, the
 " <Insert> key sends the <Help> ID. WTF.
-noremap <Help> <Insert>
+nmap -builtin <Help> <Insert>
 
 " DDG FTW
 set defsearch=duckduckgo
@@ -69,7 +69,7 @@
 
 " Plugins
 loadplugins '\.(js|penta)$'
-set pintaboardToken="ludovicchabant:04A05605C553E70CDA2A"
+let pintaboardToken="ludovicchabant:04A05605C553E70CDA2A"
 
 javascript <<EOF
 function saveToPocket(){var%20e=function(t,n,r,i,s){var%20o=[5581053,5370545,3939863,5030563,6022735,2412811,4059305,6072550,4240340,2597059];var%20i=i||0,u=0,n=n||[],r=r||0,s=s||0;var%20a={'a':97,'b':98,'c':99,'d':100,'e':101,'f':102,'g':103,'h':104,'i':105,'j':106,'k':107,'l':108,'m':109,'n':110,'o':111,'p':112,'q':113,'r':114,'s':115,'t':116,'u':117,'v':118,'w':119,'x':120,'y':121,'z':122,'A':65,'B':66,'C':67,'D':68,'E':69,'F':70,'G':71,'H':72,'I':73,'J':74,'K':75,'L':76,'M':77,'N':78,'O':79,'P':80,'Q':81,'R':82,'S':83,'T':84,'U':85,'V':86,'W':87,'X':88,'Y':89,'Z':90,'0':48,'1':49,'2':50,'3':51,'4':52,'5':53,'6':54,'7':55,'8':56,'9':57,'\/':47,':':58,'?':63,'=':61,'-':45,'_':95,'&':38,'$':36,'!':33,'.':46};if(!s||s==0){t=o[0]+t}for(var%20f=0;f<t.length;f++){var%20l=function(e,t){return%20a[e[t]]?a[e[t]]:e.charCodeAt(t)}(t,f);if(!l*1)l=3;var%20c=l*(o[i]+l*o[u%o.length]);n[r]=(n[r]?n[r]+c:c)+s+u;var%20p=c%(50*1);if(n[p]){var%20d=n[r];n[r]=n[p];n[p]=d}u+=c;r=r==50?0:r+1;i=i==o.length-1?0:i+1}if(s==318){var%20v='';for(var%20f=0;f<n.length;f++){v+=String.fromCharCode(n[f]%(25*1)+97)}o=function(){};return%20v+'2018d4349a'}else{return%20e(u+'',n,r,i,s+1)}};var%20t=document,n=t.location.href,r=t.title;var%20i=e(n);var%20s=t.createElement('script');s.type='text/javascript';s.src='https://getpocket.com/b/r4.js?h='+i+'&u='+encodeURIComponent(n)+'&t='+encodeURIComponent(r);e=i=function(){};var%20o=t.getElementsByTagName('head')[0]||t.documentElement;o.appendChild(s)}
diff -r 52d4d0fa195b -r 8f49f36b76ef vim/vimrc
--- a/vim/vimrc	Mon Aug 10 11:58:52 2015 -0700
+++ b/vim/vimrc	Mon Aug 10 18:33:09 2015 -0700
@@ -198,8 +198,8 @@
     set background=dark
 else
     set background=dark
-    "let g:solarized_termcolors = 256
-    "let g:solarized_termtrans = 1
+    let g:solarized_termcolors = 256
+    let g:solarized_termtrans = 1
 endif
 colorscheme solarized
 
@@ -221,6 +221,12 @@
 
 " Plugin Settings {{{
 
+" NERDTree {{{
+
+let NERDTreeIgnore=['\~$', '*.pyc', '*.pyo']
+
+" }}}
+
 " Ctrl-P {{{
 
 " We'll set our own mappings.
@@ -258,7 +264,7 @@
 
 " Syntastic {{{
 
-let g:syntastic_auto_loc_list = 1
+let g:syntastic_auto_loc_list = 2
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
 
@@ -309,7 +315,7 @@
 let g:pymode = 1
 let g:pymode_python = 'python'
 
-let g:pymode_syntax = 1
+let g:pymode_syntax = 0
 let g:pymode_syntax_all = 0
 let g:pymode_syntax_builtin_objs = 1
 let g:pymode_syntax_print_as_function = 1
@@ -326,6 +332,8 @@
 
 let g:pymode_virtualenv = 0
 
+let g:pymode_rope = 0
+
 " }}}
 
 " }}}