Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Some more tweaks

  • Loading branch information...
commit 6bb0c6760de775be811d82416e64adc5da3559ee 1 parent f7858bc
Fran Casas authored March 17, 2012

Showing 1 changed file with 12 additions and 10 deletions. Show diff stats Hide diff stats

  1. 22  gvimrc/vimrc
22  gvimrc/vimrc
@@ -36,7 +36,6 @@ Bundle 'int3/vim-extradite'
36 36
 Bundle 'tpope/vim-surround'
37 37
 Bundle 'tpope/vim-ragtag'
38 38
 Bundle 'vim-scripts/tComment'
39  
-Bundle 'ervandew/supertab'
40 39
 Bundle 'edsono/vim-matchit'
41 40
 Bundle 'Raimondi/delimitMate'
42 41
 Bundle 'tpope/vim-endwise'
@@ -70,9 +69,9 @@ colorscheme solarized
70 69
 set guioptions=ac
71 70
 set number
72 71
 set cursorline
73  
-set colorcolumn=80 " Mark 80th column with a red line
  72
+set colorcolumn=80
74 73
 set list
75  
-set listchars=tab:▸\ ,eol:¬,trail:. " Same invisibles as in TextMate
  74
+set listchars=tab:▸\ ,eol:¬,trail:·
76 75
 set diffopt+=iwhite
77 76
 set cpoptions+=$ " Mark with a $ at the end of a 'change' command
78 77
 set showcmd
@@ -88,6 +87,8 @@ let g:syntastic_enable_signs=1
88 87
 let g:notes_directory = '~/Documents/Notes'
89 88
 " Force easytags.vim to take ctags from homebrew
90 89
 let g:easytags_cmd = "/usr/local/bin/ctags"
  90
+" Use solarized to highlight trailing white spaces
  91
+let g:solarized_hitrail = 1
91 92
 
92 93
 "}}}
93 94
 
@@ -127,6 +128,7 @@ set statusline+=%=%-14.(%l,%c%V%)\ %p%%
127 128
 " Some defaults I like/need
128 129
 " ******************************************************************************
129 130
 set scrolloff=3 " Leave 8 lines before start scrolling
  131
+set backspace=indent,eol,start
130 132
 runtime macros/matchit.vim " Needed for the ruby block object plugin
131 133
 set spell
132 134
 set spelllang=en_us
@@ -138,17 +140,17 @@ set ignorecase
138 140
 set smartcase
139 141
 "}}}
140 142
 
141  
-" Don't forget to set ft for Ruby files
  143
+" Don't forget to set missing ft for Ruby files
142 144
 au BufRead,BufNewFile {caprc,autotest,.caprc} set ft=ruby
143 145
 
144 146
 " ******************************************************************************
145 147
 " Auto completion
146 148
 " ******************************************************************************
147 149
 " Pretty auto completion"{{{
148  
-set wildmenu
149  
-set wildignore+=*.o,*.obj,.git,*.rbc
150  
-set wildmode=longest,list:full
151  
-set complete=.,t,w
  150
+imap <Tab> <C-N>
  151
+set completeopt=longest,menu
  152
+set complete=.,w,b,u,t
  153
+set wildmode=longest,list:longest
152 154
 "}}}
153 155
 
154 156
 " Auto complete for ruby"{{{
@@ -175,6 +177,8 @@ map <silent> <F2> :FixWhitespace<CR>
175 177
 map <silent> ,n :noh<CR>
176 178
 nnoremap <silent> ,<space> :NERDTreeToggle<CR>
177 179
 noremap ,a :Ack<space>
  180
+map <Leader>e :e <C-R>=expand("%:p:h") . "/" <CR>
  181
+map <Leader>te :tabe <C-R>=expand("%:p:h") . "/" <CR>
178 182
 "}}}
179 183
 " VIMRC mappings"{{{
180 184
 nmap <silent> ,ev :e $MYVIMRC
@@ -262,8 +266,6 @@ function! InitializeDirectories()
262 266
 endfunction
263 267
 call InitializeDirectories()"}}}
264 268
 
265  
-" Use solarized to highlight trailing white spaces
266  
-let g:solarized_hitrail = 1
267 269
 function! s:FixWhitespace(line1,line2)
268 270
     let l:save_cursor = getpos(".")
269 271
     silent! execute ':' . a:line1 . ',' . a:line2 . 's/\s\+$//'

0 notes on commit 6bb0c67

Please sign in to comment.
Something went wrong with that request. Please try again.