X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=fbf5a87cfb4e8f16e589b832493ff7e82ede6979;hb=a03d948a3ffa426a0eb25f0f06d3ed29bd0ab2b3;hp=c17af79ecc882b0031fdfc4ce44a0ed82a51c20f;hpb=8edcfdb041cfb28a56369e1a65296a527d1632d2;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index c17af79..fbf5a87 100644
--- a/vimrc
+++ b/vimrc
@@ -19,15 +19,10 @@ set nomodeline
 " possible files.
 set wildmode=longest,list
 
-" Increase number of tabs which can be opened with the -p option.
-if v:version >= 700
-    set tabpagemax=50
-endif
-
 
 " 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
@@ -43,7 +38,7 @@ set textwidth=78
 set shiftwidth=4
 set softtabstop=4
 set expandtab
-" When < and > is used indent/deindent to the next shiftwidth boundary.
+" When < and > is used indent/deindent to the next 'shiftwidth' boundary.
 set shiftround
 " Use the default value for real tabs.
 set tabstop=8
@@ -91,16 +86,18 @@ if v:version >= 700 && !&diff
     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.
+" Use a dark background. Doesn't change the background color, only sets text
+" colors for a dark terminal.
 set background=dark
 
-" Activate lines display.
+" Display line numbers.
 set number
 " Display the ruler with current line/file position.
 set ruler
@@ -115,7 +112,15 @@ endif
 " Display tabs, trailing space, non breakable spaces and long lines (when
 " wrapping is enabled).
 set list
-set listchars=trail:-,nbsp:!,extends:>
+set listchars=trail:-,extends:>
+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,7 +141,11 @@ nnoremap <Leader>8 :8b<CR>
 nnoremap <Leader>9 :9b<CR>
 nnoremap <Leader>0 :10b<CR>
 
-" Maps to change spell language between English and German and disable it.
+" 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
     map <Leader>sn :set nospell<CR>
     map <Leader>se :set spell spelllang=en_us<CR>
@@ -194,8 +203,9 @@ endif
 if has('syntax')
     syntax enable
 
-" Highlight text longer then 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
         2match Todo /\%>78v./
     else
@@ -203,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
@@ -233,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
@@ -255,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