Cleanup options

1 files changed, 9 insertions, 16 deletions

diff --git a/.vim/options.vim b/.vim/options.vim
index 353b9a5..4548b68 100644
--- a/.vim/options.vim
+++ b/.vim/options.vim
@@ -12,23 +12,22 @@ set number " Show line number
 set relativenumber " Show relative line number
 set cursorline " Select the current line
 set showmatch " Show matching brackets when overred
-set laststatus =2 " Fix for tabline
+set laststatus=2 " Fix for tabline
 set noshowmode " Disable the -- INSERTION -- default comment
-set so =7 " Set 7 lines to the cursor - when moving vertically
-set cmdheight=1 " Height of the command bar
-set regexpengine=0 " Set regular expression engine automatically
+set so=7 " Set 7 lines to the cursor - when moving vertically
 
 " Mouse options
-set mouse = "a" " Allow the mouse to do all the editing
+set mouse=a " Allow the mouse to do all the editing
 set ruler " Show the cursor position on the tagline
 
 " Indent options
-set softtabstop =4 " Size of a tab
-set shiftwidth =4 " Number of space for each indent
+set tabstop=4 " Size of a tab
+set shiftwidth=4 " Number of space for each indent
+set softtabstop=0 " Useless indent
 set noexpandtab " Vim will automatically use tab
-set smarttab " Add tab smartly
-set autoindent " Automatically set the indent of a new line
 set smartindent " Do clever indenting
+set copyindent " Copy indent style of the file
+set preserveindent " Preserve indent style
 
 " Automatic options
 set autowrite " Automatically write the file on certain actions
@@ -36,7 +35,7 @@ set autoread " Automatically read extern changes on the file
 
 " System
 if has('unnamedplus') " ALlow OS & vim clipboard sync
-    set clipboard = unnamedplus
+	set clipboard=unnamedplus
 endif
 set undofile " Save undo history
 set history =500 " Max line vim remember
@@ -61,8 +60,6 @@ else
     set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
 endif
 
-set hid " A buffer becomes hidden when it is abandoned
-
 " Configure backspace so it acts as it should act
 set backspace=eol,start,indent
 set whichwrap+=<,>,h,l
@@ -73,9 +70,6 @@ set lazyredraw
 " How many tenths of a second to blink when matching brackets
 set mat=2
 
-" Add a bit extra margin to the left
-set foldcolumn=1
-
 " Set utf8 as standard encoding and en_US as the standard language
 set encoding=utf8
 
@@ -84,7 +78,6 @@ set ffs=unix,dos,mac
 
 " Turn backup off, since most stuff is in SVN, git etc. anyway...
 set nobackup
-set nowb
 set noswapfile
 
 " Timeout