Merge branch 'master' of tardis:/dotfiles

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index baf2aed0eb3799cfcb9d605f203938187b05a6c5..4c3b382dfeeb133073707adcae8378143dd1b96f 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -1,15 +1,8 @@
-" An example for a vimrc file.
+" My vimrc file.

 "
 "

-" Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last change: 2008 Dec 17
+" Maintainer:   Samir Benmendil <ram-z@chakra-project.org>

 "
 "

-" To use it, copy it to
-"     for Unix and OS/2:  ~/.vimrc
-"            for Amiga:  s:.vimrc
-"  for MS-DOS and Win32:  $VIM\_vimrc
-"          for OpenVMS:  sys$login:.vimrc

 
 

-" When started as "evim", evim.vim will already have done these settings.

 if v:progname =~? "evim"
   finish
 endif
 if v:progname =~? "evim"
   finish
 endif


@@ -29,15 +22,15 @@ set nocompatible
 set backspace=indent,eol,start
 
 if has("vms")
 set backspace=indent,eol,start
 
 if has("vms")

-  set nobackup         " do not keep a backup file, use versions instead
+  set nobackup          " do not keep a backup file, use versions instead

 else
 else

-  set backup           " keep a backup file
+  set backup            " keep a backup file

   set backupdir=$HOME/.vim/backupdir
 endif
   set backupdir=$HOME/.vim/backupdir
 endif

-set history=50         " keep 50 lines of command line history
-set ruler              " show the cursor position all the time
-set showcmd            " display incomplete commands
-set incsearch          " do incremental searching
+set history=50          " keep 50 lines of command line history
+set ruler               " show the cursor position all the time
+set showcmd             " display incomplete commands
+set incsearch           " do incremental searching

 set number              " show some linenumbers
 
 " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
 set number              " show some linenumbers
 
 " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries


@@ -106,7 +99,7 @@ if has("autocmd")
 
 else
 
 
 else
 

-  set autoindent               " always set autoindenting on
+  set autoindent                " always set autoindenting on

 
 endif " has("autocmd")
 
 
 endif " has("autocmd")
 


@@ -115,7 +108,7 @@ endif " has("autocmd")
 " Only define it when not defined already.
 if !exists(":DiffOrig")
   command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis
 " Only define it when not defined already.
 if !exists(":DiffOrig")
   command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis

-                 \ | wincmd p | diffthis
+                  \ | wincmd p | diffthis

 endif
 
 " Ask what to do when closing unsaved documents
 endif
 
 " Ask what to do when closing unsaved documents