vimrc: Improve check for spelling support.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index a3c95d338226cc406c55ab9cae8375e983687de6..f90d0724ed34d2d72b25d75cbf86464e1f6464c1 100644 (file)
--- 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
@@ -205,7 +213,7 @@ if has('syntax')
     endif
 
 " Highlight TODO, FIXME, CHANGED and XXX in all documents.
-    if v:version >= 701 && has('patch40')
+    if v:version > 701 || (v:version == 701 && has('patch42'))
         call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
     endif
 endif
@@ -235,13 +243,15 @@ if has('autocmd')
             \ if line("'\"") > 1 && line("'\"") <= line("$") |
             \     execute "normal! g'\"" |
             \ endif
+" But not for Git commits, go to beginning of the file.
+        autocmd BufReadPost COMMIT_EDITMSG normal! gg
 
 " AFTER/FTPLUGIN AUTO COMMANDS
 
 " Disable spell checking for files which don't need it.
-        autocmd FileType deb setlocal nospell
+        autocmd FileType deb  setlocal nospell
         autocmd FileType diff setlocal nospell
-        autocmd FileType tar setlocal nospell
+        autocmd FileType tar  setlocal nospell
 " Fix to allow Vim edit crontab files as crontab doesn't work with
 " backupcopy=auto.
         autocmd FileType crontab setlocal backupcopy=yes