@@ -1,6 +1,7 @@

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

 " 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

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

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

@@ -73,10 +74,7 @@ let mapleader = ","

 let g:mapleader = ","

 " Fast saving

-"nmap <leader>w :w!<cr>

-

-" Set 256 colors

-set t_Co=256

+nmap <leader>w :w!<cr>

 "========"

@@ -97,6 +95,8 @@ if isdirectory(expand("~/.vim/bundle/Vundle.vim"))

     Plugin 'gmarik/Vundle.vim'

     Plugin 'scrooloose/nerdtree'

+    Plugin 'chrisbra/Recover.vim'

+    Plugin 'tpope/vim-commentary'

     " All of your Plugins must be added before the following line

     call vundle#end()            " required

     filetype plugin indent on    " and turn it back on!

@@ -117,7 +117,6 @@ else

 endif

-

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

 " => VIM user interface

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

@@ -183,13 +182,7 @@ syntax enable

 colorscheme desert

 set background=dark

-" Set extra options when running in GUI mode

-if has("gui_running")

-    set guioptions-=T

-    set guioptions+=e

-    set t_Co=256

-    set guitablabel=%M\ %t

-endif

+set t_Co=256

 " Set utf8 as standard encoding and en_US as the standard language

 set encoding=utf8

@@ -201,10 +194,41 @@ set ffs=unix,dos,mac

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

 " => Files, backups and undo

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

+" Backup

+let backupdir=$HOME . "/.vim/.backup//"

+if !isdirectory(backupdir)

+    call mkdir(backupdir, "p", 0700)

+endif

+let &backupdir=backupdir

-set undodir=~/.vim/.undo//

-set backupdir=~/.vim/.backup//

-set directory=~/.vim/.swp//

+" Undo

+let dir=$HOME . "/.vim/.undo//"

+let &undodir=dir

+if !isdirectory(dir)

+    call mkdir(dir, "p", 0700)

+endif

+set undofile                " Save undos after file closes

+set undolevels=1000         " How many undos

+set undoreload=10000        " Number of lines to save for undo

+

+" Swap

+let dir=$HOME . "/.vim/.swp//"

+let &directory=dir

+if !isdirectory(dir)

+    call mkdir(dir, "p", 0700)

+endif

+

+" Specific set if running sudo

+let output =  system("test $EUID -eq 0")

+if v:shell_error == 0

+    set nobackup

+    set noundofile

+    set noswapfile

+endif

+

+" Clean variables

+unlet dir

+unlet output

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

@@ -315,12 +339,13 @@ nmap <M-k> mz:m-2<cr>`z

 vmap <M-j> :m'>+<cr>`<my`>mzgv`yo`z

 vmap <M-k> :m'<-2<cr>`>my`<mzgv`yo`z

-if has("mac") || has("macunix")

-  nmap <D-j> <M-j>

-  nmap <D-k> <M-k>

-  vmap <D-j> <M-j>

-  vmap <D-k> <M-k>

-endif

+" Duplicate lines using Ctrl+D

+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>

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

 func! DeleteTrailingWS()

@@ -377,7 +402,6 @@ map <leader>sa zg

 map <leader>s? z=

-

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

 " => Misc

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

@@ -393,12 +417,11 @@ map <leader>pp :setlocal paste!<cr>

 " Toggle hilight search on or or using F8 (source: http://www.developpez.net/forums/d8477/systemes/linux/applications/enlever-surbrillance-lors-recherche-vi/)

 nnoremap <f8> :set hlsearch!\|set hlsearch?<cr>

-" visually select block of text to comment (modified from http://vim.wikia.com/wiki/Commenting_out_a_range_of_lines)

-vmap <C-M>  :s/^/#/<CR>:noh<CR>

-

-" uncomment visually selected text, with Ctrl-N,N(modified from http://vim.wikia.com/wiki/Commenting_out_a_range_of_lines)

-vmap <C-N> :s/^#//<CR>:noh<CR>

+" Clear search

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

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

+vmap <C-M> gc

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