changeset 271:a1eb5cb340e6

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 24 Jan 2015 18:35:06 -0800
parents 386588661868 (current diff) faa1f3bf14f6 (diff)
children fd3fad5f9dfc
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
+
--- 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