From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 27 Aug 2012 18:15:47 +0000 (+0200)
Subject: vimrc: Add j to 'formatoptions' if available.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=64309b7f39772977ed42b003b308b2210222e3c6;hp=7ba8fd37426025138d7d19cfdbdf081d13c3b0c3;p=config%2Fdotfiles.git

vimrc: Add j to 'formatoptions' if available.
---

diff --git a/vimrc b/vimrc
index 60a1b13..bde35b6 100644
--- a/vimrc
+++ b/vimrc
@@ -93,9 +93,9 @@ endif
 
 " HELPER FUNCTIONS
 
+if has('eval')
 " Check if the given syntax group is available. Thanks to bairui in #vim on
 " Freenode (2012-02-19 01:15 CET) for the try/catch silent highlight idea.
-if has('eval')
     function! s:HasSyntaxGroup(group)
         try
             execute 'silent highlight ' . a:group
@@ -105,6 +105,12 @@ if has('eval')
         endtry
         return 1
     endfunction
+
+" Check if the given Vim version and patch is available.
+    function! s:HasVersionAndPatch(version, patch)
+        return v:version > a:version
+            \ || (v:version == a:version && has('patch' . a:patch))
+    endfunction
 endif
 
 
@@ -150,6 +156,10 @@ set formatoptions+=ro
 " Don't break a line if was already longer then 'textwidth' when insert mode
 " started.
 set formatoptions+=l
+" Remove comment leader when joining lines where it makes sense.
+if <SID>HasVersionAndPatch(703, 541)
+    set formatoptions+=j
+endif
 
 " Allow virtual editing (cursor can be positioned anywhere, even when there is
 " no character) in visual block mode.