Merge branch 'master' into conceal

xolox · Jan 19, 2012 · 6502698 · 6502698
2 parents b2c9056 + fdc0f09
commit 6502698
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
@@ -12,6 +12,10 @@ setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
 setlocal formatoptions+=tcqln
 setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+
 
-let b:undo_ftplugin .= "|setl cms< com< fo<"
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= "|setl cms< com< fo< flp<"
+else
+  let b:undo_ftplugin = "setl cms< com< fo< flp<"
+endif
 
 " vim:set sw=2: