X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=f90d0724ed34d2d72b25d75cbf86464e1f6464c1;hb=85e5af4da2b16b8a0e088bb67937ba18067a52e9;hp=98009b8611eb2885af03a11a4057c57899698ce9;hpb=74aff9e33024011449e14e562e517f0447460d8a;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 98009b8..f90d072 100644
--- a/vimrc
+++ b/vimrc
@@ -81,7 +81,7 @@ set smartcase
 
 " Activate spell checking, use English as default. Don't use spell checking
 " when diffing.
-if v:version >= 700 && !&diff
+if v:version >= 700 && has('syntax') && !&diff
     set spell
     set spelllang=en_us
 endif
@@ -117,6 +117,11 @@ if v:version >= 700
     set listchars+=nbsp:!
 endif
 
+" Always display the status line even if there is only one window.
+if has('statusline')
+    set laststatus=2
+endif
+
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
@@ -136,6 +141,9 @@ nnoremap <Leader>8 :8b<CR>
 nnoremap <Leader>9 :9b<CR>
 nnoremap <Leader>0 :10b<CR>
 
+" Make last active window the only window. Similar to <C-w> o.
+nnoremap <C-w>O <C-w>p<C-w>o
+
 " Maps to change spell language between English and German and disable spell
 " checking.
 if v:version >= 700