linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'cadusk/master'

Browse source 
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
This commit is contained in:
Gaetan Semet 2013-06-13 17:13:13 +02:00
commit 60f4ae1bed
4 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/vim-override/vim-override.plugin.zsh
View file

@ -1,7 +1,7 @@
# try to replace OSX's default vim by MacVim's version
RECENTVIM=`test -e /usr/local/Cellar/macvim && find /usr/local/Cellar/macvim -name Vim`
MACVIM="/usr/local/bin/mvim"
# if mode indicator wasn't setup by theme, define default
if [[ "$OSTYPE" == darwin* && -e $RECENTVIM ]]; then
alias vim="$RECENTVIM"
if [[ "$OSTYPE" == darwin* && -e $MACVIM ]]; then
alias vim="$MACVIM -v"
fi