dotfiles

commit 1d432447a96f1e00560e2d185e6b038dd0fd5a42
parent b75650a0f5966d8ba31048ffc28738602ca8630c
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Wed,  9 Jul 2014 19:08:24 -0700

Merge branch 'master' of https://github.com/edvb54/dotfiles

Diffstat:
bash_profile
 | 
11
++++++-----
vim/bundle/fzf
 | 
2
+-
vim/bundle/neosnippet
 | 
2
+-
vim/bundle/neosnippet-snippets
 | 
2
+-
vim/bundle/vim-easy-align
 | 
2
+-
vim/bundle/vim-fugitive
 | 
2
+-
vim/bundle/vim-gitgutter
 | 
2
+-
vim/bundle/vim-pencil
 | 
2
+-
vim/bundle/vim-snippets
 | 
2
+-

9 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/bash_profile b/bash_profile
@@ -45,6 +45,7 @@ PS2="\$"
 
 # basic{{{1
 export EDITOR='vim'
+# export EDITOR='emacs'
 
 if [ "$TERM" == "xterm" ]; then
     export TERM=xterm-256color
@@ -65,11 +66,11 @@ alias cp='cp -i'
 alias ln='ln -i'
 alias rm='rm -i'
 
-alias vrc='vim ~/dotfiles/vimrc'
-alias vrcb='vim ~/dotfiles/vimrc.bundles'
-alias brc='vim ~/dotfiles/bashrc'
-alias bp='vim ~/dotfiles/bash_profile'
-alias tconf='vim ~/dotfiles/tmux.conf'
+alias vrc='$EDITOR ~/dotfiles/vimrc'
+alias vrcb='$EDITOR ~/dotfiles/vimrc.bundles'
+alias brc='$EDITOR ~/dotfiles/bashrc'
+alias bp='$EDITOR ~/dotfiles/bash_profile'
+alias tconf='$EDITOR ~/dotfiles/tmux.conf'
 
 alias v='xmodmap ~/.vim-keys.xmodmap'
 alias emacs='emacs -nw'
diff --git a/vim/bundle/fzf b/vim/bundle/fzf
@@ -1 +1 @@
-Subproject commit de0965619716d7222ee0ff17cf8ef1a37f2fd861
+Subproject commit 3e91c189aea13472ee1f2757482507c24b9e1ff5
diff --git a/vim/bundle/neosnippet b/vim/bundle/neosnippet
@@ -1 +1 @@
-Subproject commit 578530edf1a85a623b7915cd2904407081cadf36
+Subproject commit 8d61e62a65e7f0c278e02f3624cee535ecc11bec
diff --git a/vim/bundle/neosnippet-snippets b/vim/bundle/neosnippet-snippets
@@ -1 +1 @@
-Subproject commit 5571cf0c8f05204fafceb5aeafe2716ce91737cc
+Subproject commit 16570a91d81ea9c6dd7286a0579640ffea4e7d88
diff --git a/vim/bundle/vim-easy-align b/vim/bundle/vim-easy-align
@@ -1 +1 @@
-Subproject commit fc9555cd659586d10e767d56794699ba96dd5278
+Subproject commit f9a49e441d26276f247650edc359f3c85def4270
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 416165f0630f683b859fd56161183ca3d6eecc44
+Subproject commit 0cd33c617006a07331bf45c0970e3d4e82680f6a
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit c9595f22e82e0c65b3267f39ff815a68f69e636a
+Subproject commit fed2dbad3455f18d11d602a42a37233dab8d448b
diff --git a/vim/bundle/vim-pencil b/vim/bundle/vim-pencil
@@ -1 +1 @@
-Subproject commit 84b66f57b557d523451330f0d122ff055dffd074
+Subproject commit 8269202e82f547e466c732ca0d0c67719abe7fda
diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets
@@ -1 +1 @@
-Subproject commit 45bcd32d596ef9db84919d7a1fcb20e4c920cf92
+Subproject commit c3db5beee984402483afcfa83c6c6cc7131f316d