From e1bd31308f74d5cee7db52562349d80ca19d9755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2EFernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Mon, 25 Feb 2013 11:03:23 +0100
Subject: [PATCH] Updated oh-my-zsh and removed autoformat for tex

---
 bashrc               | 3 +++
 oh-my-zsh            | 2 +-
 vim/ftplugin/tex.vim | 2 +-
 vimrc                | 2 +-
 xprofile             | 5 +++--
 zshrc                | 3 +++
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bashrc b/bashrc
index 81fb797..b3c7aa8 100644
--- a/bashrc
+++ b/bashrc
@@ -185,3 +185,6 @@ if which tmux 2>&1 >/dev/null; then
 fi
 
 PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"
diff --git a/oh-my-zsh b/oh-my-zsh
index 2c7f2f0..2c3489a 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 2c7f2f05ddd8d7a7c648c476189192f58f1600f5
+Subproject commit 2c3489a75014f80c87ee6c6ae6ab62251dd684b0
diff --git a/vim/ftplugin/tex.vim b/vim/ftplugin/tex.vim
index f146c96..a4838bd 100644
--- a/vim/ftplugin/tex.vim
+++ b/vim/ftplugin/tex.vim
@@ -1,4 +1,4 @@
-setlocal formatoptions+=wa
+"setlocal formatoptions+=wa
 
 function! SyncTexForward()
      let execstr = "silent !okular --unique ".LatexBox_GetOutputFile()."\\#src:".line(".")."%:p &"
diff --git a/vimrc b/vimrc
index 759a609..512b9b1 100644
--- a/vimrc
+++ b/vimrc
@@ -143,5 +143,5 @@ set laststatus=2
 " endfunction
 
 " Encryption
-set cm=blowfish
+" set cm=blowfish
 " Transparent editing of gpg encrypted files.
diff --git a/xprofile b/xprofile
index 0689245..645677e 100755
--- a/xprofile
+++ b/xprofile
@@ -1,3 +1,4 @@
-echo "pasado(xprofile)" $(date) >> /tmp/LOG
+# echo "pasado(xprofile)" $(date) >> /tmp/LOG
 #setxkbmap -option ctrl:nocaps
-xmodmap ~/.Xmodmap
+#xmodmap ~/.Xmodmap
+source ~/.xinitrc
diff --git a/zshrc b/zshrc
index 07e16bb..fd4f5e8 100644
--- a/zshrc
+++ b/zshrc
@@ -55,3 +55,6 @@ if [[ -z "$KONSOLE_DBUS_SERVICE" && -n $(which tmux) ]]; then
         exit;
     fi
 fi
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"