From: martin f. krafft Date: Tue, 9 Dec 2008 13:51:06 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/020f4abbf7b7c14013e059f9a2ff11f667a85148?hp=578d21059831904313127b6a79883c79e29f7dd6 Merge branch 'master' of ssh://git.madduck.net/srv/git/git.madduck.net/pub/etc/vim --- diff --git a/.vimrc b/.vimrc index 4f498dc..779375b 100644 --- a/.vimrc +++ b/.vimrc @@ -673,6 +673,7 @@ set fo=tcroqn1l " pattern to recognize a numbered list " (local to buffer) " set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* +set flp=^\\s*\\d\\+[\\]:.)}]\\s* " formatexpr " expression used for "gq" to format lines @@ -879,7 +880,6 @@ endif " foldlevelstart " value for 'foldlevel' when starting to edit a file " set fdls=-1 -set fdls=1 " foldcolumn " width of the column used to indicate folds @@ -912,6 +912,7 @@ set fdls=1 " folding type: "manual", "indent", "expr", "marker" or "syntax" " (local to window) " set fdm=manual +set fdm=marker " foldexpr " expression used when 'foldmethod' is "expr"