Commit 4c43340

@@ -7,6 +7,7 @@ color ir_black
 set completefunc=syntaxcomplete#Complete
 set nocompatible      " Use vim, no vi defaults
 set number            " Show line numbers
+set numberwidth=5
 set ruler             " Show line and column number
 syntax enable         " Turn on syntax highlighting allowing local overrides
 set encoding=utf-8    " Set default encoding to UTF-8
@@ -32,6 +33,8 @@ set splitbelow        " open new splits below
 set autoread          " auto load changed files
 set title             " the title of the window will be set to the value of titlestring
 set clipboard=unnamed " use OS clipboard
+set noswapfile
+set autowrite
 set tags=./.git/tags,./tmp/tags,./tags,tags,._tags
 if $TERM == "xterm-256color" || $TERM == "screen-256color" || $COLORTERM == "gnome-terminal"
   set t_Co=256
@@ -45,6 +48,8 @@ set nowrap                        " don't wrap lines
 set tabstop=2                     " a tab is two spaces
 set softtabstop=2                 " number of spaces that a <Tab> counts for while performing editing
 set shiftwidth=2                  " an autoindent (with <<) is two spaces
+set shiftround                    " When shifting lines, round the indentation to the
+                                  " nearest multiple of 'shiftwidth.'
 set expandtab                     " use spaces, not tabs
 set list                          " Show invisible characters
 set backspace=indent,eol,start    " backspace through everything in insert mode
@@ -59,8 +64,10 @@ set listchars+=extends:>          " The character to show in the last column whe
 set listchars+=precedes:<         " The character to show in the last column when wrap is
                                   " off and the line continues beyond the left of the screen
 "set colorcolumn=80,100            " show color columns at 80 and 100
+set nojoinspaces " Use one space, not two, after punctuation.
 " }}}}
 
+
 "" Searching {{{{
 ""
 
@@ -119,7 +126,7 @@ set directory=/tmp//
 function! s:setupWrapping()
   set wrap
   set linebreak
-  set textwidth=72
+  set textwidth=80
   set nolist
 endfunction