vim: sort file_rec by rank

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 7338d4da066c760d188dd07a58deafe3ddc5331e..23889f1e992244a308377e6cca687eff7b1acf8d 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -247,6 +247,7 @@ set directory=$XDG_CACHE_HOME/vim/swap//
 set history=5000                " how many command lines are remembered
 set wildmenu                    " command-line completion shows a list of matches
 set wildmode=longest:full,full  " specifies how command line completion works
 set history=5000                " how many command lines are remembered
 set wildmenu                    " command-line completion shows a list of matches
 set wildmode=longest:full,full  " specifies how command line completion works

+set wildignorecase              " ignore case when completing file names

 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files
 
 set wildignore+=.hg,.git,.svn                    " Version control
 set wildignore+=*.aux,*.out,*.toc                " LaTeX intermediate files


@@ -349,7 +350,7 @@ nnoremap <leader>p+ :silent! set paste<CR>"+p:set nopaste<CR>
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0
 function! StripWhitespace(line1, line2, ...)  " {{{2
   let s_report = &report
   let &report=0

-  let pattern = a:0 ? a:1 : '[\\]\@<!\s\+$'
+  let pattern = a:0 ? a:1 : '\s\+$'

   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()
   let oldview = winsaveview()
   exe 'keepjumps keeppatterns '.a:line1.','.a:line2.'substitute/'.pattern.'//e'
   if oldview != winsaveview()


@@ -555,8 +556,10 @@ nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0
 
 let g:pymode_rope_completion = 0
 let g:pymode_rope = 0

+let g:pymode_run = 0

 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"

+let g:pymode_lint_cwindow = 0           " don't open cwindow when linting

 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 " signature {{{2
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
 " signature {{{2


@@ -638,11 +641,11 @@ let g:unite_source_grep_max_candidates = 2000
 if executable('ag')
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'
 if executable('ag')
     " Use ag in unite grep source.
     let g:unite_source_grep_command = 'ag'

-    let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''

     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
     let g:unite_source_grep_recursive_opt = ''
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>

-command! -nargs=1 Ag Unite grep -input=<args>
+command! -nargs=1 Ag Unite grep:.::<args>

 
 " unite-file_rec {{{3
 if executable('ag')
 
 " unite-file_rec {{{3
 if executable('ag')


@@ -650,6 +653,7 @@ if executable('ag')
     let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
     let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
 end
 nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>

+call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')

 
 " unite-buffer {{{3
 call unite#custom#default_action('buffer', 'open')
 
 " unite-buffer {{{3
 call unite#custom#default_action('buffer', 'open')


@@ -689,7 +693,6 @@ let g:ycm_complete_in_comments = 1
 let g:ycm_complete_in_strings  = 1
 let g:ycm_autoclose_preview_window_after_insertion = 0
 "let g:ycm_extra_conf_vim_data = ['%:p']
 let g:ycm_complete_in_strings  = 1
 let g:ycm_autoclose_preview_window_after_insertion = 0
 "let g:ycm_extra_conf_vim_data = ['%:p']

-nnoremap gd :YcmCompleter GoTo<CR>

 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode