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

diff --git a/vimrc b/vimrc
index 98009b8..040dad1 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
@@ -147,18 +155,21 @@ 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
 " mailing list for the commands.
 if v:version < 700
     cnoreabbrev W w
+    cnoreabbrev Wa wa
     cnoreabbrev Wq wq
     cnoreabbrev Wqa wqa
 else
     cnoreabbrev <expr> W
         \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'w' : 'W')
+    cnoreabbrev <expr> Wa
+        \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wa' : 'Wa')
     cnoreabbrev <expr> Wq
         \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wq' : 'Wq')
     cnoreabbrev <expr> Wqa
@@ -238,6 +249,17 @@ if has('autocmd')
 " But not for Git commits, go to beginning of the file.
         autocmd BufReadPost COMMIT_EDITMSG normal! gg
 
+" Make sure 'list' and 'number' is disabled in help files. This is necessary
+" when switching to a help buffer which is in the background with :buffer as
+" these options are local to windows (and not only to buffers). This happens
+" because I often want to use only one window and thus the help buffer is in
+" the background.
+        autocmd BufWinEnter *.txt
+            \ if &filetype == 'help' |
+            \     setlocal nolist |
+            \     setlocal nonumber |
+            \ endif
+
 " AFTER/FTPLUGIN AUTO COMMANDS
 
 " Disable spell checking for files which don't need it.
@@ -247,14 +269,17 @@ if has('autocmd')
 " 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.
+" Don't use the modeline in git commits as the diff created by `git commit -v`
+" may contain one which could change the filetype or other settings of the
+" commit buffer. Also make sure we use only 72 characters per line which is
+" the recommendation for git commit messages (http://tpope.net/node/106).
         autocmd FileType gitcommit setlocal nomodeline |
-                                 \ let g:secure_modelines_allowed_items = []
+                                 \ let g:secure_modelines_allowed_items = [] |
+                                 \ setlocal textwidth=72
 " Allow folding in perl.
         autocmd FileType perl let perl_fold = 1 |
                             \ let perl_fold_blocks = 1
-" Use the same comment string as for Vim files in vimperator files.
+" Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s
 
 " FTDETECT AUTO COMMANDS