X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/ced2503ba7d51b1e898512c9bfa37d6d1cbb2ba5..89927a18aec1125415cef6788bc3190c6e25d664:/vimrc

diff --git a/vimrc b/vimrc
index 55906d8..13d2097 100644
--- a/vimrc
+++ b/vimrc
@@ -1,16 +1,8 @@
 " My vimrc file.
 "
-" Maintainer:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
+" Author:   Samir Benmendil <samir.benmendil[at]gmail[dot]com>
 "
 
-if v:progname =~? "evim"
-  finish
-endif
-
-" Use Vim settings, rather than Vi settings (much better!).
-" This must be first, because it changes other options as a side effect.
-set nocompatible
-
 " pathogen.vim runtime path manipulation
 silent! call pathogen#infect()
 
@@ -19,7 +11,23 @@ set incsearch
 set ignorecase
 set smartcase
 set hlsearch
-nmap <Leader>q :nohl<CR>
+" use leader-n to unhighlight search
+nmap <silent> <Leader>n :silent nohl<CR>
+" use leader-# to display the number of matches for the last search
+nmap <Leader># :%s:<C-R>/::gn<CR>
+
+" line wrap {{{1
+set backspace=indent,eol,start " allow backspacing over everything in insert mode
+set wrap                       " wrap lines
+set linebreak                  " do not wrap in the middle of a word
+set showbreak=▒▒               " show these chars for wrapped lines
+
+" backup/undo {{{1
+set backup      " keep a backup file
+set backupdir=$HOME/.vim/backupdir
+
+set undofile    " persistent undo history
+set undodir=$HOME/.vim/backupdir
 
 " NERDTree {{{1
 " open/close NERDTree with \e
@@ -40,19 +48,10 @@ let g:airline#extensions#tabline#enabled = 1
 :nmap <Leader>M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4<CR>
 :nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
 
-" backup {{{1
-if has("vms")
-  set nobackup          " do not keep a backup file, use versions instead
-else
-  set backup            " keep a backup file
-  set backupdir=$HOME/.vim/backupdir
-endif
-
 " appearance {{{1
 set background=dark            " Dark background, d'uh!
 set number                     " show some linenumbers
 set showmatch                  " Show matching brackets.
-set showbreak=▒▒                  " show these chars for wrapped lines
 set list listchars=tab:»·,trail:· " show these chars for tabs and trailing spaces
 
 " misc options {{{1
@@ -64,7 +63,6 @@ set autowrite                  " Automatically save before commands like :next a
 "set hidden                    " Hide buffers when they are abandoned
 set splitright                 " split right when using :vsp
 set scrolloff=5                " keep at least n lines above/below
-set backspace=indent,eol,start " allow backspacing over everything in insert mode
 
 set viminfo='100,<50,s10,h,n~/.vim/viminfo " viminfo defaults but save file in .vim