Merge branch 'master' of ssh://typesafe.de/~/config/vim

1 files changed, 9 insertions, 10 deletions

diff --git a/vimrc-full b/vimrc-full
index 3fdb399..ad97b32 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -465,8 +465,9 @@ if has("multi_byte")
   set encoding=utf-8         | " we need default utf-8 encoding to use cool chars as line break and so on (see below)
   set termencoding=&encoding | " once we use special chars we assume everybody uses a terminal supporting those
 
-  set fillchars+=fold:\—        | "
-  set fillchars+=vert:\│        | " cool vertical split char
+  set fillchars+=fold:\—     | "
+  set fillchars+=vert:\│     | " cool vertical split char
+  set fillchars+=diff:\      | " a whitespace gets used here
 
   set listchars=             | " initialize empty listchars
   set listchars+=extends:»   | " symbols used when using :set list (which displays non-printable chars)
@@ -489,14 +490,12 @@ if has('cscope') " compiled with cscope support?
     set cscopequickfix=s+,c+,d+,i+,t+,e+
   endif
 
-  cnoreabbrev csa cs add
-  cnoreabbrev csf cs find
-  cnoreabbrev csk cs kill
-  cnoreabbrev csr cs reset
-  cnoreabbrev css cs show
-  cnoreabbrev csh cs help
-
-  command! -nargs=0 Cscope cs add $VIMSRC/src/cscope.out $VIMSRC/src
+  " cnoreabbrev csa cs add
+  " cnoreabbrev csf cs find
+  " cnoreabbrev csk cs kill
+  " cnoreabbrev csr cs reset
+  " cnoreabbrev css cs show
+  " cnoreabbrev csh cs help
   let @c = ":cs find s <cword>"
 endif