# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1422153306 28800
# Node ID a1eb5cb340e673a6b69f2cd331998defb14f577a
# Parent  386588661868d588d14b35a804e046e2f13fc796# Parent  faa1f3bf14f6a65bf35751a2e9ab8d0f7bb8cb43
Merge changes.

diff -r 386588661868 -r a1eb5cb340e6 bashrc/bashrc
--- a/bashrc/bashrc	Sat Jan 24 18:15:54 2015 -0800
+++ b/bashrc/bashrc	Sat Jan 24 18:35:06 2015 -0800
@@ -30,6 +30,9 @@
 # Use VIM by default.
 export EDITOR="vim"
 
-# OS for some of my scripts
+# OS for some of my scripts.
 export OS=MacOSX
 
+# Pretty colors.
+export TERM=xterm-256color
+
diff -r 386588661868 -r a1eb5cb340e6 vim/vimrc
--- a/vim/vimrc	Sat Jan 24 18:15:54 2015 -0800
+++ b/vim/vimrc	Sat Jan 24 18:35:06 2015 -0800
@@ -192,7 +192,7 @@
 else
     set background=dark
     let g:solarized_termcolors = 256
-    "let g:solarized_termtrans = 1
+    let g:solarized_termtrans = 1
 endif
 colorscheme solarized