X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=2769ffd6e083b48c022fa8edbaefae70e39cc975;hb=704caf1b57d0a74005ee1b6c5540b07514e39bcb;hp=c8ce11fbdc94473ca077709c62af901014d5db6c;hpb=56dfd46a24028e0466a04014a449747bb1ab9cee;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index c8ce11f..2769ffd 100644
--- a/vimrc
+++ b/vimrc
@@ -10,6 +10,11 @@ if $HOME == '/root' || exists('$SUDO_USER')
     qa
 endif
 
+
+" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
+" system wide configuration file doesn't change default values.
+set all&
+
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
@@ -106,7 +111,8 @@ set background=dark
 
 " Display line numbers.
 set number
-" Display the ruler with current line/file position.
+" Display the ruler with current line/file position. If 'statusline' is used
+" then this only affects <C-g>.
 set ruler
 " Display partial commands in the status line.
 set showcmd
@@ -117,16 +123,34 @@ if v:version >= 700
 endif
 
 " Display tabs, trailing space, non breakable spaces and long lines (when
-" wrapping is enabled).
+" wrapping is disabled).
 set list
 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')
+    " Always display the status line even if there is only one window.
     set laststatus=2
+
+    set statusline=
+    " on the left
+    set statusline+=%02n: " buffer number
+    set statusline+=%f\   " path to current file in buffer
+    set statusline+=%h    " [help] if buffer is help file
+    set statusline+=%w    " [Preview] if buffer is preview buffer
+    set statusline+=%m    " [+] if buffer was modified,
+                          " [-] if 'modifiable' is off
+    set statusline+=%r    " [RO] if buffer is read only
+
+    " on the right
+    set statusline+=%=                " right align
+    set statusline+=%-12.(%l,%c%V%)\  " line number (%l),
+                                      " column number (%c),
+                                      " virtual column number if different
+                                      "                       than %c (%V)
+    set statusline+=%P                " position in file in percent
 endif
 
 
@@ -214,8 +238,8 @@ if has('syntax')
     syntax enable
 
 " 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).
+" <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
+" disabled when necessary with :2match (in Vim >= 700).
     if v:version >= 700
         2match Todo /\%>78v./
     else
@@ -280,8 +304,7 @@ if has('autocmd')
 " 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 = [] |
+        autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
                                  \ setlocal textwidth=72
 " Allow folding in perl.
         autocmd FileType perl let perl_fold = 1 |