2 files changed, 21 insertions, 17 deletions
diff --git a/vim/after/ftplugin/mail/flowed.vim b/vim/after/ftplugin/mail/flowed.vim
new file mode 100644
index 00000000..78353360
--- /dev/null
+++ b/vim/after/ftplugin/mail/flowed.vim
@@ -0,0 +1,21 @@
+" mail/flowed.vim: Add 'w' flag to 'formatoptions' for mail
+
+" Don't load if running compatible or too old
+if &compatible || v:version < 700
+  finish
+endif
+
+" Don't load if already loaded
+if exists('b:did_ftplugin_mail_flowed')
+  finish
+endif
+
+" Flag as loaded
+let b:did_ftplugin_mail_flowed = 1
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_mail_flowed'
+
+" Use trailing whitespace to denote continued paragraph
+setlocal formatoptions+=w
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|setlocal formatoptions<'
diff --git a/vim/after/ftplugin/mail/format_flowed.vim b/vim/after/ftplugin/mail/format_flowed.vim
deleted file mode 100644
index 040a1a51..00000000
--- a/vim/after/ftplugin/mail/format_flowed.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled
-if exists('b:did_ftplugin_mail_format_flowed') || &compatible
-  finish
-endif
-let b:did_ftplugin_mail_format_flowed = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_mail_format_flowed'
-endif
-
-" Use trailing whitespace to denote continued paragraph
-setlocal formatoptions+=w
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|setlocal formatoptions<'
-endif