From 16a35eefab415aba40c1c08c31f61ee756ee2a3b Mon Sep 17 00:00:00 2001 From: Israel Chauca Fuentes Date: Mon, 22 Jul 2013 13:29:36 -0400 Subject: [PATCH] Update version and doc. --- autoload/delimitMate.vim | 4 ++-- doc/delimitMate.txt | 48 +++++++++++++++------------------------- plugin/delimitMate.vim | 6 ++--- 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim index 4ea5dec..88afe50 100644 --- a/autoload/delimitMate.vim +++ b/autoload/delimitMate.vim @@ -1,6 +1,6 @@ " File: autoload/delimitMate.vim -" Version: 2.6 -" Modified: 2011-01-14 +" Version: 2.7 +" Modified: 2013-07-15 " Description: This plugin provides auto-completion for quotes, parens, etc. " Maintainer: Israel Chauca F. " Manual: Read ":help delimitMate". diff --git a/doc/delimitMate.txt b/doc/delimitMate.txt index 5c91316..437c546 100644 --- a/doc/delimitMate.txt +++ b/doc/delimitMate.txt @@ -1,4 +1,4 @@ -*delimitMate.txt* Trying to keep those beasts at bay! v2.6 *delimitMate* +*delimitMate.txt* Trying to keep those beasts at bay! v2.7 *delimitMate* @@ -47,16 +47,12 @@ 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 break undo, redo or history. +variables, or on a FileType basis, using autocommands. NOTE 1: If you have any trouble with this plugin, please run |:DelimitMateTest| in a new buffer to see what is not working. -NOTE 2: |'timeout'| needs to be set when working in the terminal, otherwise you -might find weird behaviour with mappings including or arrow keys. - -NOTE 3: Abbreviations set with |:iabbrev| will not be expanded by delimiters +NOTE 2: Abbreviations set with |:iabbrev| will not be expanded by delimiters used on delimitMate, you should use (read |i_CTRL-]|) to expand them on the go. @@ -123,7 +119,7 @@ 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 +:autocmd, use global variables to set options for all buffers. Read more in |g:var| and |b:var|. ------------------------------------------------------------------------------ @@ -602,26 +598,12 @@ In order to make custom mappings easier and prevent overwritting existing ones, delimitMate uses the || + |hasmapto()| (|usr_41.txt|) construct for its mappings. -These are the default mappings: +These are the default mappings for the extra features: is mapped to delimitMateBS is mapped to delimitMateS-BS is mapped to delimitMateS-Tab g is mapped to delimitMateJumpMany - is mapped to delimitMateDel - is mapped to delimitMateEsc - is mapped to delimitMateLeft - is mapped to delimitMateRight - is mapped to delimitMateHome - is mapped to delimitMateEnd - is mapped to delimitMateUp - is mapped to delimitMateDown - is mapped to delimitMatePageUp - is mapped to delimitMatePageDown - is mapped to delimitMateS-Down - is mapped to delimitMateS-Up - is mapped to delimitMateMLeftMouse - is mapped to delimitMateMRightMouse The rest of the mappings correspond to parens, quotes, CR, Space, etc. and they depend on the values of the delimitMate options, they have the following form: @@ -635,9 +617,9 @@ e.g.: for "(": e.g.: If you have expansion enabled, you might want to skip it on pop-up menus: - imap pumvisible() ? - \"\" : - \ "delimitMateCR" + imap pumvisible() + \ ? "\" + \ : "delimitMateCR" ============================================================================== @@ -661,13 +643,13 @@ Returns 1 if there is a closing delimiter or a quote to the right of the cursor, 0 otherwise. ------------------------------------------------------------------------------ -delimitMate#JumpAny(key) *delimitMate#JumpAny()* +delimitMate#JumpAny() *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 =delimitMate#JumpAny("\") + inoremap =delimitMate#JumpAny() < ============================================================================== @@ -726,8 +708,14 @@ This script was inspired by the auto-completion of delimiters on TextMate. Version Date Release notes ~ |---------|------------|-----------------------------------------------------| - 2.6 2011-01-14 * Current release: - - Add smart_matchpairs feature. + 2.7 2013-07-15 * Current release: + - Lots of bug fixes. + - Add delimitMate_offByDefault. + - Add delimitMate_eol_marker. + - Reduce the number of mappings. + - Stop using setline(). +|---------|------------|-----------------------------------------------------| + 2.6 2011-01-14 * - Add smart_matchpairs feature. - Add mapping to jump over contiguous delimiters. - Fix behaviour of b:loaded_delimitMate. |---------|------------|-----------------------------------------------------| diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim index b1b8087..c832615 100644 --- a/plugin/delimitMate.vim +++ b/plugin/delimitMate.vim @@ -1,6 +1,6 @@ " File: plugin/delimitMate.vim -" Version: 2.6 -" Modified: 2011-01-14 +" Version: 2.7 +" Modified: 2013-07-15 " Description: This plugin provides auto-completion for quotes, parens, etc. " Maintainer: Israel Chauca F. " Manual: Read ":help delimitMate". @@ -29,7 +29,7 @@ if v:version < 700 endif let s:loaded_delimitMate = 1 -let delimitMate_version = "2.6" +let delimitMate_version = "2.7" function! s:option_init(name, default) "{{{ let b = exists("b:delimitMate_" . a:name)