Merge branch 'master' of github.com:eaceaser/vimfiles

Conflicts: bundle/command-t bundle/vim-fugitive bundle/vim-pathogen
eaceaser · Feb 25, 2011 · c42a0c2 · c42a0c2
2 parents c647c64 + 2465d6f
commit c42a0c2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/bundle/command-t b/bundle/command-t
diff --git a/bundle/snipmate.vim b/bundle/snipmate.vim
diff --git a/bundle/vim-fugitive b/bundle/vim-fugitive
diff --git a/bundle/vim-pathogen b/bundle/vim-pathogen
diff --git a/bundle/vim-rails b/bundle/vim-rails
diff --git a/bundle/vim-ruby b/bundle/vim-ruby
diff --git a/vimrc b/vimrc
@@ -1,6 +1,7 @@
 set runtimepath^=~/.vim/bundle/vim-pathogen
 call pathogen#runtime_append_all_bundles()
-call scriptmanager#Activate(['vim-addon-sbt'])
+call scriptmanager#Activate()
+let g:vim_script_manager['plugin_root_dir']='~/.vim/addon-manager'
 
 " ScriptManager options
 
@@ -18,7 +19,7 @@ set nocompatible
 set cmdheight=2
 set ttyfast
 set smartcase
-set cursorline
+"set cursorline
 set hlsearch
 set list
 set shortmess=atI
@@ -37,7 +38,9 @@ set switchbuf=usetab
 " Font
 "set gfn=Consolas:h13
 "set gfn=Monaco:h11
-set gfn=Menlo:h11
+"set gfn=Menlo:h11
+set noantialias
+set gfn=fixed-6x13:h13
 if has("gui_running")
   colorscheme ir_black
   set guioptions=egm
@@ -69,7 +72,8 @@ set laststatus=2
 set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
 
 " folds
-set foldmethod=marker
+set foldmethod=syntax
+set foldnestmax=2
 
 if executable("ack")
   set grepprg=ack\ -H\ --nogroup\ --nocolor