1 files changed, 6 insertions, 0 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 36523ce8..9b4a379a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -150,6 +150,12 @@ set nojoinspaces
 " to it; note that it wipes out your z mark, if you happen to use it
 nnoremap J mzJ`z
 
+" If we have Vim 7.4, add j to the format options to get rid of comment
+" leaders when joining lines
+if v:version >= 704
+  set formatoptions+=j
+endif
+
 "
 " Quick way to toggle flags in 'formatoptions' that I often want to change;
 " specifically: