@@ -1,8 +1,9 @@

 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

 " Versions

 "

-" v1.0 - 2020-03-15: Backup, undo and swap improved / text duplication mapping / search and replace mapping / plugins added / code cleaned

-" v0.4 - 2019-11-20: Backup, undo and swap added

+" v1.1 - 2020-08-16: status line improved / comment symbol for R filetype added / comment shortcut improved / replacement shortcut improved / tabedit shortcut improved

+" v1.0 - 2020-03-15: backup, undo and swap improved / text duplication mapping / search and replace mapping / plugins added / code cleaned

+" v0.4 - 2019-11-20: backup, undo and swap added

 " v0.3 - 2019-07-07: Vundle installation detection

 " v0.2 - 2015-02-19: Vundle added

 " v0.1 - 2014-10-19: variable for screen integration set / commands for (un)commenting block added / no backup behavior

@@ -172,6 +173,9 @@ set novisualbell

 set t_vb=

 set tm=500

+" Set time out between keystroke

+set timeoutlen=300

+

 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

 " => Colors and Fonts

@@ -252,6 +256,9 @@ set ai "Auto indent

 set si "Smart indent

 set wrap "Wrap lines

+" Comment symbol for filetype

+autocmd FileType r setlocal commentstring=#\ %s

+

 """"""""""""""""""""""""""""""

 " => Visual mode related

@@ -296,7 +303,7 @@ map <leader>tm :tabmove

 " Opens a new tab with the current buffer's path

 " Super useful when editing files in the same directory

-map <leader>te :tabedit <c-r>=expand("%:p:h")<cr>/

+map <leader>te :tabedit <c-r>=fnameescape(expand("%:p:h"))<cr>/

 " Switch CWD to the directory of the open buffer

 map <leader>cd :cd %:p:h<cr>:pwd<cr>

@@ -323,6 +330,14 @@ set viminfo^=%

 " Always show the status line

 set laststatus=2

+" Change the status line based on mode

+au InsertEnter * call InsertStatuslineColor(v:insertmode)

+au InsertChange * call InsertStatuslineColor(v:insertmode)

+au InsertLeave * hi statusline term=reverse ctermfg=15 ctermbg=0

+

+" Default the statusline when entering Vim

+hi statusline term=reverse ctermfg=15 ctermbg=0

+

 " Format the status line

 set statusline=\ %{HasPaste()}%F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ \ Col.:\ %c

@@ -344,8 +359,11 @@ vmap <C-d> :'<,'>t'><cr>'[O<Esc>

 nmap <C-d> yyp

 " Search and replace

-nnoremap <leader>h y:<C-U>let replacement = input('Enter replacement string: ') <bar> %s//\=replacement/gc<CR>

-xnoremap <leader>h y:<C-U>let replacement = input('Enter replacement string: ') <bar> %s/<C-R>"/\=replacement/gc<CR>

+nnoremap <leader>h y:<C-U>let replacement = input('Enter replacement string: ') <bar> s//\=replacement/gc<CR>

+xnoremap <leader>h y:<C-U>let replacement = input('Enter replacement string: ') <bar> s/<C-R>"/\=replacement/gc<CR>

+

+nnoremap <leader>hh y:<C-U>let replacement = input('Enter replacement string: ') <bar> %s//\=replacement/gc<CR>

+xnoremap <leader>hh y:<C-U>let replacement = input('Enter replacement string: ') <bar> %s/<C-R>"/\=replacement/gc<CR>

 " Delete trailing white space on save, useful for Python and CoffeeScript ;)

 func! DeleteTrailingWS()

@@ -420,8 +438,9 @@ nnoremap <f8> :set hlsearch!\|set hlsearch?<cr>

 " Clear search

 map <leader>c :let @/=""<CR>

-" (Un)comment block of text (depend on commentary-vim plugin)

-vmap <C-M> gc

+" (Un)comment block of text (depends on commentary-vim plugin) (works with C-/)

+vmap <C-_> gc

+nmap <C-_> gcc

 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""

@@ -483,3 +502,14 @@ function! <SID>BufcloseCloseIt()

      execute("bdelete! ".l:currentBufNum)

    endif

 endfunction

+

+" Status line color on mode

+function! InsertStatuslineColor(mode)

+  if a:mode == 'i'

+    hi statusline term=reverse ctermfg=166 ctermbg=0

+  elseif a:mode == 'r'

+    hi statusline term=reverse ctermfg=160 ctermbg=0

+  else

+    hi statusline term=reverse ctermfg=5 ctermbg=0

+  endif

+endfunction