Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Showing with 14 additions and 8 deletions.
  1. +4 −0 ackrc
  2. +1 −1 vim/bundle/syntastic
  3. +1 −1 vim/bundle/tagbar
  4. +1 −1 vim/bundle/vim-yankring
  5. +7 −5 vimrc
View
4 ackrc
@@ -1 +1,5 @@
+--color
+--smart-case
--pager=less
+--ignore-dir=log/
+--ignore-dir=vendor/bundle/ruby
2 vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 68291789086f0ce825f9794f2bb15851fb28df6b
+Subproject commit 7fc5246be4be9e1034e84266ae567a08e193f764
2 vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit 814bb41ecfb90313e7188745bc3913abdb747af1
+Subproject commit 272e2e84784e9a4bc7603da9ca26a22ff6c8e6b9
2 vim/bundle/vim-yankring
@@ -1 +1 @@
-Subproject commit 37f57f839fc5ff13ddf2445077796b134b637a4e
+Subproject commit e9b192629fa3a136a37e40bd205a02b4fa3ca4dc
View
12 vimrc
@@ -21,7 +21,7 @@ filetype plugin indent on " Turn on file type detection.
" Solarized theme
set t_Co=256
let g:solarized_termcolors=256
-let g:solarized_contrast="high"
+"let g:solarized_contrast="high"
set background=light
color solarized
"set background=dark
@@ -54,7 +54,7 @@ set hidden " Hide buffers instead of closing them
set wildmenu " Enhanced command line completion.
set wildmode=list:longest,list:full " Complete files like a shell.
-set wildignore=*.swp,*.bak,*.pyc,*.o,*.obj,*.class,*.rbc,.git,.svn,vendor/gems,vendor/bundle/**,vendor/cache/**
+set wildignore=*.swp,*.bak,*.pyc,*.o,*.obj,*.class,*.rbc,.git,.svn,vendor/gems,vendor/bundle/**,vendor/cache/**,log/**,public/assets/**,tmp/**
" Searching
set incsearch " Highlight matches as you type.
@@ -132,7 +132,8 @@ vmap <s-tab> <gv
let mapleader=","
" Map escape to Ctrl-C
-map <c-c> <esc>
+"map <c-c> <esc>
+map <c-[> <esc>
" switch buffers with leader leader
nnoremap <leader><leader> <c-^>
@@ -219,11 +220,12 @@ runtime! macros/matchit.vim
let g:CommandTMaxHeight=20
nmap <silent> <Leader>b :CommandTFlush<cr>\|:CommandTBuffer<CR>
nmap <silent> <Leader>t :CommandTFlush<cr>\|:CommandT<CR>
-" http://vimcasts.org/e/14
-cnoremap %% <C-R>=expand('%:h').'/'<cr>
map <leader>f :CommandTFlush<cr>\|:CommandT <cr>
map <leader>F :CommandTFlush<cr>\|:CommandT %%<cr>
+" http://vimcasts.org/e/14
+cnoremap %% <C-R>=expand('%:h').'/'<cr>
+
" Tabular Config
if exists(":Tabularize")
nmap <Leader>a= :Tabularize /=<CR>

No commit comments for this range

Something went wrong with that request. Please try again.