X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=e040414ec413a0181f4f43259ec2e788d570da8b;hb=06a7d83ea680b38839c23ef6ec64325e28c40c9c;hp=fd788ef20aa21a242c92e9a2a525ef5464d51d42;hpb=42d4224b0c3b5b83872832d9ca9eb7ce230d3d24;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index fd788ef..e040414 100644
--- a/vimrc
+++ b/vimrc
@@ -148,7 +148,7 @@ if has('folding')
                      " folding which is not what I want
 endif
 
-" Only check for case if the searched word contains a capital character.
+" Only check case if the searched word contains a capital character.
 set ignorecase
 set smartcase
 
@@ -162,7 +162,8 @@ if exists('+spell') && has('syntax')
 endif
 
 " Allow buffers with changes to be hidden. Very important for effective
-" editing with multiple buffers.
+" editing with multiple buffers. Prevents the "E37: No write since last change
+" (add ! to override)" warning.
 set hidden
 
 
@@ -174,7 +175,7 @@ set background=dark
 
 " Display line numbers.
 set number
-" But use as little space as necessary for the numbers column. Thanks to James
+" But use as little space as possible for the numbers column. Thanks to James
 " Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary).
 if exists('+numberwidth')
     set numberwidth=1
@@ -201,10 +202,12 @@ set hlsearch
 " Display some special characters.
 set list
 set listchars=
+" Display tabs as ">--------".
+set listchars+=tab:>-
 " Display trailing whitespace as "-".
 set listchars+=trail:-
 " Display markers for long lines when wrapping is disabled.
-set listchars+=extends:>
+set listchars+=extends:>,precedes:<
 " Display non-breakable space as "!".
 if v:version >= 700
     set listchars+=nbsp:!
@@ -325,6 +328,7 @@ endif
 
 " Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09
 " 20:02 CEST). To suspend without saving either unmap this or use :stop<CR>.
+" Only the current buffer is written.
 nnoremap <silent> <C-Z> :update<CR>:stop<CR>
 
 " 2<C-G> gives more verbose information, use it by default. Thanks to NCS_One
@@ -517,9 +521,9 @@ if has('syntax')
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
-        if exists(':2match')
+        if !&diff && exists(':2match')
             2match Todo /\%>78v./
-        else
+        elseif !&diff
             match Todo /\%>78v./
         endif