vimrc: Don't highlight overlong lines in diff mode.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 79e709a8d1d508282a306aba6d52e8b084931f3d..e040414ec413a0181f4f43259ec2e788d570da8b 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -1,6 +1,6 @@
 " Vim main configuration file.
 
-" Copyright (C) 2011-2012  Simon Ruderich
+" Copyright (C) 2008-2012  Simon Ruderich
 "
 " This file is free software: you can redistribute it and/or modify
 " it under the terms of the GNU General Public License as published by
@@ -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
@@ -198,10 +199,16 @@ endif
 " remove the highlighting until the next search.
 set hlsearch
 
-" Display tabs, trailing space, non breakable spaces and long lines (when
-" wrapping is disabled).
+" Display some special characters.
 set list
-set listchars=trail:-,extends:>
+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:>,precedes:<
+" Display non-breakable space as "!".
 if v:version >= 700
     set listchars+=nbsp:!
 endif
@@ -321,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
@@ -513,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