Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:adamhjk/adam-vim

  • Loading branch information...
commit 3bcc94046e67fd475e7fe335c68be5528e416e67 2 parents f631871 + 08ed9e6
@adamhjk authored
Showing with 10 additions and 3 deletions.
  1. +2 −0  Makefile
  2. +8 −3 vimrc
View
2  Makefile
@@ -1,6 +1,8 @@
install:
git submodule init
git submodule update
+ mkdir -p ~/.vimswaps
+ mkdir -p ~/.vimbackups
mkdir -p ~/.vim/bundle
ln -sf ~/.vim/vimrc ~/.vimrc
vim -c 'BundleInstall' -c 'qa!'
View
11 vimrc
@@ -64,7 +64,7 @@ set autoindent
set expandtab
colorscheme twilight
if has("gui_gtk2")
- set guifont=Bitstream\ Vera\ Sans\ Mono\ 16
+ set guifont=Inconsolata\ 12
else
set guifont=Inconsolata:h16
endif
@@ -85,8 +85,6 @@ set statusline+=%<%P " file position
compiler ruby
-autocmd FileType make set noexpandtab
-autocmd FileType python set noexpandtab
let g:fuzzy_ignore = "*.log"
let g:fuzzy_matching_limit = 70
@@ -137,6 +135,11 @@ nmap <D-0> g^
if (&term == 'xterm')
set t_Co=256
endif
+" Make CommandT work with rxvt
+if (&term == 'rxvt-unicode' || &xterm == 'rxvt')
+ let g:CommandTSelectNextMap = ['<C-n>', '<C-j>', '<ESC>OB']
+ let g:CommandTSelectPrevMap = ['<C-p>', '<C-k>', '<ESC>OA']
+endif
" Suppress lustyjuggler warnings
let g:LustyJugglerSuppressRubyWarning = 1
@@ -199,6 +202,8 @@ if has("autocmd")
augroup vimrcEx
au!
+ autocmd FileType make set noexpandtab
+ autocmd FileType python set noexpandtab
" For all text files set 'textwidth' to 78 characters.
Please sign in to comment.
Something went wrong with that request. Please try again.