From 722be55fde4a16165c65742daae1711ae3c4e468 Mon Sep 17 00:00:00 2001
From: Thomas Kolb <thomas@tkolb.de>
Date: Tue, 8 Oct 2013 23:04:42 +0200
Subject: [PATCH 1/3] [vim] Added switchbuf setting

---
 vim/vimrc.local | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vim/vimrc.local b/vim/vimrc.local
index 59eb784..21b5bca 100644
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -27,6 +27,9 @@ set printoptions=paper:A4,syntax:y
 
 set modeline
 
+" re-use tabs, open hidden buffers in new tabs
+set switchbuf=usetab,newtab
+
 filetype plugin on
 filetype indent on
 

From 1aa17ba1be108c73e9dd2c5d7b997b101d7d07b6 Mon Sep 17 00:00:00 2001
From: Thomas Kolb <thomas@tkolb.de>
Date: Tue, 26 Nov 2013 18:43:29 +0100
Subject: [PATCH 2/3] Hide gvim toolbar

---
 vim/gvimrc.user | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vim/gvimrc.user b/vim/gvimrc.user
index e69de29..740576f 100644
--- a/vim/gvimrc.user
+++ b/vim/gvimrc.user
@@ -0,0 +1,3 @@
+set guifont=dejavu\ sans\ mono\ 9
+set guioptions-=T
+

From 0e5210d1d3006ae558a452a3a8f45a21d58032ca Mon Sep 17 00:00:00 2001
From: Thomas Kolb <thomas@tkolb.de>
Date: Tue, 4 Mar 2014 18:30:08 +0100
Subject: [PATCH 3/3] Display invisible characters by default, some changes to
 highlighting

---
 vim/gvimrc.local |  7 +++----
 vim/vimrc.local  | 48 ++++++++++++++++++------------------------------
 2 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/vim/gvimrc.local b/vim/gvimrc.local
index 8e23219..7fc36c7 100644
--- a/vim/gvimrc.local
+++ b/vim/gvimrc.local
@@ -1,4 +1,3 @@
-colorscheme desert
-"highlight CursorLine guibg=#222222
-highlight EndSpace guibg=#802020
-match EndSpace /\s\+$/
+colorscheme evening
+
+highlight CursorLine guibg=#222222
diff --git a/vim/vimrc.local b/vim/vimrc.local
index 21b5bca..8be5fff 100644
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -1,36 +1,24 @@
-" The following are commented out as they cause vim to behave a lot
-" differently from regular Vi. They are highly recommended though.
-set showcmd		" Show (partial) command in status line.
-"set showmatch		" Show matching brackets.
-"set ignorecase		" Do case insensitive matching
-"set smartcase		" Do smart case matching
-set incsearch		" Incremental search
-"set autowrite		" Automatically save before commands like :next and :make
-"set hidden             " Hide buffers when they are abandoned
-set mouse=a		" Enable mouse usage (all modes)
+set ts=2
+set sw=2
+set showcmd
+set nofsync
+set swapsync=
+set incsearch
 set hlsearch
-
-set tabstop=2
-set shiftwidth=2
-
-imap <C-F> <C-X><C-F>
-imap <C-O> <C-X><C-O>
-
-" settings for LaTeX-Suite
-set grepprg=grep\ -nH\ $*
-let g:tex_flavor='latex'
-
 set cursorline
 
-set printdevice=CanoniP4300
-set printoptions=paper:A4,syntax:y
-
-set modeline
-
-" re-use tabs, open hidden buffers in new tabs
-set switchbuf=usetab,newtab
+" Set up visible whitespace by default
+set list
+set listchars=tab:»-,trail:~,extends:>,precedes:<
+highlight NonText guifg=#808080 ctermfg=DarkGray
+highlight SpecialKey guifg=#808080 ctermfg=DarkGray
 
+" filetype dependent indentation
 filetype plugin on
-filetype indent on
+if has("autocmd")
+	filetype plugin indent on
+endif
 
-colorscheme koehler
+" Alternative for listchars above to highlight trailing spaces
+"highlight EndSpace guibg=#ff8080
+"match EndSpace /\s\+$/