Skip to content
This repository has been archived by the owner on Aug 8, 2018. It is now read-only.

Commit

Permalink
Split MacVim related gui settings to gvimrc, it's excepted in MacVim
Browse files Browse the repository at this point in the history
fixes #8
  • Loading branch information
fatih committed Apr 7, 2013
1 parent 833d8fc commit 6dc56fb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
all:
[ -d ~/.vim/ ] || ln -s $(PWD)/vim/ ~/.vim
[ -f ~/.vimrc ] || ln -s $(PWD)/vim/base/vimrc ~/.vimrc
[ -f ~/.gvimrc ] || ln -s $(PWD)/vim/base/gvimrc ~/.gvimrc
[ -f ~/.ctags ] || ln -s $(PWD)/ctags ~/.ctags

clean:
[ -d ~/.vim/ ] || rm -f ~/.vim
[ -f ~/.vimrc ] || rm ~/.vimrc
[ -f ~/.gvimrc ] || rm ~/.gvimrc
[ -f ~/.ctags ] || rm ~/.ctags

.PHONY: all
12 changes: 12 additions & 0 deletions vim/base/gvimrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
"http://stackoverflow.com/questions/14802689/macvim-wont-load-specific-color-scheme-by-default
colorscheme molokai
highlight SignColumn guibg=#272822

"http://superuser.com/questions/319591/how-can-i-prevent-macvim-from-showing-os-x-find-replace-dialog-when-pressing-co
if has("gui_macvim")
" Disable print shortcut for 'goto anything...'
macmenu File.Print key=<nop>

" Disable new tab shortcut for 'goto file...'
macmenu File.New\ Tab key=<nop>
endif
4 changes: 0 additions & 4 deletions vim/base/vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ set smartcase " ... but now when search pattern contains upper
" ----------------------------------------------"
" MacVim modifications (color, shortcuts, etc.. "
" ----------------------------------------------"
colorscheme molokai
let g:molokai_original = 1
highlight SignColumn guibg=#272822

if has("gui_macvim")
" No toolbars, menu or scrollbars in the GUI
Expand All @@ -62,15 +60,13 @@ if has("gui_macvim")
set guioptions-=R

" Open ctrlp with cmd+p
macmenu File.Print key=<nop>
let g:ctrlp_map = '<D-p>'

" Open Go to symbol (via tags)
nmap <D-r> :MyCtrlPTag<cr>
nmap <D-R> :CtrlPBufTagAll<cr>
" Go to file
macm File.New\ Tab key=<nop>
nmap <D-t> :CtrlP<cr>
" Move with cmd+alt
Expand Down

0 comments on commit 6dc56fb

Please sign in to comment.