Change log update and minor doc edits.

.gitignore

@@ -3,3 +3,4 @@
 *.zip
 *.gz
 vimball.txt
+*.orig

Makefile

@@ -1,21 +1,70 @@
-PLUGIN=delimitMate
+PLUGIN=$(shell basename "$$PWD")
+SCRIPT=$(wildcard plugin/*.vim)
+#AUTOL=$(wildcard autoload/*.vim)
+AUTOL=autoload/$(PLUGIN).vim
+DOC=$(wildcard doc/*.txt)
+TESTS=$(wildcard autoload/*Tests.vim)
+VERSION=$(shell perl -ne 'if (/\*\sCurrent\srelease:/) {s/^\s+(\d+\.\d+).*$$/\1/;print}' $(DOC))
+VIMFOLDER=~/.vim/
+VIM=/usr/bin/vim
 
-install:
-	cp -f doc/* ~/.vim/doc/${PLUGIN}.txt
-	cp -f plugin/* ~/.vim/plugin/${PLUGIN}.vim
+.PHONY: $(PLUGIN).vba README
 
-doc_update: install
-	/usr/bin/vim -u NONE -c ':helptags ~/.vim/doc' -c ':q'
+install: vimball
+	@echo install
+	$(VIM) -N -c ':so %' -c':q!' $(PLUGIN)-$(VERSION).vba
+	cp -f $(TESTS) $(VIMFOLDER)$(TESTS)
+
+all: uninstall vimball install README zip gzip
+
+vimball: $(PLUGIN).vba
+
+clean:
+	@echo clean
+	rm -f *.vba */*.orig *.~* .VimballRecord *.zip *.gz
+
+dist-clean: clean
+
+uninstall:
+	@echo uninstall
+	$(VIM) -N -c':RmVimball' -c':q!' $(PLUGIN)-$(VERSION).vba
+	rm -f $(VIMFOLDER)$(TESTS)
+
+undo:
+	for i in */*.orig; do mv -f "$$i" "$${i%.*}"; done
+
+README:
+	@echo README
+	cp -f $(DOC) README
+
+$(PLUGIN).vba:
+	@echo $(PLUGIN).vba
+	rm -f $(PLUGIN)-$(VERSION).vba
+	$(VIM) -N -c 'ru! vimballPlugin.vim' -c ':call append("0", [ "$(SCRIPT)", "$(AUTOL)", "$(DOC)"])' -c '$$d' -c ":%MkVimball $(PLUGIN)-$(VERSION)  ." -c':q!'
+	ln -f $(PLUGIN)-$(VERSION).vba $(PLUGIN).vba
 
 zip:
-	zip -r ${PLUGIN}.zip doc plugin
-	zip ${PLUGIN}.zip -d \*.sw\?
-
-vimball: install
-	echo doc/${PLUGIN}.txt > vimball.txt
-	echo plugin/${PLUGIN}.vim >> vimball.txt
-	/usr/bin/vim  -c 'e vimball.txt' -c '%MkVimball! ${PLUGIN}' -c 'q'
+	@echo zip
+	rm -f *.zip
+	zip -r $(PLUGIN).zip doc plugin autoload
+	zip $(PLUGIN).zip -d \*.sw\?
+	zip $(PLUGIN).zip -d \*.orig
+	zip $(PLUGIN).zip -d $(TESTS)
+	ln -f $(PLUGIN).zip $(PLUGIN)-$(VERSION).zip
 
 gzip: vimball
-	gzip -f ${PLUGIN}.vba
+	@echo vimball
+	gzip -f $(PLUGIN).vba
 
+release: version all
+
+version:
+	@echo version: $(VERSION)
+	perl -i.orig -pne 'if (/^"\sVersion:/) {s/(\d+\.\d+)/$(VERSION)/e}' $(SCRIPT) $(AUTOL)
+	perl -i.orig -pne 'if (/let\sdelimitMate_version/) {s/(\d+\.\d+)/$(VERSION)/e}' $(SCRIPT)
+	perl -i.orig -pne 'if (/beasts/) {s/(v\d+\.\d+)/v.$(VERSION)/e}' $(DOC)
+	perl -i.orig -MPOSIX -pne 'if (/^"\sModified:/) {$$now_string = strftime "%F", localtime; s/(\d+-\d+-\d+)/$$now_string/e}' $(SCRIPT) $(AUTOL)
+	perl -i.orig -MPOSIX -pne 'if (/^\s+$(VERSION)\s+\d+-\d+-\d+\s+\*/) {$$now_string = strftime "%F", localtime; s/(\d+-\d+-\d+)/$$now_string/e}' $(DOC)
+	@echo Version: $(VERSION)
+
+echo:

README

@@ -0,0 +1,646 @@
+*delimitMate*    Trying to keep those beasts at bay! v2.3    *delimitMate.txt*
+
+
+
+  MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+  MMMM  MMMMMMMMM  MMMMMMMMMMMMMMMMMMMMMMMMMM  MMMMM  MMMMMMMMMMMMMMMMMMMMM  ~
+  MMMM  MMMMMMMMM  MMMMMMMMMMMMMMMMMMMMMMMMMM   MMM   MMMMMMMMMMMMMMMMMMMMM
+  MMMM  MMMMMMMMM  MMMMMMMMMMMMMMMMMMMMM  MMM  M   M  MMMMMMMMMM  MMMMMMMMM  ~
+  MMMM  MMM   MMM  MM  MM  M  M MMM  MM    MM  MM MM  MMM   MMM    MMM   MM
+  MM    MM  M  MM  MMMMMM        MMMMMMM  MMM  MMMMM  MM  M  MMM  MMM  M  M  ~
+  M  M  MM     MM  MM  MM  M  M  MM  MMM  MMM  MMMMM  MMMMM  MMM  MMM     M
+  M  M  MM  MMMMM  MM  MM  M  M  MM  MMM  MMM  MMMMM  MMM    MMM  MMM  MMMM  ~
+  M  M  MM  M  MM  MM  MM  M  M  MM  MMM  MMM  MMMMM  MM  M  MMM  MMM  M  M
+  MM    MMM   MMM  MM  MM  M  M  MM  MMM   MM  MMMMM  MMM    MMM   MMM   MM  ~
+  MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+
+
+
+==============================================================================
+ 0.- CONTENTS                                           *delimitMate-contents*
+
+    1. Introduction____________________________|delimitMateIntro|
+    2. Functionality___________________________|delimitMateFunctionality|
+        2.1 Automatic closing & exiting________|delimitMateAutoClose|
+        2.2 Expansion of space and CR__________|delimitMateExpansion|
+        2.3 Backspace__________________________|delimitMateBackspace|
+        2.4 Visual wrapping____________________|delimitMateVisualWrapping|
+        2.5 Smart Quotes_______________________|delimitMateSmartQuotes|
+        2.6 FileType based configuration_______|delimitMateFileType|
+        2.7 Syntax awareness___________________|delimitMateSyntax|
+    3. Customization___________________________|delimitMateOptions|
+        3.1 Options summary____________________|delimitMateOptionSummary|
+        3.2 Options details____________________|delimitMateOptionDetails|
+    4. Commands________________________________|delimitMateCommands|
+    5. Functions_______________________________|delimitMateFunctions|
+    6. TODO list_______________________________|delimitMateTodo|
+    7. Maintainer______________________________|delimitMateMaintainer|
+    8. Credits_________________________________|delimitMateCredits|
+    9. History_________________________________|delimitMateHistory|
+
+==============================================================================
+ 1.- INTRODUCTION                                           *delimitMateIntro*
+
+This plug-in provides automatic closing of quotes, parenthesis, brackets,
+etc.; besides some other related features that should make your time in insert
+mode a little bit easier.
+
+Most of the features can be modified or disabled permanently, using global
+variables, or on a FileType basis, using autocommands. With a couple of
+exceptions and limitations, this features don't brake undo, redo or history.
+
+==============================================================================
+ 2. FUNCTIONALITY                                   *delimitMateFunctionality*
+
+------------------------------------------------------------------------------
+   2.1 AUTOMATIC CLOSING AND EXITING                    *delimitMateAutoClose*
+
+With automatic closing enabled, if an opening delimiter is inserted the plugin
+inserts the closing delimiter and places the cursor between the pair. With
+automatic closing disabled, no closing delimiters is inserted by delimitMate,
+but when a pair of delimiters is typed, the cursor is placed in the middle.
+
+When the cursor is inside an empty pair or located next to the left of a
+closing delimiter, the cursor is placed outside the pair to the right of the
+closing delimiter.
+
+Unless |'delimitMate_matchpairs'| or |'delimitMate_quotes'|are set, this
+script uses the values in '&matchpairs' to identify the pairs, and ", ' and `
+for quotes respectively.
+
+The following table shows the behaviour, this applies to quotes too (the final
+position of the cursor is represented by a "|"):
+
+With auto-close: >
+                          Type   |  You get
+                        ====================
+                           (     |    (|)
+                        –––––––––|––––––––––
+                           ()    |    ()|
+                        –––––––––|––––––––––
+                        (<S-Tab> |    ()|
+<
+Without auto-close: >
+
+                          Type    |  You get
+                        =====================
+                           ()     |    (|)
+                        –––––––––-|––––––––––
+                           ())    |    ()|
+                        –––––––––-|––––––––––
+                        ()<S-Tab> |    ()|
+<
+------------------------------------------------------------------------------
+   2.2 EXPANSION OF SPACE AND CAR RETURN                *delimitMateExpansion*
+
+When the cursor is inside an empty pair of delimiters, <Space> and <CR> can be
+expanded, see |'delimitMate_expand_space'| and
+|'delimitMate_expand_cr'|:
+
+Expand <Space> to: >
+
+                    <Space><Space><Left>  |  You get
+                  ====================================
+                              (|)         |    ( | )
+<
+Expand <CR> to: >
+
+                      <CR><CR><Up>  |  You get
+                    ============================
+                           (|)      |    (
+                                    |    |
+                                    |    )
+<
+
+NOTE that the expansion of <CR> will brake the redo command.
+
+Since <Space> and <CR> are used everywhere, I have made the functions involved
+in expansions global, so they can be used to make custom mappings. Read
+|delimitMateFunctions| for more details.
+
+------------------------------------------------------------------------------
+   2.3 BACKSPACE                                        *delimitMateBackspace*
+
+If you press backspace inside an empty pair, both delimiters are deleted. When
+expansions are enabled, <BS> will also delete the expansions. NOTE that
+deleting <CR> expansions will brake the redo command.
+
+If you type shift + backspace instead, only the closing delimiter will be
+deleted.
+
+e.g. typing at the "|": >
+
+                  What  |      Before       |      After
+               ==============================================
+                  <BS>  |  call expand(|)   |  call expand|
+               ---------|-------------------|-----------------
+                  <BS>  |  call expand( | ) |  call expand(|)
+               ---------|-------------------|-----------------
+                  <BS>  |  call expand(     |  call expand(|)
+                        |  |                |
+                        |  )                |
+               ---------|-------------------|-----------------
+                 <S-BS> |  call expand(|)   |  call expand(|
+<
+
+------------------------------------------------------------------------------
+   2.4 WRAPPING OF VISUAL SELECTION                *delimitMateVisualWrapping*
+
+When visual mode is active this script allows for the selection to be enclosed
+with delimiters. But, since brackets have special meaning in visual mode, a
+leader (the value of 'mapleader' by default) should precede the delimiter.
+NOTE that this feature brakes the redo command and doesn't currently work on
+blockwise visual mode, any suggestions to fix this will be very welcome.
+
+e.g. (selection represented between square brackets): >
+
+                      Selected text    |       After \"
+                 =============================================
+                  An [absurd] example! | An "absurd" example!
+<
+
+------------------------------------------------------------------------------
+   2.5 SMART QUOTES                                   *delimitMateSmartQuotes*
+
+Only one quote will be inserted following a quote, a "\" or an alphanumeric
+character. This should cover closing quotes, escaped quotes and apostrophes.
+Except for apostrophes, this feature can be disabled setting the option
+|'delimitMate_smart_quotes'| to 0.
+
+e.g. typing at the "|": >
+
+                     What |    Before    |     After
+                  =======================================
+                      "   |  "String|    |  "String"|
+                      "   |  let i = "|  |  let i = "|"
+                      '   |  I|          |  I'|
+<
+------------------------------------------------------------------------------
+   2.6 FILE TYPE BASED CONFIGURATION                     *delimitMateFileType*
+
+delimitMate options can be set globally for all buffers using global
+("regular") variables in your |vimrc| file. But |:autocmd| can be used to set
+options for specific file types (see |'filetype'|) using buffer variables in
+the following way: >
+
+   au FileType mail,text let b:delimitMate_autoclose = 0
+         ^       ^           ^            ^            ^
+         |       |           |            |            |
+         |       |           |            |            - Option value.
+         |       |           |            - Option name.
+         |       |           - Buffer variable.
+         |       - File types for which the option will be set.
+         - Don't forget to put this event.
+<
+NOTE that you should use buffer variables (|b:var|) only to set options with
+|:autocmd|, for global options use regular variables (|g:var|) in your vimrc.
+
+------------------------------------------------------------------------------
+   2.7 SYNTAX AWARENESS                                    *delimitMateSyntax*
+
+The features of this plug-in might not be always helpful, comments and strings
+usualy don't need auto-completion. delimitMate monitors which region is being
+edited and if it detects that the cursor is in a comment it'll turn itself off
+until the cursor leaves the comment. The excluded regions can be set using the
+option |'delimitMate_excluded_regions'|. Read |group-name| for a list of
+regions or syntax group names.
+
+NOTE that this feature relies on a proper syntax file for the current file
+type, if the appropiate syntax file doesn't define a region, delimitMate won't
+know about it.
+
+==============================================================================
+ 3. CUSTOMIZATION                                         *delimitMateOptions*
+
+You can create your own mappings for some features using the global functions.
+Read |DelimitMateFunctions| for more info.
+
+------------------------------------------------------------------------------
+   3.1 OPTIONS SUMMARY                              *delimitMateOptionSummary*
+
+The behaviour of this script can be customized setting the following options
+in your vimrc file. You can use local options to set the configuration for
+specific file types, see |delimitMateOptionDetails| for examples.
+
+|'loaded_delimitMate'|          Turns off the script.
+
+|'delimitMate_autoclose'|       Tells delimitMate whether to automagically
+                                insert the closing delimiter.
+
+|'delimitMate_matchpairs'|      Tells delimitMate which characters are
+                                matching pairs.
+
+|'delimitMate_quotes'|          Tells delimitMate which quotes should be
+                                used.
+
+|'delimitMate_visual_leader'|   Sets the leader to be used in visual mode.
+
+|'delimitMate_expand_cr'|       Turns on/off the expansion of <CR>.
+
+|'delimitMate_expand_space'|    Turns on/off the expansion of <Space>.
+
+|'delimitMate_excluded_ft'|     Turns off the script for the given file types.
+
+|'delimitMate_excluded_regions'|Turns off the script for the given regions or
+                                syntax group names.
+
+|'delimitMate_apostrophes'|     Tells delimitMate how it should "fix"
+                                balancing of single quotes when used as
+                                apostrophes. NOTE: Not needed any more, kept
+                                for compatibility with older versions.
+
+|'delimitMate_smart_quotes'|    Turns on/off the "smart quotes" feature.
+
+------------------------------------------------------------------------------
+   3.2 OPTIONS DETAILS                              *delimitMateOptionDetails*
+
+Add the shown lines to your vimrc file in order to set the below options.
+Buffer variables take precedence over global ones and can be used along with
+autocmd to modify delimitMate's behavior for specific file types, read more in
+|delimitMateFileType|.
+
+Note: Use buffer variables only to set options for specific file types using
+:autocmd, use global variables to set options for every buffer. Read more in
+|g:var| and |b:var|.
+
+------------------------------------------------------------------------------
+                                                        *'loaded_delimitMate'*
+                                                      *'b:loaded_delimitMate'*
+This option prevents delimitMate from loading.
+e.g.: >
+        let loaded_delimitMate = 1
+        au FileType mail let b:loaded_delimitMate = 1
+<
+------------------------------------------------------------------------------
+                                                     *'delimitMate_autoclose'*
+                                                   *'b:delimitMate_autoclose'*
+Values: 0 or 1.                                                              ~
+Default: 1                                                                   ~
+
+If this option is set to 0, delimitMate will not add a closing delimiter
+automagically. See |delimitMateAutoClose| for details.
+e.g.: >
+        let delimitMate_autoclose = 0
+        au FileType mail let b:delimitMate_autoclose = 0
+<
+------------------------------------------------------------------------------
+                                                    *'delimitMate_matchpairs'*
+                                                  *'b:delimitMate_matchpairs'*
+Values: A string with |matchpairs| syntax.                                   ~
+Default: &matchpairs                                                         ~
+
+Use this option to tell delimitMate which characters should be considered
+matching pairs. Read |delimitMateAutoClose| for details.
+e.g: >
+        let delimitMate_matchpairs = "(:),[:],{:},<:>"
+        au FileType vim,html let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
+<
+------------------------------------------------------------------------------
+                                                        *'delimitMate_quotes'*
+                                                      *'b:delimitMate_quotes'*
+Values: A string of characters separated by spaces.                          ~
+Default: "\" ' `"                                                            ~
+
+Use this option to tell delimitMate which characters should be considered as
+quotes. Read |delimitMateAutoClose| for details.
+e.g.: >
+        let b:delimitMate_quotes = "\" ' ` *"
+        au FileType html let b:delimitMate_quotes = "\" '"
+<
+------------------------------------------------------------------------------
+                                                 *'delimitMate_visual_leader'*
+                                               *'b:delimitMate_visual_leader'*
+Values: Any character.                                                       ~
+Default: q                                                                   ~
+
+The value of this option will be used to wrap the selection in visual mode
+when followed by a delimiter. Read |delimitMateVisualWrap| for details.
+e.g: >
+        let delimitMate_visual_leader = "f"
+        au FileType html let b:delimitMate_visual_leader = "f"
+<
+------------------------------------------------------------------------------
+                                                     *'delimitMate_expand_cr'*
+                                                   *'b:delimitMate_expand_cr'*
+Values: 1 or 0                                                               ~
+Default: 0                                                                   ~
+
+This option turns on/off the expansion of <CR>. Read |delimitMateExpansion|
+for details.
+e.g.: >
+        let b:delimitMate_expand_cr = "\<CR>\<CR>\<Up>"
+        au FileType mail let b:delimitMate_expand_cr = "\<CR>"
+<
+------------------------------------------------------------------------------
+                                                  *'delimitMate_expand_space'*
+                                                *'b:delimitMate_expand_space'*
+Values: A key mapping.                                                       ~
+Default: "\<Space>"                                                          ~
+
+This option turns on/off the expansion of <Space>. Read |delimitMateExpansion|
+for details.
+e.g.: >
+        let delimitMate_expand_space = "\<Space>\<Space>\<Left>"
+        au FileType tcl let b:delimitMate_expand_space = "\<Space>"
+<
+------------------------------------------------------------------------------
+                                                   *'delimitMate_excluded_ft'*
+Values: A string of file type names separated by single commas.              ~
+Default: Empty.                                                              ~
+
+This options turns delimitMate off for the listed file types, use this option
+only if you don't want any of the features it provides on those file types.
+e.g.: >
+        let delimitMate_excluded_ft = "mail,txt"
+<
+------------------------------------------------------------------------------
+                                              *'delimitMate_excluded_regions'*
+Values: A string of syntax group names names separated by single commas.     ~
+Default: Comment                                                             ~
+
+This options turns delimitMate off for the listed regions, read |group-name|
+for more info about what is a region.
+e.g.: >
+        let delimitMate_excluded_regions = "Comments,String"
+<
+------------------------------------------------------------------------------
+                                                   *'delimitMate_apostrophes'*
+Values: Strings separated by ":".                                            ~
+Default: No longer used.                                                     ~
+
+NOTE: This feature is turned off by default, it's been kept for compatibility
+with older version, read |delimitMateSmartQuotes| for details.
+If auto-close is enabled, this option tells delimitMate how to try to fix the
+balancing of single quotes when used as apostrophes. The values of this option
+are strings of text where a single quote would be used as an apostrophe (e.g.:
+the "n't" of wouldn't or can't) separated by ":". Set it to an empty string to
+disable this feature.
+e.g.: >
+        let delimitMate_apostrophes = ""
+        au FileType tcl let delimitMate_apostrophes = ""
+<
+==============================================================================
+ 4. COMMANDS                                             *delimitMateCommands*
+
+------------------------------------------------------------------------------
+:DelimitMateReload                                        *:DelimitMateReload*
+
+Re-sets all the mappings used for this script, use it if any option has been
+changed or if the filetype option hasn't been set yet.
+
+------------------------------------------------------------------------------
+:DelimitMateSwitch                                        *:DelimitMateSwitch*
+
+Switches the plug-in on and off.
+
+------------------------------------------------------------------------------
+:DelimitMateTest                                            *:DelimitMateTest*
+
+This command tests every mapping set-up for this script, useful for testing
+custom configurations.
+
+The following output corresponds to the default values, it will be different
+depending on your configuration. "Open & close:" represents the final result
+when the closing delimiter has been inserted, either manually or
+automatically, see |delimitMateExpansion|. "Delete:" typing backspace in an
+empty pair, see |delimitMateBackspace|. "Exit:" typing a closing delimiter
+inside a pair of delimiters, see |delimitMateAutoclose|. "Space:" the
+expansion, if any, of space, see |delimitMateExpansion|. "Visual-L",
+"Visual-R" and "Visual" shows visual wrapping, see
+|delimitMateVisualWrapping|. "Car return:" the expansion of car return, see
+|delimitMateExpansion|. The cursor's position at the end of every test is
+represented by an "|": >
+
+            * AUTOCLOSE:
+            Open & close: (|)
+            Delete: |
+            Exit: ()|
+            Space: ( |)
+            Visual-L: (v)
+            Visual-R: (v)
+            Car return: (
+            |)
+
+            Open & close: {|}
+            Delete: |
+            Exit: {}|
+            Space: { |}
+            Visual-L: {v}
+            Visual-R: {v}
+            Car return: {
+            |}
+
+            Open & close: [|]
+            Delete: |
+            Exit: []|
+            Space: [ |]
+            Visual-L: [v]
+            Visual-R: [v]
+            Car return: [
+            |]
+
+            Open & close: "|"
+            Delete: |
+            Exit: ""|
+            Space: " |"
+            Visual: "v"
+            Car return: "
+            |"
+
+            Open & close: '|'
+            Delete: |
+            Exit: ''|
+            Space: ' |'
+            Visual: 'v'
+            Car return: '
+            |'
+
+            Open & close: `|`
+            Delete: |
+            Exit: ``|
+            Space: ` |`
+            Visual: `v`
+            Car return: `
+            |`
+<
+
+==============================================================================
+ 5. FUNCTIONS                                           *delimitMateFunctions*
+
+Functions should be used enclosed between <C-R>= and <CR>, otherwise they
+might not work as expected or at all.
+
+------------------------------------------------------------------------------
+delimitMate#WithinEmptyPair()                    *delimitMate_WithinEmptyPair*
+
+Returns 1 if the cursor is inside an empty pair, 0 otherwise.
+
+------------------------------------------------------------------------------
+delimitMate#ExpandReturn()                        *delimitMate#ExpandReturn()*
+
+Returns the expansion for <CR> if enabled and inside an empty pair, returns
+<CR> otherwise.
+
+e.g.: This mapping could be used to select an item on a pop-up menu or expand
+<CR> inside an empty pair: >
+
+        inoremap <expr> <CR> pumvisible() ? "\<c-y>" :
+                 \ "\<C-R>=delimitMate#ExpandReturn()\<CR>"
+<
+------------------------------------------------------------------------------
+delimitMate#ExpandSpace()                          *delimitMate#ExpandSpace()*
+
+Returns the expansion for <Space> if enabled and inside an empty pair, returns
+<Space> otherwise.
+e.g.: >
+
+    inoremap <Space> <C-R>=delimitMate#ExpandSpace()<CR>
+<
+------------------------------------------------------------------------------
+delimitMate#ShouldJump()                            *delimitMate#ShouldJump()*
+
+Returns 1 if there is a closing delimiter or a quote to the right of the
+cursor, 0 otherwise.
+
+------------------------------------------------------------------------------
+delimitMate#JumpAny(key)                               *delimitMate#JumpAny()*
+
+This function returns a mapping that will make the cursor jump to the right
+when delimitMate#ShouldJump() returns 1, returns the argument "key" otherwise.
+e.g.: You can use this to create your own mapping to jump over any delimiter.
+>
+   inoremap <C-Tab> <C-R>=delimitMate#JumpAny("\<S-Tab>")<CR>
+<
+
+==============================================================================
+ 6. TODO LIST                                                *delimitMateTodo*
+
+- Automatic set-up by file type.
+- Make visual wrapping work on blockwise visual mode.
+
+==============================================================================
+ 7. MAINTAINER                                         *delimitMateMaintainer*
+
+Hi there! My name is Israel Chauca F. and I can be reached at:
+    mailto:israelchauca@gmail.com
+
+Feel free to send me any suggestions and/or comments about this plugin, I'll
+be very pleased to read them.
+
+==============================================================================
+ 8. CREDITS                                               *delimitMateCredits*
+
+Some of the code that make this script is modified or just shamelessly copied
+from the following sources:
+
+   - Ian McCracken
+     Post titled: Vim, Part II: Matching Pairs:
+     http://concisionandconcinnity.blogspot.com/
+
+   - Aristotle Pagaltzis
+     From the comments on the previous blog post and from:
+     http://gist.github.com/144619
+
+   - Vim Scripts:
+     http://www.vim.org/scripts
+
+This script was inspired by the auto-completion of delimiters of TextMate.
+
+==============================================================================
+ 9. HISTORY                                               *delimitMateHistory*
+
+  Version      Date      Release notes                                       ~
+|---------|------------|-----------------------------------------------------|
+    2.3     2010-06-06 * Current release:
+                         - Syntax aware: Will turn off when editing comments
+                           or other regions, customizable.
+                         - Changed format of most mappings.
+                         - Fix: <CR> expansion doesn't brake automatic
+                           indentation adjustments anymore.
+                         - Fix: Arrow keys would insert A, B, C or D instead
+                           of moving the cursor when using Vim on a terminal.
+|---------|------------|-----------------------------------------------------|
+    2.2     2010-05-16 * - Added command to switch the plug-in on and off.
+                         - Fix: some problems with <Left>, <Right> and <CR>.
+                         - Fix: A small problem when inserting a delimiter at
+                           the beginning of the line.
+|---------|------------|-----------------------------------------------------|
+    2.1     2010-05-10 * - Most of the functions have been moved to an
+                           autoload script to avoid loading unnecessary ones.
+                         - Fixed a problem with the redo command.
+                         - Many small fixes.
+|---------|------------|-----------------------------------------------------|
+    2.0     2010-04-01 * New features:
+                         - All features are redo/undo-wise safe.
+                         - A single quote typed after an alphanumeric
+                           character is considered an apostrophe and one
+                           single quote is inserted.
+                         - A quote typed after another quote inserts a single
+                           quote and the cursor jumps to the middle.
+                         - <S-Tab> jumps out of any empty pair.
+                         - <CR> and <Space> expansions are fixed, but the
+                           functions used for it are global and can be used in
+                           custom mappings. The previous system is still
+                           active if you have any of the expansion options
+                           set.
+                         - <S-Backspace> deletes the closing delimiter.
+
+                         * Fixed bug:
+                         - s:vars were being used to store buffer options.
+
+|---------|------------|-----------------------------------------------------|
+    1.6     2009-10-10 * Now delimitMate tries to fix the balancing of single
+                         quotes when used as apostrophes. You can read
+                         |delimitMate_apostrophes| for details.
+                         Fixed an error when |b:delimitMate_expand_space|
+                         wasn't set but |delimitMate_expand_space| wasn't.
+
+|---------|------------|-----------------------------------------------------|
+    1.5     2009-10-05 * Fix: delimitMate should work correctly for files
+                         passed as arguments to Vim. Thanks to Ben Beuchler
+                         for helping to nail this bug.
+
+|---------|------------|-----------------------------------------------------|
+    1.4     2009-09-27 * Fix: delimitMate is now enabled on new buffers even
+                         if they don't have set the file type option or were
+                         opened directly from the terminal.
+
+|---------|------------|-----------------------------------------------------|
+    1.3     2009-09-24 * Now local options can be used along with autocmd
+                         for specific file type configurations.
+                         Fixes:
+                         - Unnamed register content is not lost on visual
+                         mode.
+                         - Use noremap where appropiate.
+                         - Wrapping a single empty line works as expected.
+
+|---------|------------|-----------------------------------------------------|
+    1.2     2009-09-07 * Fixes:
+                         - When inside nested empty pairs, deleting the
+                         innermost left delimiter would delete all right
+                         contiguous delimiters.
+                         - When inside an empty pair, inserting a left
+                         delimiter wouldn't insert the right one, instead
+                         the cursor would jump to the right.
+                         - New buffer inside the current window wouldn't
+                         have the mappings set.
+
+|---------|------------|-----------------------------------------------------|
+    1.1     2009-08-25 * Fixed an error that ocurred when mapleader wasn't
+                         set and added support for GetLatestScripts
+                         auto-detection.
+
+|---------|------------|-----------------------------------------------------|
+    1.0     2009-08-23 * Initial upload.
+
+|---------|------------|-----------------------------------------------------|
+
+
+  `\|||/´         MMM           \|/            www            __^__          ~
+   (o o)         (o o)          @ @           (O-O)          /(o o)\\        ~
+ooO_(_)_Ooo__ ooO_(_)_Ooo___oOO_(_)_OOo___oOO__(_)__OOo___oOO__(_)__OOo_____ ~
+_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|____ ~
+__|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_ ~
+_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|____ ~
+
+vim:tw=78:ts=8:ft=help:norl:formatoptions+=tcroqn:autoindent:

autoload/delimitMate.vim

@@ -0,0 +1,750 @@
+" ============================================================================
+" File:        autoload/delimitMate.vim
+" Version:     2.3
+" Modified:    2010-06-06
+" Description: This plugin provides auto-completion for quotes, parens, etc.
+" Maintainer:  Israel Chauca F. <israelchauca@gmail.com>
+" Manual:      Read ":help delimitMate".
+
+" Utilities {{{
+function! delimitMate#Init() "{{{
+" Initialize variables:
+
+	" delimitMate_autoclose {{{
+	if !exists("b:delimitMate_autoclose") && !exists("g:delimitMate_autoclose")
+		let b:delimitMate_autoclose = 1
+	elseif !exists("b:delimitMate_autoclose") && exists("g:delimitMate_autoclose")
+		let b:delimitMate_autoclose = g:delimitMate_autoclose
+	else
+		" Nothing to do.
+	endif " }}}
+
+	" delimitMate_matchpairs {{{
+	if !exists("b:delimitMate_matchpairs") && !exists("g:delimitMate_matchpairs")
+		let s:matchpairs_temp = &matchpairs
+	elseif exists("b:delimitMate_matchpairs")
+		let s:matchpairs_temp = b:delimitMate_matchpairs
+	else
+		let s:matchpairs_temp = g:delimitMate_matchpairs
+	endif " }}}
+
+	" delimitMate_quotes {{{
+	if exists("b:delimitMate_quotes")
+		let s:quotes = split(b:delimitMate_quotes)
+	elseif exists("g:delimitMate_quotes")
+		let s:quotes = split(g:delimitMate_quotes)
+	else
+		let s:quotes = split("\" ' `")
+	endif
+	let b:delimitMate_quotes_list = s:quotes " }}}
+
+	" delimitMate_excluded_regions {{{
+	if exists("b:delimitMate_excluded_regions")
+		let s:excluded_regions = b:delimitMate_excluded_regions
+	elseif exists("g:delimitMate_excluded_regions")
+		let s:excluded_regions = g:delimitMate_excluded_regions
+	else
+		let s:excluded_regions = "Comment"
+	endif
+	let b:delimitMate_excluded_regions_list = split(s:excluded_regions, ',\s*')
+	let b:delimitMate_excluded_regions_enabled = len(b:delimitMate_excluded_regions_list) " }}}
+
+	" delimitMate_visual_leader {{{
+	if !exists("b:delimitMate_visual_leader") && !exists("g:delimitMate_visual_leader")
+		let b:delimitMate_visual_leader = exists('b:maplocalleader') ? b:maplocalleader :
+					\ exists('g:mapleader') ? g:mapleader : "\\"
+	elseif !exists("b:delimitMate_visual_leader") && exists("g:delimitMate_visual_leader")
+		let b:delimitMate_visual_leader = g:delimitMate_visual_leader
+	else
+		" Nothing to do.
+	endif " }}}
+
+	" delimitMate_expand_space {{{
+	if !exists("b:delimitMate_expand_space") && !exists("g:delimitMate_expand_space")
+		let b:delimitMate_expand_space = 0
+	elseif !exists("b:delimitMate_expand_space") && exists("g:delimitMate_expand_space")
+		let b:delimitMate_expand_space = g:delimitMate_expand_space
+	else
+		" Nothing to do.
+	endif " }}}
+
+	" delimitMate_expand_cr {{{
+	if !exists("b:delimitMate_expand_cr") && !exists("g:delimitMate_expand_cr")
+		let b:delimitMate_expand_cr = 0
+	elseif !exists("b:delimitMate_expand_cr") && exists("g:delimitMate_expand_cr")
+		let b:delimitMate_expand_cr = g:delimitMate_expand_cr
+	else
+		" Nothing to do.
+	endif " }}}
+
+	" delimitMate_smart_quotes {{{
+	if !exists("b:delimitMate_smart_quotes") && !exists("g:delimitMate_smart_quotes")
+		let b:delimitMate_smart_quotes = 1
+	elseif !exists("b:delimitMate_smart_quotes") && exists("g:delimitMate_smart_quotes")
+		let b:delimitMate_smart_quotes = split(g:delimitMate_smart_quotes)
+	else
+		" Nothing to do.
+	endif " }}}
+
+	" delimitMate_apostrophes {{{
+	if !exists("b:delimitMate_apostrophes") && !exists("g:delimitMate_apostrophes")
+		"let s:apostrophes = split("n't:'s:'re:'m:'d:'ll:'ve:s'",':')
+		let s:apostrophes = []
+	elseif !exists("b:delimitMate_apostrophes") && exists("g:delimitMate_apostrophes")
+		let s:apostrophes = split(g:delimitMate_apostrophes)
+	else
+		let s:apostrophes = split(b:delimitMate_apostrophes)
+	endif
+		let b:delimitMate_apostrophes_list = s:apostrophes " }}}
+
+	" delimitMate_tab2exit {{{
+	if !exists("b:delimitMate_tab2exit") && !exists("g:delimitMate_tab2exit")
+		let b:delimitMate_tab2exit = 1
+	elseif !exists("b:delimitMate_tab2exit") && exists("g:delimitMate_tab2exit")
+		let b:delimitMate_tab2exit = g:delimitMate_tab2exit
+	else
+		" Nothing to do.
+	endif " }}}
+
+	let b:delimitMate_matchpairs_list = split(s:matchpairs_temp, ',')
+	let b:delimitMate_left_delims = split(s:matchpairs_temp, ':.,\=')
+	let b:delimitMate_right_delims = split(s:matchpairs_temp, ',\=.:')
+
+	let b:delimitMate_buffer = []
+
+	call delimitMate#UnMap()
+	if b:delimitMate_autoclose
+		call delimitMate#AutoClose()
+	else
+		call delimitMate#NoAutoClose()
+	endif
+	call delimitMate#VisualMaps()
+	call delimitMate#ExtraMappings()
+
+	let b:loaded_delimitMate = 1
+	let b:delimitMate_enabled = 1
+endfunction "}}} Init()
+
+function! delimitMate#ShouldJump() "{{{
+	" Returns 1 if the next character is a closing delimiter.
+	let col = col('.')
+	let lcol = col('$')
+	let char = getline('.')[col - 1]
+
+	for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
+		if char == cdel
+			" Closing delimiter on the right.
+			return 1
+		endif
+	endfor
+
+	let nchar = getline('.')[col]
+	if b:delimitMate_expand_space && char == " "
+		for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
+			if nchar == cdel
+				" Closing delimiter with space expansion.
+				return 1
+			endif
+		endfor
+	endif
+
+	let uchar = getline(line('.') + 1)[0]
+	if b:delimitMate_expand_cr && char == ""
+		for cdel in b:delimitMate_right_delims + b:delimitMate_quotes_list
+			if uchar == cdel
+				" Closing delimiter with CR expansion.
+				return 1
+			endif
+		endfor
+	endif
+
+	return 0
+endfunction "}}}
+
+function! delimitMate#IsBlockVisual() " {{{
+	if mode() == "\<C-V>"
+		return 1
+	endif
+	" Store unnamed register values for later use in delimitMate#RestoreRegister().
+	let b:save_reg = getreg('"')
+	let b:save_reg_mode = getregtype('"')
+
+	if len(getline('.')) == 0
+		" This for proper wrap of empty lines.
+		let @" = "\n"
+	endif
+	return 0
+endfunction " }}}
+
+function! delimitMate#Visual(del) " {{{
+	let mode = mode()
+	if mode == "\<C-V>"
+		redraw
+		echom "delimitMate: delimitMate is disabled on blockwise visual mode."
+		return ""
+	endif
+	" Store unnamed register values for later use in delimitMate#RestoreRegister().
+	let b:save_reg = getreg('"')
+	let b:save_reg_mode = getregtype('"')
+
+	if len(getline('.')) == 0
+		" This for proper wrap of empty lines.
+		let @" = "\n"
+	endif
+
+	if mode ==# "V"
+		let dchar = "\<BS>"
+	else
+		let dchar = ""
+	endif
+
+	let index = index(b:delimitMate_left_delims, a:del)
+	if index >= 0
+		let ld = a:del
+		let rd = b:delimitMate_right_delims[index]
+	endif
+
+	let index = index(b:delimitMate_right_delims, a:del)
+	if index >= 0
+		let ld = b:delimitMate_left_delims[index]
+		let rd = a:del
+	endif
+
+	let index = index(b:delimitMate_quotes_list, a:del)
+	if index >= 0
+		let ld = a:del
+		let rd = ld
+	endif
+
+	return "s" . ld . "\<C-R>\"" . dchar . rd . "\<Esc>:call delimitMate#RestoreRegister()\<CR>"
+endfunction " }}}
+
+function! delimitMate#IsEmptyPair(str) "{{{
+	for pair in b:delimitMate_matchpairs_list
+		if a:str == join( split( pair, ':' ),'' )
+			return 1
+		endif
+	endfor
+	for quote in b:delimitMate_quotes_list
+		if a:str == quote . quote
+			return 1
+		endif
+	endfor
+	return 0
+endfunction "}}}
+
+function! delimitMate#IsCRExpansion() " {{{
+	let nchar = getline(line('.')-1)[-1:]
+	let schar = getline(line('.')+1)[:0]
+	let isEmpty = getline('.') == ""
+	if index(b:delimitMate_left_delims, nchar) > -1 &&
+				\ index(b:delimitMate_left_delims, nchar) == index(b:delimitMate_right_delims, schar) &&
+				\ isEmpty
+		return 1
+	elseif index(b:delimitMate_quotes_list, nchar) > -1 &&
+				\ index(b:delimitMate_quotes_list, nchar) == index(b:delimitMate_quotes_list, schar) &&
+				\ isEmpty
+		return 1
+	else
+		return 0
+	endif
+endfunction " }}} delimitMate#IsCRExpansion()
+
+function! delimitMate#IsSpaceExpansion() " {{{
+	let line = getline('.')
+	let col = col('.')-2
+	if col > 0
+		let pchar = line[col - 1]
+		let nchar = line[col + 2]
+		let isSpaces = (line[col] == line[col+1] && line[col] == " ")
+
+		if index(b:delimitMate_left_delims, pchar) > -1 &&
+				\ index(b:delimitMate_left_delims, pchar) == index(b:delimitMate_right_delims, nchar) &&
+				\ isSpaces
+			return 1
+		elseif index(b:delimitMate_quotes_list, pchar) > -1 &&
+				\ index(b:delimitMate_quotes_list, pchar) == index(b:delimitMate_quotes_list, nchar) &&
+				\ isSpaces
+			return 1
+		endif
+	endif
+	return 0
+endfunction " }}} IsSpaceExpansion()
+
+function! delimitMate#WithinEmptyPair() "{{{
+	let cur = strpart( getline('.'), col('.')-2, 2 )
+	return delimitMate#IsEmptyPair( cur )
+endfunction "}}}
+
+function! delimitMate#WriteBefore(str) "{{{
+	let len = len(a:str)
+	let line = getline('.')
+	let col = col('.')-2
+	if col < 0
+		call setline('.',line[(col+len+1):])
+	else
+		call setline('.',line[:(col)].line[(col+len+1):])
+	endif
+	return a:str
+endfunction " }}}
+
+function! delimitMate#WriteAfter(str) "{{{
+	let len = len(a:str)
+	let line = getline('.')
+	let col = col('.')-2
+	if (col) < 0
+		call setline('.',a:str.line)
+	else
+		call setline('.',line[:(col)].a:str.line[(col+len):])
+	endif
+	return ''
+endfunction " }}}
+
+function! delimitMate#RestoreRegister() " {{{
+	" Restore unnamed register values store in delimitMate#IsBlockVisual().
+	call setreg('"', b:save_reg, b:save_reg_mode)
+	echo ""
+endfunction " }}}
+
+function! delimitMate#GetSyntaxRegion(line, col) "{{{
+	return synIDattr(synIDtrans(synID(a:line, a:col, 1)), 'name')
+endfunction " }}}
+
+function! delimitMate#GetCurrentSyntaxRegion() "{{{
+	let col = col('.')
+	if  col == col('$')
+		let col = col - 1
+	endif
+	return delimitMate#GetSyntaxRegion(line('.'), col)
+endfunction " }}}
+
+function! delimitMate#GetCurrentSyntaxRegionIf(char) "{{{
+	let col = col('.')
+	let origin_line = getline('.')
+	let changed_line = strpart(origin_line, 0, col - 1) . a:char . strpart(origin_line, col - 1)
+	call setline('.', changed_line)
+	let region = delimitMate#GetSyntaxRegion(line('.'), col)
+	call setline('.', origin_line)
+	return region
+endfunction "}}}
+
+function! delimitMate#IsForbidden(char) "{{{
+	if b:delimitMate_excluded_regions_enabled == 0
+		return 0
+	endif
+	"let result = index(b:delimitMate_excluded_regions_list, delimitMate#GetCurrentSyntaxRegion()) >= 0
+	if index(b:delimitMate_excluded_regions_list, delimitMate#GetCurrentSyntaxRegion()) >= 0
+		"echom "Forbidden 1!"
+		return 1
+	endif
+	let region = delimitMate#GetCurrentSyntaxRegionIf(a:char)
+	"let result = index(b:delimitMate_excluded_regions_list, region) >= 0
+	"return result || region == 'Comment'
+	"echom "Forbidden 2!"
+	return index(b:delimitMate_excluded_regions_list, region) >= 0
+endfunction "}}}
+
+function! delimitMate#FlushBuffer() " {{{
+	let b:delimitMate_buffer = []
+	return ''
+endfunction " }}}
+" }}}
+
+" Doers {{{
+function! delimitMate#JumpIn(char) " {{{
+	if delimitMate#IsForbidden(a:char)
+		return ''
+	endif
+	let line = getline('.')
+	let col = col('.')-2
+	if (col) < 0
+		call setline('.',a:char.line)
+		call insert(b:delimitMate_buffer, a:char)
+	else
+		"echom string(col).':'.line[:(col)].'|'.line[(col+1):]
+		call setline('.',line[:(col)].a:char.line[(col+1):])
+		call insert(b:delimitMate_buffer, a:char)
+	endif
+	return ''
+endfunction " }}}
+
+function! delimitMate#JumpOut(char) "{{{
+	if delimitMate#IsForbidden(a:char)
+		return a:char
+	endif
+	let line = getline('.')
+	let col = col('.')-2
+	if line[col+1] == a:char
+		return a:char . delimitMate#Del()
+	else
+		return a:char
+	endif
+endfunction " }}}
+
+function! delimitMate#JumpAny(key) " {{{
+	if delimitMate#IsForbidden('')
+		return a:key
+	endif
+	if !delimitMate#ShouldJump()
+		return a:key
+	endif
+	" Let's get the character on the right.
+	let char = getline('.')[col('.')-1]
+	if char == " "
+		" Space expansion.
+		"let char = char . getline('.')[col('.')] . delimitMate#Del()
+		return char . getline('.')[col('.')] . delimitMate#Del() . delimitMate#Del()
+		"call delimitMate#RmBuffer(1)
+	elseif char == ""
+		" CR expansion.
+		"let char = "\<CR>" . getline(line('.') + 1)[0] . "\<Del>"
+		let b:delimitMate_buffer = []
+		return "\<CR>" . getline(line('.') + 1)[0] . "\<Del>"
+	else
+		"call delimitMate#RmBuffer(1)
+		return char . delimitMate#Del()
+	endif
+endfunction " delimitMate#JumpAny() }}}
+
+function! delimitMate#SkipDelim(char) "{{{
+	if delimitMate#IsForbidden(a:char)
+		return a:char
+	endif
+	let col = col('.') - 1
+	let line = getline('.')
+	if col > 0
+		let cur = line[col]
+		let pre = line[col-1]
+	else
+		let cur = line[col]
+		let pre = ""
+	endif
+	if pre == "\\"
+		" Escaped character
+		return a:char
+	elseif cur == a:char
+		" Exit pair
+		"return delimitMate#WriteBefore(a:char)
+		return a:char . delimitMate#Del()
+	elseif delimitMate#IsEmptyPair( pre . a:char )
+		" Add closing delimiter and jump back to the middle.
+		call insert(b:delimitMate_buffer, a:char)
+		return delimitMate#WriteAfter(a:char)
+	else
+		" Nothing special here, return the same character.
+		return a:char
+	endif
+endfunction "}}}
+
+function! delimitMate#QuoteDelim(char) "{{{
+	if delimitMate#IsForbidden(a:char)
+		return a:char
+	endif
+	let line = getline('.')
+	let col = col('.') - 2
+	if line[col] == "\\"
+		" Seems like a escaped character, insert one quotation mark.
+		return a:char
+	elseif line[col + 1] == a:char
+		" Get out of the string.
+		"return delimitMate#WriteBefore(a:char)
+		return a:char . delimitMate#Del()
+	elseif (line[col] =~ '[a-zA-Z0-9]' && a:char == "'") ||
+				\(line[col] =~ '[a-zA-Z0-9]' && b:delimitMate_smart_quotes)
+		" Seems like an apostrophe or a closing, insert a single quote.
+		return a:char
+	elseif (line[col] == a:char && line[col + 1 ] != a:char) && b:delimitMate_smart_quotes
+		" Seems like we have an unbalanced quote, insert one quotation mark and jump to the middle.
+		call insert(b:delimitMate_buffer, a:char)
+		return delimitMate#WriteAfter(a:char)
+	else
+		" Insert a pair and jump to the middle.
+		call insert(b:delimitMate_buffer, a:char)
+		call delimitMate#WriteAfter(a:char)
+		return a:char
+	endif
+endfunction "}}}
+
+function! delimitMate#MapMsg(msg) "{{{
+	redraw
+	echomsg a:msg
+	return ""
+endfunction "}}}
+
+function! delimitMate#ExpandReturn() "{{{
+	if delimitMate#IsForbidden("")
+		return "\<CR>"
+	endif
+	if delimitMate#WithinEmptyPair()
+		" Expand:
+		call delimitMate#FlushBuffer()
+		"return "\<Esc>a\<CR>x\<CR>\<Esc>k$\"_xa"
+		return "\<CR>\<UP>\<Esc>o"
+	else
+		return "\<CR>"
+	endif
+endfunction "}}}
+
+function! delimitMate#ExpandSpace() "{{{
+	if delimitMate#IsForbidden("\<Space>")
+		return "\<Space>"
+	endif
+	if delimitMate#WithinEmptyPair()
+		" Expand:
+		call insert(b:delimitMate_buffer, 's')
+		" Expand:
+		call insert(b:delimitMate_buffer, 's')
+		return delimitMate#WriteAfter(' ') . "\<Space>"
+	else
+		return "\<Space>"
+	endif
+endfunction "}}}
+
+function! delimitMate#BS() " {{{
+	if delimitMate#IsForbidden("")
+		return "\<BS>"
+	endif
+	if delimitMate#WithinEmptyPair()
+		"call delimitMate#RmBuffer(1)
+		return "\<BS>" . delimitMate#Del()
+"        return "\<Right>\<BS>\<BS>"
+	elseif delimitMate#IsSpaceExpansion()
+		"call delimitMate#RmBuffer(1)
+		return "\<BS>" . delimitMate#Del()
+	elseif delimitMate#IsCRExpansion()
+		return "\<BS>\<Del>"
+	else
+		return "\<BS>"
+	endif
+endfunction " }}} delimitMate#BS()
+
+function! delimitMate#Del() " {{{
+	if len(b:delimitMate_buffer) > 0
+		let line = getline('.')
+		let col = col('.') - 2
+		call delimitMate#RmBuffer(1)
+		call setline('.', line[:col] . line[col+2:])
+		return ''
+	else
+		return "\<Del>"
+	endif
+endfunction " }}}
+
+function! delimitMate#Finish() " {{{
+	let len = len(b:delimitMate_buffer)
+	if len > 0
+		let buffer = join(b:delimitMate_buffer, '')
+		" Reset buffer:
+		let b:delimitMate_buffer = []
+		let line = getline('.')
+		let col = col('.') -2
+		"echom 'col: ' . col . '-' . line[:col] . "|" . line[col+len+1:] . '%' . buffer
+		if col < 0
+			call setline('.', line[col+len+1:])
+		else
+			call setline('.', line[:col] . line[col+len+1:])
+		endif
+		let i = 1
+		let lefts = "\<Left>"
+		while i < len
+			let lefts = lefts . "\<Left>"
+			let i += 1
+		endwhile
+		return substitute(buffer, "s", "\<Space>", 'g') . lefts
+	endif
+	return ''
+endfunction " }}}
+
+function! delimitMate#RmBuffer(num) " {{{
+	if len(b:delimitMate_buffer) > 0
+	   call remove(b:delimitMate_buffer, 0, (a:num-1))
+	endif
+	return ""
+endfunction " }}}
+
+" }}}
+
+" Mappers: {{{
+function! delimitMate#NoAutoClose() "{{{
+	" inoremap <buffer> ) <C-R>=delimitMate#SkipDelim('\)')<CR>
+	for delim in b:delimitMate_right_delims + b:delimitMate_quotes_list
+		exec 'inoremap <buffer> ' . delim . ' <C-R>=delimitMate#SkipDelim("' . escape(delim,'"\|') . '")<CR>'
+	endfor
+endfunction "}}}
+
+function! delimitMate#AutoClose() "{{{
+	" Add matching pair and jump to the midle:
+	" inoremap <buffer> ( ()<Left>
+	let i = 0
+	while i < len(b:delimitMate_matchpairs_list)
+		let ld = b:delimitMate_left_delims[i]
+		let rd = b:delimitMate_right_delims[i]
+		exec 'inoremap <buffer> ' . ld . ' ' . ld . '<C-R>=delimitMate#JumpIn("' . rd . '")<CR>'
+		let i += 1
+	endwhile
+
+	" Exit from inside the matching pair:
+	for delim in b:delimitMate_right_delims
+		exec 'inoremap <buffer> ' . delim . ' <C-R>=delimitMate#JumpOut("\' . delim . '")<CR>'
+	endfor
+
+	" Add matching quote and jump to the midle, or exit if inside a pair of matching quotes:
+	" inoremap <buffer> " <C-R>=delimitMate#QuoteDelim("\"")<CR>
+	for delim in b:delimitMate_quotes_list
+		exec 'inoremap <buffer> ' . delim . ' <C-R>=delimitMate#QuoteDelim("\' . delim . '")<CR>'
+	endfor
+
+	" Try to fix the use of apostrophes (de-activated by default):
+	" inoremap <buffer> n't n't
+	for map in b:delimitMate_apostrophes_list
+		exec "inoremap <buffer> " . map . " " . map
+	endfor
+endfunction "}}}
+
+function! delimitMate#VisualMaps() " {{{
+	let VMapMsg = "delimitMate: delimitMate is disabled on blockwise visual mode."
+	let vleader = b:delimitMate_visual_leader
+	" Wrap the selection with matching pairs, but do nothing if blockwise visual mode is active:
+	for del in b:delimitMate_right_delims + b:delimitMate_left_delims + b:delimitMate_quotes_list
+		exec "vnoremap <buffer> <expr> " . vleader . del . ' delimitMate#Visual("' . escape(del, '")') . '")'
+	endfor
+endfunction "}}}
+
+function! delimitMate#ExtraMappings() "{{{
+	" If pair is empty, delete both delimiters:
+	inoremap <buffer> <BS> <C-R>=delimitMate#BS()<CR>
+
+	" If pair is empty, delete closing delimiter:
+	inoremap <buffer> <expr> <S-BS> delimitMate#WithinEmptyPair() && !delimitMate#IsForbidden("") ? "\<Del>" : "\<S-BS>"
+
+	" Expand return if inside an empty pair:
+	if b:delimitMate_expand_cr != 0
+		inoremap <buffer> <CR> <C-R>=delimitMate#ExpandReturn()<CR>
+	endif
+
+	" Expand space if inside an empty pair:
+	if b:delimitMate_expand_space != 0
+		inoremap <buffer> <Space> <C-R>=delimitMate#ExpandSpace()<CR>
+	endif
+
+	" Jump out ot any empty pair:
+	if b:delimitMate_tab2exit
+		inoremap <buffer> <S-Tab> <C-R>=delimitMate#JumpAny("\<S-Tab>")<CR>
+	endif
+
+	" Fix the re-do feature:
+	inoremap <buffer> <Esc> <C-R>=delimitMate#Finish()<CR><Esc>
+
+	" Flush the char buffer on mouse click:
+	inoremap <buffer> <LeftMouse> <C-R>=delimitMate#Finish()<CR><LeftMouse>
+	inoremap <buffer> <RightMouse> <C-R>=delimitMate#Finish()<CR><RightMouse>
+
+	" Flush the char buffer on key movements:
+	inoremap <buffer> <Left> <C-R>=delimitMate#Finish()<CR><Left>
+	inoremap <buffer> <Right> <C-R>=delimitMate#Finish()<CR><Right>
+	inoremap <buffer> <Up> <C-R>=delimitMate#Finish()<CR><Up>
+	inoremap <buffer> <Down> <C-R>=delimitMate#Finish()<CR><Down>
+
+	inoremap <buffer> <Del> <C-R>=delimitMate#Del()<CR>
+
+	"the following simply creates an ambiguous mapping so vim fully
+	"processes the escape sequence for terminal keys, see 'ttimeout' for a
+	"rough explanation, this just forces it to work
+	if &term[:4] == "xterm"
+		inoremap <silent> <C-[>OC <RIGHT>
+	endif
+endfunction "}}}
+
+function! delimitMate#UnMap() " {{{
+	let imaps =
+				\ b:delimitMate_right_delims +
+				\ b:delimitMate_left_delims +
+				\ b:delimitMate_quotes_list +
+				\ b:delimitMate_apostrophes_list +
+				\ ['<BS>', '<S-BS>', '<Del>', '<CR>', '<Space>', '<S-Tab>', '<Esc>'] +
+				\ ['<Up>', '<Down>', '<Left>', '<Right>', '<LeftMouse>', '<RightMouse>']
+
+	let vmaps =
+				\ b:delimitMate_right_delims +
+				\ b:delimitMate_left_delims +
+				\ b:delimitMate_quotes_list
+
+	for map in imaps
+		if maparg(map, "i") =~? 'delimitMate'
+			exec 'silent! iunmap <buffer> ' . map
+		endif
+	endfor
+
+	if !exists("b:delimitMate_visual_leader")
+		let vleader = ""
+	else
+		let vleader = b:delimitMate_visual_leader
+	endif
+	for map in vmaps
+		if maparg(vleader . map, "v") =~? "delimitMate"
+			exec 'silent! vunmap <buffer> ' . vleader . map
+		endif
+	endfor
+
+	let b:delimitMate_enabled = 0
+endfunction " }}} delimitMate#UnMap()
+
+"}}}
+
+" Tools: {{{
+function! delimitMate#TestMappings() "{{{
+	exec "normal i*b:delimitMate_autoclose = " . b:delimitMate_autoclose . "\<CR>"
+	exec "normal i*b:delimitMate_expand_space = " . b:delimitMate_expand_space . "\<CR>"
+	exec "normal i*b:delimitMate_expand_cr = " . b:delimitMate_expand_cr . "\<CR>\<CR>"
+
+	if b:delimitMate_autoclose
+		for i in range(len(b:delimitMate_left_delims))
+			exec "normal GGAOpen & close: " . b:delimitMate_left_delims[i]. "|"
+			exec "normal A\<CR>Delete: " . b:delimitMate_left_delims[i] . "\<BS>|"
+			exec "normal A\<CR>Exit: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "|"
+			exec "normal A\<CR>Space: " . b:delimitMate_left_delims[i] . " |"
+			exec "normal A\<CR>Delete space: " . b:delimitMate_left_delims[i] . " \<BS>|"
+			exec "normal GGA\<CR>Visual-L: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_left_delims[i]
+			exec "normal A\<CR>Visual-R: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_right_delims[i]
+			exec "normal A\<CR>Car return: " . b:delimitMate_left_delims[i] . "\<CR>|"
+			exec "normal GGA\<CR>Delete car return: " . b:delimitMate_left_delims[i] . "\<CR>\<BS>|\<Esc>GGA\<CR>\<CR>"
+		endfor
+		for i in range(len(b:delimitMate_quotes_list))
+			exec "normal GGAOpen & close: " . b:delimitMate_quotes_list[i]	. "|"
+			exec "normal A\<CR>Delete: "
+			exec "normal A\<CR>Exit: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "|"
+			exec "normal A\<CR>Space: " . b:delimitMate_quotes_list[i] . " |"
+			exec "normal A\<CR>Delete space: " . b:delimitMate_quotes_list[i] . " \<BS>|"
+			exec "normal GGA\<CR>Visual: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_quotes_list[i]
+			exec "normal A\<CR>Car return: " . b:delimitMate_quotes_list[i] . "\<CR>|"
+			exec "normal GGA\<CR>Delete car return: " . b:delimitMate_quotes_list[i] . "\<CR>\<BS>|\<Esc>GGA\<CR>\<CR>"
+		endfor
+	else
+		for i in range(len(b:delimitMate_left_delims))
+			exec "normal GGAOpen & close: " . b:delimitMate_left_delims[i]	. b:delimitMate_right_delims[i] . "|"
+			exec "normal A\<CR>Delete: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "\<BS>|"
+			exec "normal A\<CR>Exit: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . b:delimitMate_right_delims[i] . "|"
+			exec "normal A\<CR>Space: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . " |"
+			exec "normal A\<CR>Delete space: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . " \<BS>|"
+			exec "normal GGA\<CR>Visual-L: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_left_delims[i]
+			exec "normal A\<CR>Visual-R: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_right_delims[i]
+			exec "normal A\<CR>Car return: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "\<CR>|"
+			exec "normal GGA\<CR>Delete car return: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "\<CR>\<BS>|\<Esc>GGA\<CR>\<CR>"
+		endfor
+		for i in range(len(b:delimitMate_quotes_list))
+			exec "normal GGAOpen & close: " . b:delimitMate_quotes_list[i]	. b:delimitMate_quotes_list[i] . "|"
+			exec "normal A\<CR>Delete: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "\<BS>|"
+			exec "normal A\<CR>Exit: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "|"
+			exec "normal A\<CR>Space: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . " |"
+			exec "normal A\<CR>Delete space: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . " \<BS>|"
+			exec "normal GGA\<CR>Visual: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_quotes_list[i]
+			exec "normal A\<CR>Car return: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "\<CR>|"
+			exec "normal GGA\<CR>Delete car return: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "\<CR>\<BS>|\<Esc>GGA\<CR>\<CR>"
+		endfor
+	endif
+	exec "normal \<Esc>i"
+endfunction "}}}
+
+"}}}
+
+" vim:foldmethod=marker:foldcolumn=4

autoload/delimitMateTests.vim

@@ -0,0 +1,272 @@
+function! delimitMateTests#Main() " {{{
+	if !exists("g:delimitMate_testing")
+		echoerr "delimitMateTests#Main(): If you really want to use me, you must set delimitMate_testing to any value."
+		return
+	endif
+	nmap <F1> :qall!<CR>
+	let b:test_results = {}
+	let b:errors = 0
+	let b:corrects = 0
+	let b:ignores = 0
+
+	function! SetOptions(list) " {{{
+		let b:delimitMate_autoclose = 1
+		let b:delimitMate_matchpairs = &matchpairs
+		let b:delimitMate_quotes = "\" ' `"
+		let b:delimitMate_excluded_regions = "Comment"
+		silent! unlet b:delimitMate_visual_leader
+		let b:delimitMate_expand_space = 0
+		let b:delimitMate_expand_cr = 0
+		let b:delimitMate_smart_quotes = 1
+		let b:delimitMate_apostrophes = ""
+		let b:delimitMate_tab2exit = 1
+		" Set current test options:
+		for str in a:list
+			let pair = split(str, ':')
+			exec "let b:delimitMate_" . pair[0] . " = " . pair[1]
+		endfor
+		DelimitMateReload
+	endfunction " }}}
+
+	function! Type(name, input, output, options, ...) " {{{
+		if a:0 > 0
+			let ignore = a:1
+		else
+			let ignore = 0
+		endif
+		if a:input != "\<Esc>."
+			" Set default options:
+			call SetOptions(a:options)
+			let CapR = ""
+			normal ggVG"_d
+			exec "normal i" . a:input . "|\<Esc>"
+		else
+			let CapR = "_R"
+			normal gg.
+		endif
+
+		call setpos('.', [0, 1, 1, 0])
+		let result = len(a:output) != line('$')
+		for line in a:output
+			if getline('.') != line || result == 1
+				let result = 1
+				break
+			endif
+			call setpos('.', [0, line('.') + 1, 1, 0])
+		endfor
+		let text = getline('.')
+		let i = 2
+		while i <= line('$')
+			let text = text . "<cr>" . getline(i)
+			let i += 1
+		endwhile
+		if ignore == 1
+			let label = "Ignored"
+			let result = "?="
+			let b:ignores += 1
+		elseif result == 0
+			let label = "Passed"
+			let result = "=="
+			let b:corrects += 1
+		else
+			let label = "Failed"
+			let result = "!="
+			let b:errors += 1
+		endif
+		exec "let b:test_results['" .
+					\ substitute(a:name, "[^a-zA-Z0-9_]", "_", "g") . CapR . "'] = '" .
+					\ label . ": ' . a:input . ' => ' . text . ' " .
+					\ result . " ' . join(a:output, '<cr>')"
+	endfunction " }}}
+
+	function! RepeatLast(name, output, ...) " {{{
+		if a:0 > 0
+			let arg1 = a:1
+		else
+			let arg1 = ''
+		endif
+		call Type(a:name, "\<Esc>.", a:output, [], arg1)
+	endfunction " }}}
+
+	" Test's test {{{
+	call Type("Test 1", "123", ["123|"], [])
+	call RepeatLast("Test 1", ["123|123|"])
+
+	" Auto-closing parens
+	call Type("Autoclose parens", "(", ["(|)"], [])
+	call RepeatLast("Autoclose_parens", ["(|)(|)"])
+
+	" Auto-closing quotes
+	call Type("Autoclose quotes", '"', ['"|"'], [])
+	call RepeatLast("Autoclose_quotes", ['"|""|"'])
+
+	" Deleting parens
+	call Type("Delete empty parens", "(\<BS>", ["|"], [])
+	call RepeatLast("Delete empty parens", ["||"])
+
+	" Deleting quotes
+	call Type("Delete emtpy quotes", "\"\<BS>", ['|'], [])
+	call RepeatLast("Delete empty quotes", ["||"])
+
+	" Manual closing parens
+	call Type("Manual closing parens", "()", ["(|)"], ["autoclose:0"])
+	call RepeatLast("Manual closing parens", ["(|)(|)"])
+
+	" Manual closing quotes
+	call Type("Manual closing quotes", "\"\"", ['"|"'], ["autoclose:0"])
+	call RepeatLast("Manual closing quotes", ['"|""|"'])
+
+	" Jump over paren
+	call Type("Jump over paren", "()", ['()|'], [])
+	call RepeatLast("Jump over paren", ['()|()|'])
+
+	" Jump over quote
+	call Type("Jump over quote", "\"\"", ['""|'], [])
+	call RepeatLast("Jump over quote", ['""|""|'])
+
+	" Apostrophe
+	call Type("Apostrophe", "test'", ["test'|"], [])
+	call RepeatLast("Apostrophe", ["test'|test'|"])
+
+	" Close quote
+	call Type("Close quote", "'\<Del>\<Esc>a'", ["'|'"], [])
+
+	" Closing paren
+	call Type("Closing paren", "abcd)", ["abcd)|"], [])
+
+	" <S-Tab>
+	call Type("S Tab", "(\<S-Tab>", ["()|"], [])
+	call RepeatLast("S Tab", ["()|()|"])
+
+	" Space expansion
+	call Type("Space expansion", "(\<Space>\<BS>", ['(|)'], ['expand_space:1'])
+	call RepeatLast("BS with space expansion", ['(|)(|)'])
+
+	" BS with space expansion
+	call Type("BS with space expansion", "(\<Space>", ['( | )'], ['expand_space:1'])
+	call RepeatLast("Space expansion", ['( | )( | )'])
+
+	" Car return expansion
+	call Type("CR expansion", "(\<CR>", ['(', '|', ')'], ['expand_cr:1'])
+	call RepeatLast("CR expansion", ['(', '|', ')(', '|', ')'], 1)
+
+	" BS with car return expansion
+	call Type("BS with CR expansion", "(\<CR>\<BS>", ['(|)'], ['expand_cr:1'])
+	call RepeatLast("BS with CR expansion", ['(|)(|)'], 1)
+
+	" Visual wrapping
+	call Type("Visual wrapping left paren", "1234\<Esc>v,(", ['123(4)'], ['visual_leader:","'])
+	cal RepeatLast("Visual wrapping left paren", ['(1)23(4)'], 1)
+
+	" Visual line wrapping
+	call Type("Visual line wrapping left paren", "1234\<Esc>V,(", ['(1234)'], ['visual_leader:","'])
+	cal RepeatLast("Visual line wrapping left paren", ['((1234))'], 1)
+
+	" Visual wrapping
+	call Type("Visual wrapping right paren", "1234\<Esc>v,)", ['123(4)'], ['visual_leader:","'])
+	cal RepeatLast("Visual wrapping right paren", ['(1)23(4)'], 1)
+
+	" Visual line wrapping
+	call Type("Visual line wrapping right paren", "1234\<Esc>V,)", ['(1234)'], ['visual_leader:","'])
+	cal RepeatLast("Visual line wrapping right paren", ['((1234))'], 1)
+
+	" Visual wrapping
+	call Type("Visual wrapping quote", "1234\<Esc>v,\"", ['123"4"'], ['visual_leader:","'])
+	cal RepeatLast("Visual wrapping quote", ['"1"23"4"'], 1)
+
+	" Visual line wrapping
+	call Type("Visual line wrapping quote", "1234\<Esc>V,\"", ['"1234"'], ['visual_leader:","'])
+	cal RepeatLast("Visual line wrapping quote", ['""1234""'], 1)
+
+	" Visual line wrapping empty line
+	call Type("Visual line wrapping paren empty line", "\<Esc>V,(", ['()'], ['visual_leader:","'])
+
+	" Visual line wrapping empty line
+	call Type("Visual line wrapping quote empty line", "\<Esc>V,\"", ['""'], ['visual_leader:","'])
+
+	" Smart quotes
+	call Type("Smart quote alphanumeric", "a\"4", ['a"4|'], [])
+	call RepeatLast("Smart quote alphanumeric", ['a"4|a"4|'])
+
+	" Smart quotes
+	call Type("Smart quote escaped", "esc\\\"", ['esc\"|'], [])
+	call RepeatLast("Smart quote escaped", ['esc\"|esc\"|'])
+
+	" Smart quotes
+	call Type("Smart quote apostrophe", "I'm", ["I'm|"], ['smart_quotes:0'])
+	call RepeatLast("Smart quote escaped", ["I'm|I'm|"])
+
+	" Backspace inside space expansion
+	call Type("Backspace inside space expansion", "(\<Space>\<BS>", ['(|)'], ['expand_space:1'])
+	call RepeatLast("Backspace inside space expansion", ['(|)(|)'])
+
+	" <Right-arrow> inserts text
+	call Type("<Right-arrow> inserts text", "(he\<Right>\<Space>th\<Right>\<Right>", ['(he) th|'], [])
+
+	" Backspace inside CR expansion
+	call Type("Backspace inside CR expansion", "(\<CR>\<BS>", ['(|)'], ['expand_cr:1'])
+	call RepeatLast("Backspace inside CR expansion", ['(|)(|)'], 1)
+
+	" FileType event
+	let g:delimitMate_excluded_ft = "vim"
+	set ft=vim
+	call Type("FileType Autoclose parens", "(", ["(|"], [])
+	unlet g:delimitMate_excluded_ft
+	set ft=
+
+	" Duplicated delimiter after CR
+	call Type("Duplicated delimiter after CR", "(\<CR>", ['(', '|)'], [])
+
+	" Deactivate on comments: The first call to a closing delimiter
+	" will not work here as expected, but it does in real life tests.
+	set ft=vim
+	call Type("Deactivate on comments", "\"()``[]''\"\"", ["\"()``[]''\"\"|"], ["autoclose:0"], 1)
+	set ft=
+
+	" Deactivate parens on comments: The first call to a closing delimiter
+	" will not work here as expected, but it does in real life tests.
+	set ft=vim
+	call Type("Deactivate parens on comments", "\"()[]", ["\"()[]|"], ["autoclose:0"], 1)
+	set ft=
+
+	" Deactivate quotes on comments: See previous note.
+	set ft=vim
+	call Type("Deactivate parens on comments", "\"(`", ["\"(``|"], [], 1)
+	set ft=
+
+	" Manual close at start of line
+	call Type("Manual close at start of line", "m)\<Left>\<Left>)", [')|m)'], ["autoclose:0"])
+
+	"}}}
+
+	" Show results: {{{
+	normal ggVG"_d
+	call append(0, split(string(b:test_results)[1:-2], ', '))
+	call append(0, "*TESTS REPORT: " . b:errors . " failed, " . b:corrects . " passed and " . b:ignores . " ignored.")
+	normal "_ddgg
+	let @/ = ".\\+Failed:.*!="
+	set nohlsearch
+	"syntax match failedLine "^.*Failed.*$" contains=ALL
+	"syn match passedLine ".*Passed.*"
+	syn match lineIgnored ".*Ignored.*"
+	syn match labelPassed "'\@<=.\+\(': 'Passed\)\@="
+	syn match labelFailed "'\@<=.\+\(': 'Failed\)\@="
+	syn match resultPassed "\('Passed: \)\@<=.\+\('$\)\@="
+	syn match resultFailed "\('Failed: \)\@<=.\+\('$\)\@=" contains=resultInequal
+	syn match resultIgnored "\('Ignored: \)\@<=.\+\('$\)\@="
+	syn match resultInequal "!="
+	syn match resultSummary "^\*.\+" contains=resultSummaryNumber
+	syn match resultSummaryNumber "[1-9][0-9]* failed*" contained
+
+	hi def link lineIgnored Ignore
+	hi def link labelPassed Comment
+	hi def link labelFailed Special
+	hi def link resultPassed Ignore
+	hi def link resultFailed Boolean
+	hi def link resultInequal Error
+	hi def link resultSummary SpecialComment
+	hi def link resultSummaryNumber Error
+	" }}}
+endfunction " }}}
+" vim:foldmethod=marker:foldcolumn=4
+

doc/delimitMate.txt

@@ -1,18 +1,20 @@
-*delimitMate*    Trying to keep those beasts at bay! v.2.0   *delimitMate.txt*
+*delimitMate*    Trying to keep those beasts at bay! v2.3    *delimitMate.txt*
+
+
+
+  MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+  MMMM  MMMMMMMMM  MMMMMMMMMMMMMMMMMMMMMMMMMM  MMMMM  MMMMMMMMMMMMMMMMMMMMM  ~
+  MMMM  MMMMMMMMM  MMMMMMMMMMMMMMMMMMMMMMMMMM   MMM   MMMMMMMMMMMMMMMMMMMMM
+  MMMM  MMMMMMMMM  MMMMMMMMMMMMMMMMMMMMM  MMM  M   M  MMMMMMMMMM  MMMMMMMMM  ~
+  MMMM  MMM   MMM  MM  MM  M  M MMM  MM    MM  MM MM  MMM   MMM    MMM   MM
+  MM    MM  M  MM  MMMMMM        MMMMMMM  MMM  MMMMM  MM  M  MMM  MMM  M  M  ~
+  M  M  MM     MM  MM  MM  M  M  MM  MMM  MMM  MMMMM  MMMMM  MMM  MMM     M
+  M  M  MM  MMMMM  MM  MM  M  M  MM  MMM  MMM  MMMMM  MMM    MMM  MMM  MMMM  ~
+  M  M  MM  M  MM  MM  MM  M  M  MM  MMM  MMM  MMMMM  MM  M  MMM  MMM  M  M
+  MM    MMM   MMM  MM  MM  M  M  MM  MMM   MM  MMMMM  MMM    MMM   MMM   MM  ~
+  MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
 
-  =========================================================================  ~
-  ====  =========  ==========================  =====  =====================  ~
-  ====  =========  ==========================   ===   =====================  ~
-  ====  =========  =====================  ===  =   =  ==========  =========  ~
-  ====  ===   ===  ==  ==  =  = ===  ==    ==  == ==  ===   ===    ===   ==  ~
-  ==    ==  =  ==  ======        =======  ===  =====  ==  =  ===  ===  =  =  ~
-  =  =  ==     ==  ==  ==  =  =  ==  ===  ===  =====  =====  ===  ===     =  ~
-  =  =  ==  =====  ==  ==  =  =  ==  ===  ===  =====  ===    ===  ===  ====  ~
-  =  =  ==  =  ==  ==  ==  =  =  ==  ===  ===  =====  ==  =  ===  ===  =  =  ~
-  ==    ===   ===  ==  ==  =  =  ==  ===   ==  =====  ===    ===   ===   ==  ~
-  =========================================================================  ~
 
-                              REFERENCE MANUAL                               *
 
 ==============================================================================
  0.- CONTENTS                                           *delimitMate-contents*
@@ -24,8 +26,10 @@
         2.3 Backspace__________________________|delimitMateBackspace|
         2.4 Visual wrapping____________________|delimitMateVisualWrapping|
         2.5 Smart Quotes_______________________|delimitMateSmartQuotes|
+        2.6 FileType based configuration_______|delimitMateFileType|
+        2.7 Syntax awareness___________________|delimitMateSyntax|
     3. Customization___________________________|delimitMateOptions|
-        3.1 Option summary_____________________|delimitMateOptionSummary|
+        3.1 Options summary____________________|delimitMateOptionSummary|
         3.2 Options details____________________|delimitMateOptionDetails|
     4. Commands________________________________|delimitMateCommands|
     5. Functions_______________________________|delimitMateFunctions|
@@ -37,23 +41,13 @@
 ==============================================================================
  1.- INTRODUCTION                                           *delimitMateIntro*
 
-The delimitMate plugin tries to provide some not so dumb help in the work with
-delimiters (brackets, quotes, etc.), with some optional auto-completions and
-expansions.
+This plug-in provides automatic closing of quotes, parenthesis, brackets,
+etc.; besides some other related features that should make your time in insert
+mode a little bit easier.
 
-When automatic closing is enabled, if an opening delimiter is inserted
-delimitMate inserts the closing pair and places the cursor between them. When
-automatic closing is disabled, no closing delimiters is inserted by
-delimitMate, but if a pair of delimiters is typed, the cursor is placed in the
-middle. Also, to get out of a pair of delimiters just type shift+tab or the
-right delimiter and the cursor will jump to the right.
-
-If the cursor is inside an empty pair of delimiters, typing <Space> will
-insert two spaces and the cursor will be placed in the middle; typing <CR>
-will insert to car retunrs and place the cursor in the middle line, between
-the delimiters.
-
-All of the operations are undo/redo-wise safe.
+Most of the features can be modified or disabled permanently, using global
+variables, or on a FileType basis, using autocommands. With a couple of
+exceptions and limitations, this features don't brake undo, redo or history.
 
 ==============================================================================
  2. FUNCTIONALITY                                   *delimitMateFunctionality*
@@ -118,6 +112,8 @@ Expand <CR> to: >
                                     |    )
 <
 
+NOTE that the expansion of <CR> will brake the redo command.
+
 Since <Space> and <CR> are used everywhere, I have made the functions involved
 in expansions global, so they can be used to make custom mappings. Read
 |delimitMateFunctions| for more details.
@@ -125,17 +121,26 @@ in expansions global, so they can be used to make custom mappings. Read
 ------------------------------------------------------------------------------
    2.3 BACKSPACE                                        *delimitMateBackspace*
 
-If you press backspace inside an empty pair, both delimiters are deleted. If
-you type shift + backspace instead, only the closing delimiter will be
+If you press backspace inside an empty pair, both delimiters are deleted. When
+expansions are enabled, <BS> will also delete the expansions. NOTE that
+deleting <CR> expansions will brake the redo command.
+
+If you type shift + backspace instead, only the closing delimiter will be
 deleted.
 
 e.g. typing at the "|": >
 
-                  What  |      Before      |      After
+                  What  |      Before       |      After
                ==============================================
-                  <BS>  |  call expand(|)  |  call expand|
-               ---------|------------------|-----------------
-                 <S-BS> |  call expand(|)  |  call expand(|
+                  <BS>  |  call expand(|)   |  call expand|
+               ---------|-------------------|-----------------
+                  <BS>  |  call expand( | ) |  call expand(|)
+               ---------|-------------------|-----------------
+                  <BS>  |  call expand(     |  call expand(|)
+                        |  |                |
+                        |  )                |
+               ---------|-------------------|-----------------
+                 <S-BS> |  call expand(|)   |  call expand(|
 <
 
 ------------------------------------------------------------------------------
@@ -144,8 +149,8 @@ e.g. typing at the "|": >
 When visual mode is active this script allows for the selection to be enclosed
 with delimiters. But, since brackets have special meaning in visual mode, a
 leader (the value of 'mapleader' by default) should precede the delimiter.
-This feature doesn't currently work on blockwise visual mode, any suggestions
-will be welcome.
+NOTE that this feature brakes the redo command and doesn't currently work on
+blockwise visual mode, any suggestions to fix this will be very welcome.
 
 e.g. (selection represented between square brackets): >
 
@@ -170,6 +175,40 @@ e.g. typing at the "|": >
                       "   |  let i = "|  |  let i = "|"
                       '   |  I|          |  I'|
 <
+------------------------------------------------------------------------------
+   2.6 FILE TYPE BASED CONFIGURATION                     *delimitMateFileType*
+
+delimitMate options can be set globally for all buffers using global
+("regular") variables in your |vimrc| file. But |:autocmd| can be used to set
+options for specific file types (see |'filetype'|) using buffer variables in
+the following way: >
+
+   au FileType mail,text let b:delimitMate_autoclose = 0
+         ^       ^           ^            ^            ^
+         |       |           |            |            |
+         |       |           |            |            - Option value.
+         |       |           |            - Option name.
+         |       |           - Buffer variable.
+         |       - File types for which the option will be set.
+         - Don't forget to put this event.
+<
+NOTE that you should use buffer variables (|b:var|) only to set options with
+|:autocmd|, for global options use regular variables (|g:var|) in your vimrc.
+
+------------------------------------------------------------------------------
+   2.7 SYNTAX AWARENESS                                    *delimitMateSyntax*
+
+The features of this plug-in might not be always helpful, comments and strings
+usualy don't need auto-completion. delimitMate monitors which region is being
+edited and if it detects that the cursor is in a comment it'll turn itself off
+until the cursor leaves the comment. The excluded regions can be set using the
+option |'delimitMate_excluded_regions'|. Read |group-name| for a list of
+regions or syntax group names.
+
+NOTE that this feature relies on a proper syntax file for the current file
+type, if the appropiate syntax file doesn't define a region, delimitMate won't
+know about it.
+
 ==============================================================================
  3. CUSTOMIZATION                                         *delimitMateOptions*
 
@@ -202,6 +241,9 @@ specific file types, see |delimitMateOptionDetails| for examples.
 
 |'delimitMate_excluded_ft'|     Turns off the script for the given file types.
 
+|'delimitMate_excluded_regions'|Turns off the script for the given regions or
+                                syntax group names.
+
 |'delimitMate_apostrophes'|     Tells delimitMate how it should "fix"
                                 balancing of single quotes when used as
                                 apostrophes. NOTE: Not needed any more, kept
@@ -213,8 +255,13 @@ specific file types, see |delimitMateOptionDetails| for examples.
    3.2 OPTIONS DETAILS                              *delimitMateOptionDetails*
 
 Add the shown lines to your vimrc file in order to set the below options.
-Local options take precedence over global ones and can be used along with
-autocmd to modify delimitMate's behavior for specific file types.
+Buffer variables take precedence over global ones and can be used along with
+autocmd to modify delimitMate's behavior for specific file types, read more in
+|delimitMateFileType|.
+
+Note: Use buffer variables only to set options for specific file types using
+:autocmd, use global variables to set options for every buffer. Read more in
+|g:var| and |b:var|.
 
 ------------------------------------------------------------------------------
                                                         *'loaded_delimitMate'*
@@ -245,7 +292,7 @@ Default: &matchpairs                                                         ~
 Use this option to tell delimitMate which characters should be considered
 matching pairs. Read |delimitMateAutoClose| for details.
 e.g: >
-        let delimitMate = "(:),[:],{:},<:>"
+        let delimitMate_matchpairs = "(:),[:],{:},<:>"
         au FileType vim,html let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
 <
 ------------------------------------------------------------------------------
@@ -306,6 +353,16 @@ only if you don't want any of the features it provides on those file types.
 e.g.: >
         let delimitMate_excluded_ft = "mail,txt"
 <
+------------------------------------------------------------------------------
+                                              *'delimitMate_excluded_regions'*
+Values: A string of syntax group names names separated by single commas.     ~
+Default: Comment                                                             ~
+
+This options turns delimitMate off for the listed regions, read |group-name|
+for more info about what is a region.
+e.g.: >
+        let delimitMate_excluded_regions = "Comments,String"
+<
 ------------------------------------------------------------------------------
                                                    *'delimitMate_apostrophes'*
 Values: Strings separated by ":".                                            ~
@@ -331,6 +388,11 @@ e.g.: >
 Re-sets all the mappings used for this script, use it if any option has been
 changed or if the filetype option hasn't been set yet.
 
+------------------------------------------------------------------------------
+:DelimitMateSwitch                                        *:DelimitMateSwitch*
+
+Switches the plug-in on and off.
+
 ------------------------------------------------------------------------------
 :DelimitMateTest                                            *:DelimitMateTest*
 
@@ -405,46 +467,49 @@ represented by an "|": >
 ==============================================================================
  5. FUNCTIONS                                           *delimitMateFunctions*
 
+Functions should be used enclosed between <C-R>= and <CR>, otherwise they
+might not work as expected or at all.
+
 ------------------------------------------------------------------------------
-delimitMate_WithinEmptyPair()                    *delimitMate_WithinEmptyPair*
+delimitMate#WithinEmptyPair()                    *delimitMate_WithinEmptyPair*
 
 Returns 1 if the cursor is inside an empty pair, 0 otherwise.
 
 ------------------------------------------------------------------------------
-DelimitMate_ExpandReturn()                        *DelimitMate_ExpandReturn()*
+delimitMate#ExpandReturn()                        *delimitMate#ExpandReturn()*
 
-Returns the expansion for <CR>.
+Returns the expansion for <CR> if enabled and inside an empty pair, returns
+<CR> otherwise.
 
 e.g.: This mapping could be used to select an item on a pop-up menu or expand
 <CR> inside an empty pair: >
 
         inoremap <expr> <CR> pumvisible() ? "\<c-y>" :
-                 \ DelimitMate_WithinEmptyPair ?
-                 \ DelimitMate_ExpandReturn() : "\<CR>"
+                 \ "\<C-R>=delimitMate#ExpandReturn()\<CR>"
 <
 ------------------------------------------------------------------------------
-DelimitMate_ExpandSpace()                          *DelimitMate_ExpandSpace()*
+delimitMate#ExpandSpace()                          *delimitMate#ExpandSpace()*
 
-Returns the expansion for <Space>.
+Returns the expansion for <Space> if enabled and inside an empty pair, returns
+<Space> otherwise.
 e.g.: >
 
-	inoremap <expr> <Space> DelimitMate_WithinEmptyPair() ?
-		\ DelimitMate_ExpandSpace() : "\<Space>"
+    inoremap <Space> <C-R>=delimitMate#ExpandSpace()<CR>
 <
 ------------------------------------------------------------------------------
-DelimitMate_ShouldJump()                            *DelimitMate_ShouldJump()*
+delimitMate#ShouldJump()                            *delimitMate#ShouldJump()*
 
 Returns 1 if there is a closing delimiter or a quote to the right of the
 cursor, 0 otherwise.
 
 ------------------------------------------------------------------------------
-DelimitMate_JumpAny()                                  *DelimitMate_JumpAny()*
+delimitMate#JumpAny(key)                               *delimitMate#JumpAny()*
 
-This function returns a mapping that will make the cursor jump to the right.
+This function returns a mapping that will make the cursor jump to the right
+when delimitMate#ShouldJump() returns 1, returns the argument "key" otherwise.
 e.g.: You can use this to create your own mapping to jump over any delimiter.
 >
-           inoremap <expr> <C-Tab> DelimitMate_ShouldJump() ?
-                           \ DelimitMate_JumpAny() : "\<C-Tab>"
+   inoremap <C-Tab> <C-R>=delimitMate#JumpAny("\<S-Tab>")<CR>
 <
 
 ==============================================================================
@@ -452,7 +517,6 @@ e.g.: You can use this to create your own mapping to jump over any delimiter.
 
 - Automatic set-up by file type.
 - Make visual wrapping work on blockwise visual mode.
-- Limit behaviour by region.
 
 ==============================================================================
  7. MAINTAINER                                         *delimitMateMaintainer*
@@ -487,7 +551,26 @@ This script was inspired by the auto-completion of delimiters of TextMate.
 
   Version      Date      Release notes                                       ~
 |---------|------------|-----------------------------------------------------|
-    2.0     2010-04-01   * New features:
+    2.3     2010-06-06 * Current release:
+                         - Syntax aware: Will turn off when editing comments
+                           or other regions, customizable.
+                         - Changed format of most mappings.
+                         - Fix: <CR> expansion doesn't brake automatic
+                           indentation adjustments anymore.
+                         - Fix: Arrow keys would insert A, B, C or D instead
+                           of moving the cursor when using Vim on a terminal.
+|---------|------------|-----------------------------------------------------|
+    2.2     2010-05-16 * - Added command to switch the plug-in on and off.
+                         - Fix: some problems with <Left>, <Right> and <CR>.
+                         - Fix: A small problem when inserting a delimiter at
+                           the beginning of the line.
+|---------|------------|-----------------------------------------------------|
+    2.1     2010-05-10 * - Most of the functions have been moved to an
+                           autoload script to avoid loading unnecessary ones.
+                         - Fixed a problem with the redo command.
+                         - Many small fixes.
+|---------|------------|-----------------------------------------------------|
+    2.0     2010-04-01 * New features:
                          - All features are redo/undo-wise safe.
                          - A single quote typed after an alphanumeric
                            character is considered an apostrophe and one
@@ -506,24 +589,24 @@ This script was inspired by the auto-completion of delimiters of TextMate.
                          - s:vars were being used to store buffer options.
 
 |---------|------------|-----------------------------------------------------|
-    1.6     2009-10-10   Now delimitMate tries to fix the balancing of single
+    1.6     2009-10-10 * Now delimitMate tries to fix the balancing of single
                          quotes when used as apostrophes. You can read
                          |delimitMate_apostrophes| for details.
                          Fixed an error when |b:delimitMate_expand_space|
                          wasn't set but |delimitMate_expand_space| wasn't.
 
 |---------|------------|-----------------------------------------------------|
-    1.5     2009-10-05   Fix: delimitMate should work correctly for files
+    1.5     2009-10-05 * Fix: delimitMate should work correctly for files
                          passed as arguments to Vim. Thanks to Ben Beuchler
                          for helping to nail this bug.
 
 |---------|------------|-----------------------------------------------------|
-    1.4     2009-09-27   Fix: delimitMate is now enabled on new buffers even
+    1.4     2009-09-27 * Fix: delimitMate is now enabled on new buffers even
                          if they don't have set the file type option or were
                          opened directly from the terminal.
 
 |---------|------------|-----------------------------------------------------|
-    1.3     2009-09-24   Now local options can be used along with autocmd
+    1.3     2009-09-24 * Now local options can be used along with autocmd
                          for specific file type configurations.
                          Fixes:
                          - Unnamed register content is not lost on visual
@@ -532,7 +615,7 @@ This script was inspired by the auto-completion of delimiters of TextMate.
                          - Wrapping a single empty line works as expected.
 
 |---------|------------|-----------------------------------------------------|
-    1.2	    2009-09-07   Fixes:
+    1.2     2009-09-07 * Fixes:
                          - When inside nested empty pairs, deleting the
                          innermost left delimiter would delete all right
                          contiguous delimiters.
@@ -543,19 +626,21 @@ This script was inspired by the auto-completion of delimiters of TextMate.
                          have the mappings set.
 
 |---------|------------|-----------------------------------------------------|
-    1.1     2009-08-25   Fixed an error that ocurred when mapleader wasn't
+    1.1     2009-08-25 * Fixed an error that ocurred when mapleader wasn't
                          set and added support for GetLatestScripts
                          auto-detection.
 
 |---------|------------|-----------------------------------------------------|
-    1.0     2009-08-23   Initial upload.
+    1.0     2009-08-23 * Initial upload.
 
 |---------|------------|-----------------------------------------------------|
 
 
-           ...           |"|         _     _       .      .         ___      ~
-      o,*,(o o)         _|_|_      o' \,=./ `o   .  .:::.          /_\ `*    ~
-     8(o o)(_)Ooo       (o o)         (o o)        :(o o):  .     (o o)      ~
----ooO-(_)---Ooo----ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo- ~
+  `\|||/´         MMM           \|/            www            __^__          ~
+   (o o)         (o o)          @ @           (O-O)          /(o o)\\        ~
+ooO_(_)_Ooo__ ooO_(_)_Ooo___oOO_(_)_OOo___oOO__(_)__OOo___oOO__(_)__OOo_____ ~
+_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|____ ~
+__|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_ ~
+_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|_____|____ ~
 
 vim:tw=78:ts=8:ft=help:norl:formatoptions+=tcroqn:autoindent:

plugin/delimitMate.vim

@@ -1,22 +1,10 @@
 " ============================================================================
-" File:        delimitMate.vim
-" Version:     2.0
-" Description: This plugin tries to emulate the auto-completion of delimiters
-"              that TextMate provides.
+" File:        plugin/delimitMate.vim
+" Version:     2.3
+" Modified:    2010-06-06
+" Description: This plugin provides auto-completion for quotes, parens, etc.
 " Maintainer:  Israel Chauca F. <israelchauca@gmail.com>
 " Manual:      Read ":help delimitMate".
-" Credits:     Some of the code is modified or just copied from the following:
-"
-"              - Ian McCracken
-"           	 Post titled: Vim, Part II: Matching Pairs:
-"           	 http://concisionandconcinnity.blogspot.com/
-"
-"              - Aristotle Pagaltzis
-"           	 From the comments on the previous blog post and from:
-"           	 http://gist.github.com/144619
-"
-"              - Vim Scripts:
-"           	 http://www.vim.org/scripts/
 
 " Initialization: {{{
 if exists("g:loaded_delimitMate") "{{{
@@ -38,553 +26,32 @@ if v:version < 700
 endif
 
 let s:loaded_delimitMate = 1 " }}}
-let delimitMate_version = '2.0'
+let delimitMate_version = '2.3'
 
-function! s:Init() "{{{
-
-	let b:loaded_delimitMate = 1
-
-	" delimitMate_autoclose {{{
-	if !exists("b:delimitMate_autoclose") && !exists("g:delimitMate_autoclose")
-		let b:delimitMate_autoclose = 1
-	elseif !exists("b:delimitMate_autoclose") && exists("g:delimitMate_autoclose")
-		let b:delimitMate_autoclose = g:delimitMate_autoclose
-	else
-		" Nothing to do.
-	endif " }}}
-
-	" delimitMate_matchpairs {{{
-	if !exists("b:delimitMate_matchpairs") && !exists("g:delimitMate_matchpairs")
-		if s:ValidMatchpairs(&matchpairs) == 1
-			let s:matchpairs_temp = &matchpairs
-		else
-			echoerr "delimitMate: There seems to be a problem with 'matchpairs', read ':help matchpairs' and fix it or notify the maintainer of this script if this is a bug."
-			finish
-		endif
-	elseif exists("b:delimitMate_matchpairs")
-		if s:ValidMatchpairs(b:delimitMate_matchpairs) || b:delimitMate_matchpairs == ""
-			let s:matchpairs_temp = b:delimitMate_matchpairs
-		else
-			echoerr "delimitMate: Invalid format in 'b:delimitMate_matchpairs', falling back to matchpairs. Fix the error and use the command :DelimitMateReload to try again."
-			if s:ValidMatchpairs(&matchpairs) == 1
-				let s:matchpairs_temp = &matchpairs
-			else
-				echoerr "delimitMate: There seems to be a problem with 'matchpairs', read ':help matchpairs' and fix it or notify the maintainer of this script if this is a bug."
-				let s:matchpairs_temp = ""
-			endif
-		endif
-	else
-		if s:ValidMatchpairs(g:delimitMate_matchpairs) || g:delimitMate_matchpairs == ""
-			let s:matchpairs_temp = g:delimitMate_matchpairs
-		else
-			echoerr "delimitMate: Invalid format in 'g:delimitMate_matchpairs', falling back to matchpairs. Fix the error and use the command :DelimitMateReload to try again."
-			if s:ValidMatchpairs(&matchpairs) == 1
-				let s:matchpairs_temp = &matchpairs
-			else
-				echoerr "delimitMate: There seems to be a problem with 'matchpairs', read ':help matchpairs' and fix it or notify the maintainer of this script if this is a bug."
-				let s:matchpairs_temp = ""
-			endif
-		endif
-
-	endif " }}}
-
-	" delimitMate_quotes {{{
-	if exists("b:delimitMate_quotes")
-		if b:delimitMate_quotes =~ '^\(\S\)\(\s\S\)*$' || b:delimitMate_quotes == ""
-			let s:quotes = split(b:delimitMate_quotes)
-		else
-			let s:quotes = split("\" ' `")
-			echoerr "delimitMate: There is a problem with the format of 'b:delimitMate_quotes', it should be a string of single characters separated by spaces. Falling back to default values."
-		endif
-	elseif exists("g:delimitMate_quotes")
-		if g:delimitMate_quotes =~ '^\(\S\)\(\s\S\)*$' || g:delimitMate_quotes == ""
-			let s:quotes = split(g:delimitMate_quotes)
-		else
-			let s:quotes = split("\" ' `")
-			echoerr "delimitMate: There is a problem with the format of 'g:delimitMate_quotes', it should be a string of single characters separated by spaces. Falling back to default values."
-		endif
-	else
-		let s:quotes = split("\" ' `")
-	endif
-	let b:delimitMate_quotes_list = s:quotes " }}}
-
-	" delimitMate_visual_leader {{{
-	if !exists("b:delimitMate_visual_leader") && !exists("g:delimitMate_visual_leader")
-		let b:delimitMate_visual_leader = exists('b:maplocalleader') ? b:maplocalleader :
-					\ exists('g:mapleader') ? g:mapleader : "\\"
-	elseif !exists("b:delimitMate_visual_leader") && exists("g:delimitMate_visual_leader")
-		let b:delimitMate_visual_leader = g:delimitMate_visual_leader
-	else
-		" Nothing to do.
-	endif " }}}
-
-	" delimitMate_expand_space {{{
-	if !exists("b:delimitMate_expand_space") && !exists("g:delimitMate_expand_space")
-		let b:delimitMate_expand_space = 0
-	elseif !exists("b:delimitMate_expand_space") && !exists("g:delimitMate_expand_space")
-		let b:delimitMate_expand_space = g:delimitMate_expand_space
-	else
-		" Nothing to do.
-	endif " }}}
-
-	" delimitMate_expand_cr {{{
-	if !exists("b:delimitMate_expand_cr") && !exists("g:delimitMate_expand_cr")
-		let b:delimitMate_expand_cr = 0
-	elseif !exists("b:delimitMate_expand_cr") && exists("g:delimitMate_expand_cr")
-		let b:delimitMate_expand_cr = g:delimitMate_expand_cr
-	else
-		" Nothing to do.
-	endif " }}}
-
-	" delimitMate_smart_quotes {{{
-	if !exists("b:delimitMate_smart_quotes") && !exists("g:delimitMate_smart_quotes")
-		let b:delimitMate_smart_quotes = 1
-	elseif !exists("b:delimitMate_smart_quotes") && exists("g:delimitMate_smart_quotes")
-		let b:delimitMate_smart_quotes = split(g:delimitMate_smart_quotes)
-	else
-		" Nothing to do.
-	endif " }}}
-
-	" delimitMate_apostrophes {{{
-	if !exists("b:delimitMate_apostrophes") && !exists("g:delimitMate_apostrophes")
-		"let s:apostrophes = split("n't:'s:'re:'m:'d:'ll:'ve:s'",':')
-		let s:apostrophes = []
-	elseif !exists("b:delimitMate_apostrophes") && exists("g:delimitMate_apostrophes")
-		let s:apostrophes = split(g:delimitMate_apostrophes)
-	else
-		let s:apostrophes = split(b:delimitMate_apostrophes)
-	endif
-		let b:delimitMate_apostrophes_list = s:apostrophes " }}}
-
-	" delimitMate_tab2exit {{{
-	if !exists("b:delimitMate_tab2exit") && !exists("g:delimitMate_tab2exit")
-		let b:delimitMate_tab2exit = 1
-	elseif !exists("b:delimitMate_tab2exit") && exists("g:delimitMate_tab2exit")
-		let b:delimitMate_tab2exit = g:delimitMate_tab2exit
-	else
-		" Nothing to do.
-	endif " }}}
-
-	let b:delimitMate_matchpairs_list = split(s:matchpairs_temp, ',')
-	let b:delimitMate_left_delims = split(s:matchpairs_temp, ':.,\=')
-	let b:delimitMate_right_delims = split(s:matchpairs_temp, ',\=.:')
-	let s:VMapMsg = "delimitMate: delimitMate is disabled on blockwise visual mode."
-
-	call s:UnMap()
-	if b:delimitMate_autoclose
-		call s:AutoClose()
-	else
-		call s:NoAutoClose()
-	endif
-	call s:VisualMaps()
-	call s:ExtraMappings()
-
-endfunction "}}} Init()
-"}}}
-
-" Utilities: {{{
-function! s:ValidMatchpairs(str) "{{{
-	if a:str !~ '^.:.\(,.:.\)*$'
-		return 0
-	endif
-	for pair in split(a:str,',')
-		if strpart(pair, 0, 1) == strpart(pair, 2, 1) || strlen(pair) != 3
-			return 0
-		endif
-	endfor
-	return 1
-endfunction "}}}
-
-function! DelimitMate_ShouldJump() "{{{
-	let char = getline('.')[col('.') - 1]
-	for pair in b:delimitMate_matchpairs_list
-		if  char == split( pair, ':' )[1]
-			" Same character on the rigth, jump over it.
-			return 1
-		endif
-	endfor
-	for quote in b:delimitMate_quotes_list
-		if char == quote
-			" Same character on the rigth, jump over it.
-			return 1
-		endif
-	endfor
-	return 0
-endfunction "}}}
-
-function! s:IsBlockVisual() " {{{
-	if visualmode() == "<C-V>"
-		return 1
-	endif
-	" Store unnamed register values for later use in s:RestoreRegister().
-	let s:save_reg = getreg('"')
-	let s:save_reg_mode = getregtype('"')
-
-	if len(getline('.')) == 0
-		" This for proper wrap of empty lines.
-		let @" = "\n"
-	endif
-	return 0
-endfunction " }}}
-
-function! s:IsEmptyPair(str) "{{{
-	for pair in b:delimitMate_matchpairs_list
-		if a:str == join( split( pair, ':' ),'' )
-			return 1
-		endif
-	endfor
-	for quote in b:delimitMate_quotes_list
-		if a:str == quote . quote
-			return 1
-		endif
-	endfor
-	return 0
-endfunction "}}}
-
-function! DelimitMate_WithinEmptyPair() "{{{
-	let cur = strpart( getline('.'), col('.')-2, 2 )
-	return s:IsEmptyPair( cur )
-endfunction "}}}
-
-function! s:WriteBefore(str) "{{{
-	let len = len(a:str)
-	let line = getline('.')
-	let col = col('.')-2
-	if col < 0
-		call setline('.',line[(col+len+1):])
-	else
-		call setline('.',line[:(col)].line[(col+len+1):])
-	endif
-	return a:str
-endfunction " }}}
-
-function! s:WriteAfter(str) "{{{
-	let len = len(a:str)
-	let line = getline('.')
-	let col = col('.')-2
-	if (col) < 0
-		call setline('.',a:str.line)
-	else
-		call setline('.',line[:(col)].a:str.line[(col+len):])
-	endif
-	return ''
-endfunction " }}}
-
-function! s:RestoreRegister() " {{{
-	" Restore unnamed register values store in s:IsBlockVisual().
-	call setreg('"', s:save_reg, s:save_reg_mode)
-	echo ""
-endfunction " }}}
-" }}}
-
-" Doers: {{{
-function! s:JumpIn(char) " {{{
-  let line = getline('.')
-  let col = col('.')-2
-  if (col) < 0
-    call setline('.',a:char.line)
-  else
-    "echom string(col).':'.line[:(col)].'|'.line[(col+1):]
-    call setline('.',line[:(col)].a:char.line[(col+1):])
-  endif
-  return ''
-endfunction " }}}
-
-function! s:JumpOut(char) "{{{
-	let line = getline('.')
-	let col = col('.')-2
-	if line[col+1] == a:char
-		call setline('.',line[:(col)].line[(col+2):])
-	endif
-	return a:char
-endfunction " }}}
-
-function! DelimitMate_JumpAny() " {{{
-	let nchar = getline('.')[col('.')-1]
-	return nchar . "\<Del>"
-endfunction " DelimitMate_JumpAny() }}}
-
-function! s:SkipDelim(char) "{{{
-	let cur = strpart( getline('.'), col('.')-2, 3 )
-	if cur[0] == "\\"
-		" Escaped character
-		return a:char
-	elseif cur[1] == a:char
-		" Exit pair
-		return s:WriteBefore(a:char)
-	"elseif cur[1] == ' ' && cur[2] == a:char
-		"" I'm leaving this in case someone likes it. Jump an space and delimiter.
-		"return "\<Right>\<Right>"
-	elseif s:IsEmptyPair( cur[0] . a:char )
-		" Add closing delimiter and jump back to the middle.
-		return s:WriteAfter(a:char)
-	else
-		" Nothing special here, return the same character.
-		return a:char
-	endif
-endfunction "}}}
-
-function! s:QuoteDelim(char) "{{{
-	let line = getline('.')
-	let col = col('.') - 2
-	if line[col] == "\\"
-		" Seems like a escaped character, insert one quotation mark.
-		return a:char
-	elseif line[col + 1] == a:char
-		" Get out of the string.
-		return s:WriteBefore(a:char)
-	elseif (line[col] =~ '[a-zA-Z0-9]' && a:char == "'") ||
-				\(line[col] =~ '[a-zA-Z0-9]' && b:delimitMate_smart_quotes)
-		" Seems like an apostrophe or a closing, insert a single quote.
-		return a:char
-	elseif (line[col] == a:char && line[col + 1 ] != a:char) && b:delimitMate_smart_quotes
-		" Seems like we have an unbalanced quote, insert one quotation mark and jump to the middle.
-		return s:WriteAfter(a:char)
-	else
-		" Insert a pair and jump to the middle.
-		call s:WriteAfter(a:char)
-		return a:char
-	endif
-endfunction "}}}
-
-function! s:MapMsg(msg) "{{{
-	redraw
-	echomsg a:msg
-	return ""
-endfunction "}}}
-"}}}
-
-" Mappings: {{{
-function! s:NoAutoClose() "{{{
-	" inoremap <buffer> ) <C-R>=<SID>SkipDelim('\)')<CR>
-	for delim in b:delimitMate_right_delims + b:delimitMate_quotes_list
-		exec 'inoremap <buffer> ' . delim . ' <C-R>=<SID>SkipDelim("' . escape(delim,'"') . '")<CR>'
-	endfor
-endfunction "}}}
-
-function! s:AutoClose() "{{{
-	" Add matching pair and jump to the midle:
-	" inoremap <buffer> ( ()<Left>
-	let i = 0
-	while i < len(b:delimitMate_matchpairs_list)
-		let ld = b:delimitMate_left_delims[i]
-		let rd = b:delimitMate_right_delims[i]
-		exec 'inoremap <buffer> ' . ld . ' ' . ld . '<C-R>=<SID>JumpIn("' . rd . '")<CR>'
-		let i += 1
-	endwhile
-
-	" Add matching quote and jump to the midle, or exit if inside a pair of matching quotes:
-	" inoremap <buffer> " <C-R>=<SID>QuoteDelim("\"")<CR>
-	for delim in b:delimitMate_quotes_list
-		exec 'inoremap <buffer> ' . delim . ' <C-R>=<SID>QuoteDelim("\' . delim . '")<CR>'
-	endfor
-
-	" Exit from inside the matching pair:
-	for delim in b:delimitMate_right_delims
-		exec 'inoremap <buffer> ' . delim . ' <C-R>=<SID>JumpOut("\' . delim . '")<CR>'
-	endfor
-
-	" Try to fix the use of apostrophes (de-activated by default):
-	" inoremap <buffer> n't n't
-	for map in b:delimitMate_apostrophes_list
-		exec "inoremap <buffer> " . map . " " . map
-	endfor
-
-endfunction "}}}
-
-function! s:VisualMaps() " {{{
-	let vleader = b:delimitMate_visual_leader
-	" Wrap the selection with matching pairs, but do nothing if blockwise visual mode is active:
-	let i = 0
-	while i < len(b:delimitMate_matchpairs_list)
-		" Map left delimiter:
-		let ld = b:delimitMate_left_delims[i]
-		let rd = b:delimitMate_right_delims[i]
-		exec 'vnoremap <buffer> <expr> ' . vleader . ld . ' <SID>IsBlockVisual() ? <SID>MapMsg("' . s:VMapMsg . '") : "s' . ld . '\<C-R>\"' . rd . '\<Esc>:call <SID>RestoreRegister()<CR>"'
-
-		" Map right delimiter:
-		exec 'vnoremap <buffer> <expr> ' . vleader . rd . ' <SID>IsBlockVisual() ? <SID>MapMsg("' . s:VMapMsg . '") : "s' . ld . '\<C-R>\"' . rd . '\<Esc>:call <SID>RestoreRegister()<CR>"'
-		let i += 1
-	endwhile
-
-	" Wrap the selection with matching quotes, but do nothing if blockwise visual mode is active:
-	for quote in b:delimitMate_quotes_list
-		" vnoremap <buffer> <expr> \' <SID>IsBlockVisual() ? <SID>MapMsg("Message") : "s'\<C-R>\"'\<Esc>:call <SID>RestoreRegister()<CR>"
-		exec 'vnoremap <buffer> <expr> ' . vleader . quote . ' <SID>IsBlockVisual() ? <SID>MapMsg("' . s:VMapMsg . '") : "s' . escape(quote,'"') .'\<C-R>\"' . escape(quote,'"') . '\<Esc>:call <SID>RestoreRegister()<CR>"'
-	endfor
-endfunction "}}}
-
-function! DelimitMate_ExpandReturn() "{{{
-	" Expand:
-	return "\<Esc>a\<CR>x\<CR>\<Esc>k$\"_xa"
-endfunction "}}}
-
-function! DelimitMate_ExpandSpace() "{{{
-	" Expand:
-	return s:WriteAfter(' ') . "\<Space>"
-endfunction "}}}
-
-function! s:ExtraMappings() "{{{
-	" If pair is empty, delete both delimiters:
-	inoremap <buffer> <expr> <BS> DelimitMate_WithinEmptyPair() ? "\<Right>\<BS>\<BS>" : "\<BS>"
-
-	" If pair is empty, delete closing delimiter:
-	inoremap <buffer> <expr> <S-BS> DelimitMate_WithinEmptyPair() ? "\<Del>" : "\<S-BS>"
-
-	" Expand return if inside an empty pair:
-	if b:delimitMate_expand_cr != 0
-		inoremap <buffer> <expr> <CR> DelimitMate_WithinEmptyPair() ?
-					\ DelimitMate_ExpandReturn() : "\<CR>"
-	endif
-
-	" Expand space if inside an empty pair:
-	if b:delimitMate_expand_space != 0
-		inoremap <buffer> <expr> <Space> DelimitMate_WithinEmptyPair() ?
-					\ DelimitMate_ExpandSpace() : "\<Space>"
-	endif
-
-	" Jump out ot any empty pair:
-	if b:delimitMate_tab2exit
-		inoremap <buffer> <expr> <S-Tab> DelimitMate_ShouldJump() ? DelimitMate_JumpAny() : "\<S-Tab>"
-	endif
-endfunction "}}}
 "}}}
 
 " Tools: {{{
-function! s:TestMappings() "{{{
-	if b:delimitMate_autoclose
-		 exec "normal i* AUTOCLOSE:\<CR>"
-		for i in range(len(b:delimitMate_left_delims))
-			exec "normal GGAOpen & close: " . b:delimitMate_left_delims[i]. "|"
-			exec "normal A\<CR>Delete: " . b:delimitMate_left_delims[i] . "\<BS>|"
-			exec "normal A\<CR>Exit: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "|"
-			exec "normal A\<CR>Space: " . b:delimitMate_left_delims[i] . " |"
-			exec "normal GGA\<CR>Visual-L: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_left_delims[i]
-			exec "normal A\<CR>Visual-R: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_right_delims[i]
-			exec "normal A\<CR>Car return: " . b:delimitMate_left_delims[i] . "\<CR>|\<Esc>GGA\<CR>\<CR>"
-		endfor
-		for i in range(len(b:delimitMate_quotes_list))
-			exec "normal GGAOpen & close: " . b:delimitMate_quotes_list[i]	. "|"
-			exec "normal A\<CR>Delete: "
-			exec "normal A". b:delimitMate_quotes_list[i]
-			exec "normal a\<BS>|"
-			exec "normal A\<CR>Exit: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "|"
-			exec "normal A\<CR>Space: " . b:delimitMate_quotes_list[i] . " |"
-			exec "normal GGA\<CR>Visual: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_quotes_list[i]
-			exec "normal A\<CR>Car return: " . b:delimitMate_quotes_list[i] . "\<CR>|\<Esc>GGA\<CR>\<CR>"
-		endfor
-	else
-		exec "normal i* NO AUTOCLOSE:\<CR>"
-		for i in range(len(b:delimitMate_left_delims))
-			exec "normal GGAOpen & close: " . b:delimitMate_left_delims[i]	. b:delimitMate_right_delims[i] . "|"
-			exec "normal A\<CR>Delete: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "\<BS>|"
-			exec "normal A\<CR>Exit: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . b:delimitMate_right_delims[i] . "|"
-			exec "normal A\<CR>Space: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . " |"
-			exec "normal GGA\<CR>Visual-L: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_left_delims[i]
-			exec "normal A\<CR>Visual-R: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_right_delims[i]
-			exec "normal A\<CR>Car return: " . b:delimitMate_left_delims[i] . b:delimitMate_right_delims[i] . "\<CR>|\<Esc>GGA\<CR>\<CR>"
-		endfor
-		for i in range(len(b:delimitMate_quotes_list))
-			exec "normal GGAOpen & close: " . b:delimitMate_quotes_list[i]	. b:delimitMate_quotes_list[i] . "|"
-			exec "normal A\<CR>Delete: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "\<BS>|"
-			exec "normal A\<CR>Exit: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "|"
-			exec "normal A\<CR>Space: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . " |"
-			exec "normal GGA\<CR>Visual: v\<Esc>v" . b:delimitMate_visual_leader . b:delimitMate_quotes_list[i]
-			exec "normal A\<CR>Car return: " . b:delimitMate_quotes_list[i] . b:delimitMate_quotes_list[i] . "\<CR>|\<Esc>GGA\<CR>\<CR>"
-		endfor
-	endif
-	exec "normal \<Esc>i"
-endfunction "}}}
-
-function! s:SwitchAutoclose() "{{{
-	if !exists("g:delimitMate_autoclose")
-		let g:delimitMate_autoclose = 1
-	elseif g:delimitMate_autoclose == 1
-		let g:delimitMate_autoclose = 0
-	else
-		let g:delimitMate_autoclose = 1
-	endif
-	DelimitMateReload
-endfunction "}}}
-
-function! s:UnMap() " {{{
-	" No Autoclose Mappings:
-	for char in b:delimitMate_right_delims + b:delimitMate_quotes_list
-		if maparg(char,"i") =~? 'SkipDelim'
-			exec 'silent! iunmap <buffer> ' . char
-			"echomsg 'iunmap <buffer> ' . char
-		endif
-	endfor
-
-	" Autoclose Mappings:
-	let i = 0
-	let l = len(b:delimitMate_matchpairs_list)
-	while i < l
-		if maparg(b:delimitMate_left_delims[i],"i") =~? 'JumpIn'
-			exec 'silent! iunmap <buffer> ' . b:delimitMate_left_delims[i]
-			"echomsg 'iunmap <buffer> ' . b:delimitMate_left_delims[i]
-		endif
-		let i += 1
-	endwhile
-	for char in b:delimitMate_quotes_list
-		if maparg(char, "i") =~? 'QuoteDelim'
-			exec 'silent! iunmap <buffer> ' . char
-			"echomsg 'iunmap <buffer> ' . char
-		endif
-	endfor
-	for char in b:delimitMate_right_delims
-		if maparg(char, "i") =~? 'JumpOut'
-			exec 'silent! iunmap <buffer> ' . char
-			"echomsg 'iunmap <buffer> ' . char
-		endif
-	endfor
-	for map in b:delimitMate_apostrophes_list
-		exec "silent! iunmap <buffer> " . map
-	endfor
-
-	" Visual Mappings:
-	for char in b:delimitMate_right_delims + b:delimitMate_left_delims + b:delimitMate_quotes_list
-		if maparg(b:delimitMate_visual_leader . char,"v") =~? 'IsBlock'
-			exec 'silent! vunmap <buffer> ' . b:delimitMate_visual_leader . char
-			"echomsg 'vunmap <buffer> ' . b:delimitMate_visual_leader . char
-		endif
-	endfor
-
-	" Expansion Mappings:
-	if maparg('<BS>', "i") =~? 'WithinEmptyPair'
-		silent! iunmap <buffer> <BS>
-		"echomsg "silent! iunmap <buffer> <BS>"
-	endif
-	if maparg('<S-BS>', "i") =~? 'WithinEmptyPair'
-		silent! iunmap <buffer> <BS>
-		"echomsg "silent! iunmap <buffer> <BS>"
-	endif
-	if maparg('<CR>',"i") =~? 'DelimitMate_ExpandReturn'
-		silent! iunmap <buffer> <CR>
-		"echomsg "silent! iunmap <buffer> <CR>"
-	endif
-	if maparg('<Space>',"i") =~? 'DelimitMate_ExpandSpace'
-		silent! iunmap <buffer> <Space>
-		"echomsg "silent! iunmap <buffer> <Space>"
-	endif
-	if maparg('<S-Tab>', "i") =~? 'ShouldJump'
-		silent! iunmap <buffer> <S-Tab>
-		"echomsg "silent! iunmap <buffer> <S-Tab>"
-	endif
-endfunction " }}} s:ExtraMappings()
-
 function! s:TestMappingsDo() "{{{
-	"DelimitMateReload
 	if !exists("g:delimitMate_testing")
-		"call s:DelimitMateDo()
-		call s:TestMappings()
+		silent call delimitMate#TestMappings()
 	else
-		call s:SwitchAutoclose()
-		call s:TestMappings()
-		exec "normal i\<CR>"
-		call s:SwitchAutoclose()
-		call s:TestMappings()
+		let temp_varsDM = [b:delimitMate_expand_space, b:delimitMate_expand_cr, b:delimitMate_autoclose]
+		for i in [0,1]
+			let b:delimitMate_expand_space = i
+			let b:delimitMate_expand_cr = i
+			for a in [0,1]
+				let b:delimitMate_autoclose = a
+				call delimitMate#Init()
+				call delimitMate#TestMappings()
+				exec "normal i\<CR>"
+			endfor
+		endfor
+		let b:delimitMate_expand_space = temp_varsDM[0]
+		let b:delimitMate_expand_cr = temp_varsDM[1]
+		let b:delimitMate_autoclose = temp_varsDM[2]
+		unlet temp_varsDM
 	endif
+	normal gg
 endfunction "}}}
 
 function! s:DelimitMateDo() "{{{
@@ -592,11 +59,8 @@ function! s:DelimitMateDo() "{{{
 		" Check if this file type is excluded:
 		for ft in split(g:delimitMate_excluded_ft,',')
 			if ft ==? &filetype
-				if !exists("b:delimitMate_quotes_list")
-					return 1
-				endif
 				"echomsg "excluded"
-				call s:UnMap()
+				call delimitMate#UnMap()
 				return 1
 			endif
 		endfor
@@ -604,12 +68,24 @@ function! s:DelimitMateDo() "{{{
 	try
 		"echomsg "included"
 		let save_cpo = &cpo
+		let save_keymap = &keymap
+		set keymap=
 		set cpo&vim
-		call s:Init()
+		call delimitMate#Init()
 	finally
 		let &cpo = save_cpo
+		let &keymap = save_keymap
 	endtry
 endfunction "}}}
+
+function! s:DelimitMateSwitch() "{{{
+	if b:delimitMate_enabled
+		call delimitMate#UnMap()
+	else
+		call delimitMate#Init()
+	endif
+endfunction "}}}
+
 "}}}
 
 " Commands: {{{
@@ -621,6 +97,9 @@ command! DelimitMateReload call s:DelimitMateDo()
 " Quick test:
 command! DelimitMateTest call s:TestMappingsDo()
 
+" Switch On/Off:
+command! DelimitMateSwitch call s:DelimitMateSwitch()
+
 " Run on file type events.
 "autocmd VimEnter * autocmd FileType * call <SID>DelimitMateDo()
 autocmd FileType * call <SID>DelimitMateDo()
@@ -628,7 +107,12 @@ autocmd FileType * call <SID>DelimitMateDo()
 " Run on new buffers.
 autocmd BufNewFile,BufRead,BufEnter * if !exists("b:loaded_delimitMate") | call <SID>DelimitMateDo() | endif
 
+" Flush the char buffer:
+autocmd InsertEnter * call delimitMate#FlushBuffer()
+autocmd BufEnter * if mode() == 'i' | call delimitMate#FlushBuffer() | endif
+
 "function! s:GetSynRegion () | echo synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name') | endfunction
+
 "}}}
 
 " GetLatestVimScripts: 2754 1 :AutoInstall: delimitMate.vim