X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=ea0e5f0823e19a69c2e544f730be6b278479c53d;hb=011957a689c77df4dc695d4a06f92e0e40d021c8;hp=1dfdbfcbd292a9df31521e3dacaaeb2ab30fd51a;hpb=11e37bdc2b784f00f65008f4d4cdf36917700d22;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 1dfdbfc..ea0e5f0 100644
--- a/vimrc
+++ b/vimrc
@@ -22,7 +22,7 @@ set wildmode=longest,list
 
 " EDIT SETTINGS
 
-" Enable automatic file detection, plugin and indention.
+" Enable automatic file detection, plugin and indention support.
 if has('autocmd')
     filetype plugin indent on
 endif
@@ -81,19 +81,20 @@ 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
 
-" Allow buffers with changes to be hidden.
+" Allow buffers with changes to be hidden. Very important for effective
+" editing with multiple buffers.
 set hidden
 
 
 " DISPLAY SETTINGS
 
-" Use a dark background. Doesn't change the background color, only sets colors
-" for a dark terminal.
+" Use a dark background. Doesn't change the background color, only sets text
+" colors for a dark terminal.
 set background=dark
 
 " Display line numbers.
@@ -116,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)
 
@@ -135,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
@@ -146,7 +155,7 @@ endif
 " Add semicolon to the end of the line. Thanks to
 " http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
 " on Freenode for an improved version which doesn't clobber any marks.
-nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<CR>
+nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
 
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 " Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
@@ -194,7 +203,7 @@ endif
 if has('syntax')
     syntax enable
 
-" Highlight text longer than 78 characters. Thanks to Tony Mechelynck
+" Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list.
 " It can easily be disabled if necessary with :2match (in Vim >= 700).
     if v:version >= 700
@@ -204,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
@@ -234,18 +243,20 @@ 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
 " Don't use the modeline as the diff created by `git commit -v` may contain
-" one which could change the filetype or other settings of the commit window.
+" one which could change the filetype or other settings of the commit buffer.
         autocmd FileType gitcommit setlocal nomodeline |
                                  \ let g:secure_modelines_allowed_items = []
 " Allow folding in perl.
@@ -256,7 +267,7 @@ if has('autocmd')
 
 " FTDETECT AUTO COMMANDS
 
-" Recognize .md as markdown files.
+" Recognize .md as markdown files (Vim default is .mkd).
         autocmd BufRead,BufNewFile *.md set filetype=mkd
 " Recognize .test as Tcl files.
         autocmd BufRead,BufNewFile *.test set filetype=tcl