Merge git://github.com/ervandew/delimitMate into temporal

Conflicts:
	autoload/delimitMate.vim
This commit is contained in:
Israel Chauca Fuentes
2010-11-08 09:22:20 -06:00

View File

@@ -93,6 +93,8 @@ specific file types, see |delimitMateOptionDetails| for examples.
|'delimitMate_smart_quotes'| Turns on/off the "smart quotes" feature.
|'delimitMate_smart_matchpairs'| Turns on/off the "smart matchpairs" feature.
|'delimitMate_balance_matchpairs'|Turns on/off the "balance matching pairs"
feature.
@@ -211,6 +213,18 @@ e.g.: >
let delimitMate_smart_quotes = 0
au FileType tcl let b:delimitMate_smart_quotes = 0
<
------------------------------------------------------------------------------
*'delimitMate_smart_matchpairs'*
*'b:delimitMate_smart_matchpairs'*
Values: 1 or 0 ~
Default: 1 ~
This option turns on/off the smart parens feature. Read
|delimitMateSmartMatchpairs| for details.
e.g.: >
let delimitMate_smart_matchpairs = 0
au FileType tcl let b:delimitMate_smart_matchpairs = 0
<
------------------------------------------------------------------------------
*'delimitMate_balance_matchpairs'*
*'b:delimitMate_balance_matchpairs'*
@@ -375,6 +389,22 @@ e.g. typing at the "|": >
" | let i = "| | let i = "|"
'm | I| | I'm|
<
------------------------------------------------------------------------------
3.4 SMART MATCHPAIRS *delimitMateSmartMatchpairs*
Like "smart quotes", but applied to parens (as well as [, {, etc.), only
inserting the opening delimiter if preceding an alphanumeric character. This
should cover adding parens, etc around existing words without having to handle
the uncessary closing delimiter. This feature can be disabled by setting the
option |'delimitMate_smart_matchpairs'| to 0.
e.g. typing at the "|": >
What | Before | After
=======================================
( | function| | function(|)
( | |var | (|var
<
------------------------------------------------------------------------------
3.5 BALANCING MATCHING PAIRS *delimitMateBalance*