Bump version to 1.3.0

eg ```|``` {{|}} [[|]]

README.md

@@ -83,7 +83,18 @@ Features
             '''
 
         output:
-            '''
+            '''|'''
+
+*   Delete Repeated Pairs in one time
+
+        input: """|""" (press <BS> at |)
+        output: |
+
+        input: {{|}} (press <BS> at |)
+        output: |
+
+        input: [[[[[[|]]]]]] (press <BS> at |)
+        output: |
 
 *  Fly Mode
 
@@ -154,6 +165,12 @@ Options
 
         Default: {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`'}
 
+*   b:AutoPairs
+
+        Default: g:AutoPairs
+
+        Buffer level pairs set.
+
 *   g:AutoPairsShortcutToggle
 
         Default: '<M-p>'
@@ -214,6 +231,16 @@ Options
 
         Work with FlyMode, insert the key at the Fly Mode jumped postion
 
+Buffer Level Pairs Setting
+--------------------------
+
+Set b:AutoPairs before BufEnter
+
+eg:
+
+    " When the filetype is FILETYPE then make AutoPairs only match for parenthesis
+    au Filetype FILETYPE let b:AutoPairs = {"(": ")"}
+
 TroubleShooting
 ---------------
     The script will remap keys ([{'"}]) <BS>,
@@ -242,7 +269,35 @@ Compatible with Vimwiki - [issue #19](https://github.com/jiangmiao/auto-pairs/is
 
     Description: When works with vimwiki `<CR>` will output `<SNR>xx_CR()`
     Reason: vimwiki uses `<expr>` on mapping `<CR>` that auto-pairs cannot expanding.
-    Solution: add `let g:AutoPairsMapCR = 0` to .vimrc to disable `<CR>` mapping.
+    Solution A: Add
+
+        " Copy from vimwiki.vim s:CR function for CR remapping
+        function! VimwikiCR()
+          let res = vimwiki#lst#kbd_cr()
+          if res == "\<CR>" && g:vimwiki_table_mappings
+            let res = vimwiki#tbl#kbd_cr()
+          endif
+          return res
+        endfunction
+        autocmd filetype vimwiki inoremap <buffer> <silent> <CR> <C-R>=VimwikiCR()<CR><C-R>=AutoPairsReturn()<CR>
+
+    to .vimrc, it will make vimwiki and auto-pairs 'Return' feature works together.
+
+    Solution B: add `let g:AutoPairsMapCR = 0` to .vimrc to disable `<CR>` mapping.
+
+Compatible with viki - [issue #25](https://github.com/jiangmiao/auto-pairs/issues/25)
+
+    Description: When works with viki `<CR>` will output viki#ExprMarkInexistentInElement('ParagraphVisible','<CR>')
+    Reason: viki uses `<expr>` on mapping `<CR>` that auto-pairs cannot expanding.
+    Solution A: Add
+
+        autocmd filetype viki inoremap <buffer> <silent> <CR> <C-R>=viki#ExprMarkInexistentInElement('ParagraphVisible',"\n")<CR><C-R>=AutoPairsReturn()<CR>`
+
+    to .vimrc, it will make viki and auto-pairs works together.
+
+    Solution B: add `let g:AutoPairsMapCR = 0` to .vimrc to disable `<CR>` mapping.
+
+    Remarks: Solution A need NOT add `let g:AutoPairsMapCR = 0` to .vimrc, if Solution A still cannot work, then have to use Solution B to disable auto-pairs `<CR>`.
 
 Breaks '.' - [issue #3](https://github.com/jiangmiao/auto-pairs/issues/3)
 

plugin/auto-pairs.vim

@@ -1,8 +1,8 @@
 " Insert or delete brackets, parens, quotes in pairs.
 " Maintainer:	JiangMiao <jiangfriend@gmail.com>
 " Contributor: camthompson
-" Last Change:  2012-08-17
-" Version: 1.2.4
+" Last Change:  2013-02-16
+" Version: 1.3.0
 " Homepage: http://www.vim.org/scripts/script.php?script_id=3599
 " Repository: https://github.com/jiangmiao/auto-pairs
 
@@ -19,9 +19,6 @@ if !exists('g:AutoPairsParens')
   let g:AutoPairsParens = {'(':')', '[':']', '{':'}'}
 end
 
-let g:AutoExtraPairs = copy(g:AutoPairs)
-let g:AutoExtraPairs['<'] = '>'
-
 if !exists('g:AutoPairsMapBS')
   let g:AutoPairsMapBS = 1
 end
@@ -72,9 +69,12 @@ function! AutoPairsInsert(key)
   end
 
   let line = getline('.')
-  let prev_char = line[col('.')-2]
-  let current_char = line[col('.')-1]
-  let next_char = line[col('.')]
+  let pos = col('.') - 1
+  let next_chars = split(strpart(line, pos), '\zs')
+  let current_char = get(next_chars, 0, '')
+  let next_char = get(next_chars, 1, '')
+  let prev_chars = split(strpart(line, 0, pos), '\zs')
+  let prev_char = get(prev_chars, -1, '')
 
   let eol = 0
   if col('$') -  col('.') <= 1
@@ -87,7 +87,7 @@ function! AutoPairsInsert(key)
   end
 
   " The key is difference open-pair, then it means only for ) ] } by default
-  if !has_key(g:AutoPairs, a:key)
+  if !has_key(b:AutoPairs, a:key)
     let b:autopairs_saved_pair = [a:key, getpos('.')]
 
     " Skip the character if current character is the same as input
@@ -113,7 +113,7 @@ function! AutoPairsInsert(key)
     endif
 
     " Fly Mode, and the key is closed-pairs, search closed-pair and jump
-    if g:AutoPairsFlyMode && has_key(g:AutoPairsClosedPairs, a:key)
+    if g:AutoPairsFlyMode && has_key(b:AutoPairsClosedPairs, a:key)
       if search(a:key, 'W')
         return "\<Right>"
       endif
@@ -124,7 +124,7 @@ function! AutoPairsInsert(key)
   end
 
   let open = a:key
-  let close = g:AutoPairs[open]
+  let close = b:AutoPairs[open]
 
   if current_char == close && open == close
     return "\<Right>"
@@ -142,7 +142,7 @@ function! AutoPairsInsert(key)
     let pprev_char = line[col('.')-3]
     if pprev_char == open && prev_char == open
       " Double pair found
-      return a:key
+      return repeat(a:key, 4) . repeat("\<LEFT>", 3)
     end
   end
 
@@ -150,26 +150,55 @@ function! AutoPairsInsert(key)
 endfunction
 
 function! AutoPairsDelete()
+  if !b:autopairs_enabled
+    return "\<BS>"
+  end
+
   let line = getline('.')
-  let current_char = line[col('.')-1]
-  let prev_char = line[col('.')-2]
-  let pprev_char = line[col('.')-3]
+  let pos = col('.') - 1
+  let current_char = get(split(strpart(line, pos), '\zs'), 0, '')
+  let prev_chars = split(strpart(line, 0, pos), '\zs')
+  let prev_char = get(prev_chars, -1, '')
+  let pprev_char = get(prev_chars, -2, '')
 
   if pprev_char == '\'
     return "\<BS>"
   end
 
   " Delete last two spaces in parens, work with MapSpace
-  if has_key(g:AutoPairs, pprev_char) && prev_char == ' ' && current_char == ' '
+  if has_key(b:AutoPairs, pprev_char) && prev_char == ' ' && current_char == ' '
     return "\<BS>\<DEL>"
   endif
 
-  if has_key(g:AutoPairs, prev_char) 
-    let close = g:AutoPairs[prev_char]
+  " Delete Repeated Pair eg: '''|''' [[|]] {{|}}
+  if has_key(b:AutoPairs, prev_char)
+    let times = 0
+    let p = -1
+    while get(prev_chars, p, '') == prev_char
+      let p = p - 1
+      let times = times + 1
+    endwhile
+
+    let close = b:AutoPairs[prev_char]
+    let left = repeat(prev_char, times)
+    let right = repeat(close, times)
+
+    let before = strpart(line, pos-times, times)
+    let after  = strpart(line, pos, times)
+    if left == before && right == after
+      return repeat("\<BS>\<DEL>", times)
+    end
+  end
+
+
+  if has_key(b:AutoPairs, prev_char) 
+    let close = b:AutoPairs[prev_char]
     if match(line,'^\s*'.close, col('.')-1) != -1
+      " Delete (|___)
       let space = matchstr(line, '^\s*', col('.')-1)
       return "\<BS>". repeat("\<DEL>", len(space)+1)
-    else
+    elseif match(line, '^\s*$', col('.')-1) != -1
+      " Delete (|__\n___)
       let nline = getline(line('.')+1)
       if nline =~ '^\s*'.close
         let space = matchstr(nline, '^\s*')
@@ -225,10 +254,10 @@ function! AutoPairsFastWrap()
     let next_char = line[col('.')-1]
   end
 
-  if has_key(g:AutoPairs, next_char)
+  if has_key(b:AutoPairs, next_char)
     let followed_open_pair = next_char
     let inputed_close_pair = current_char
-    let followed_close_pair = g:AutoPairs[next_char]
+    let followed_close_pair = b:AutoPairs[next_char]
     if followed_close_pair != followed_open_pair
       " TODO replace system searchpair to skip string and nested pair.
       " eg: (|){"hello}world"} will transform to ({"hello})world"}
@@ -261,15 +290,28 @@ function! AutoPairsToggle()
 endfunction
 
 function! AutoPairsReturn()
+  if b:autopairs_enabled == 0
+    return ''
+  end
   let line = getline('.')
   let pline = getline(line('.')-1)
   let prev_char = pline[strlen(pline)-1]
   let cmd = ''
   let cur_char = line[col('.')-1]
-  if has_key(g:AutoPairs, prev_char) && g:AutoPairs[prev_char] == cur_char
+  if has_key(b:AutoPairs, prev_char) && b:AutoPairs[prev_char] == cur_char
     if g:AutoPairsCenterLine && winline() * 3 >= winheight(0) * 2
-      let cmd = " \<C-O>zz\<BS>"
+      " Use \<BS> instead of \<ESC>cl will cause the placeholder deleted
+      " incorrect. because <C-O>zz won't leave Normal mode.
+      " Use \<DEL> is a bit wierd. the character before cursor need to be deleted.
+      let cmd = " \<C-O>zz\<ESC>cl"
     end
+
+    " If equalprg has been set, then avoid call =
+    " https://github.com/jiangmiao/auto-pairs/issues/24
+    if &equalprg != ''
+      return "\<ESC>O".cmd
+    endif
+
     " conflict with javascript and coffee
     " javascript   need   indent new line
     " coffeescript forbid indent new line
@@ -306,14 +348,19 @@ endfunction
 function! AutoPairsInit()
   let b:autopairs_loaded  = 1
   let b:autopairs_enabled = 1
+  let b:AutoPairsClosedPairs = {}
+
+  if !exists('b:AutoPairs')
+    let b:AutoPairs = g:AutoPairs
+  end
 
   " buffer level map pairs keys
-  for [open, close] in items(g:AutoPairs)
+  for [open, close] in items(b:AutoPairs)
     call AutoPairsMap(open)
     if open != close
       call AutoPairsMap(close)
     end
-    let g:AutoPairsClosedPairs[close] = open
+    let b:AutoPairsClosedPairs[close] = open
   endfor
 
   " Still use <buffer> level mapping for <BS> <SPACE>
@@ -355,10 +402,11 @@ function! s:ExpandMap(map)
   return map
 endfunction
 
-function! AutoPairsForceInit()
+function! AutoPairsTryInit()
   if exists('b:autopairs_loaded')
     return
   end
+
   " for auto-pairs starts with 'a', so the priority is higher than supertab and vim-endwise
   "
   " vim-endwise doesn't support <Plug>AutoPairsReturn
@@ -404,4 +452,4 @@ inoremap <silent> <SID>AutoPairsReturn <C-R>=AutoPairsReturn()<CR>
 imap <script> <Plug>AutoPairsReturn <SID>AutoPairsReturn
 
 
-au BufEnter * :call AutoPairsForceInit()
+au BufEnter * :call AutoPairsTryInit()