Version 1.2.2

compatible with vim-endwise, supertab.
Disable Fly mode by default.

Author: jiangmiao

README.md

@@ -80,44 +80,49 @@ Features
 
 *  Fly Mode
 
-		input: if(a[3)
-		output: if(a[3])| (In Fly Mode)
-		output: if(a[3)]) (Without Fly Mode)
+        input: if(a[3)
+        output: if(a[3])| (In Fly Mode)
+        output: if(a[3)]) (Without Fly Mode)
 
-		input: 
-		{
-			hello();|
-			world();
-		}
+        input:
+        {
+            hello();|
+            world();
+        }
 
-		(press } at |)
+        (press } at |)
 
-		output: 
-		{
-			hello();
-			world();
-		}|
+        output:
+        {
+            hello();
+            world();
+        }|
 
-		(then press <M-b> at | to do backinsert)
-		output:
-		{
-			hello();}|
-			world();
-		}
+        (then press <M-b> at | to do backinsert)
+        output:
+        {
+            hello();}|
+            world();
+        }
 
-		See Fly Mode section for details
+        See Fly Mode section for details
 
 Fly Mode
 --------
+Fly Mode will always force closed-pair jumping instead of inserting. only for ")", "}", "]"
+
+If jumps in mistake, could use AutoPairsBackInsert(Default Key: <M-b>) to jump back and insert closed pair.
+
+the most situation maybe want to insert single closed pair in the string, eg ")"
+
+Fly Mode is DISABLED by default.
 
-	Fly Mode will always force closed-pair jumping instead of inserting. only for ")", "}", "]"
-	If jumps in mistake, could use AutoPairsBackInsert(Default Key: <M-b>) to jump back and insert closed pair.
-	the most situation maybe want to insert single closed pair in the string, eg ")"
+add **let g:AutoPairsFlyMode = 1** .vimrc to turn it on
 
-	Default Options:
+Default Options:
 
-		let g:AutoPairs_FlyMode = 1
-		let g:AutoPairsShortcutBackInsert = '<M-b>'
+    let g:AutoPairsFlyMode = 0
+    let g:AutoPairsShortcutBackInsert = '<M-b>'
 
 Shortcuts
 ---------
@@ -128,7 +133,7 @@ Shortcuts
         <M-p> : Toggle Autopairs (g:AutoPairsShortcutToggle)
         <M-e> : Fast Wrap (g:AutoPairsShortcutFastWrap)
         <M-n> : Jump to next closed pair (g:AutoPairsShortcutJump)
-		<M-b> : BackInsert
+        <M-b> : BackInsert
 
     If <M-p> <M-e> or <M-n> conflict with another keys or want to bind to another keys, add
 
@@ -189,17 +194,18 @@ Options
         Map <space> to insert a space after the opening character and before the closing one.
         execute 'inoremap <buffer> <silent> <CR> <C-R>=AutoPairsSpace()<CR>'
 
-*	g:AutoPairsFlyMode
+*   g:AutoPairsFlyMode
 
-		Default : 1
+        Default : 0
 
-		see FlyMode section for details.
+        set it to 1 to enable FlyMode.
+        see FlyMode section for details.
 
-*	g:AutoPairsShortcutBackInsert
+*   g:AutoPairsShortcutBackInsert
 
-		Default : <M-b>
+        Default : <M-b>
 
-		Work with FlyMode, insert the key at the Fly Mode jumped postion
+        Work with FlyMode, insert the key at the Fly Mode jumped postion
 
 TroubleShooting
 ---------------

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-05-14
-" Version: 1.2.0
+" Last Change:  2012-05-16
+" Version: 1.2.2
 " Homepage: http://www.vim.org/scripts/script.php?script_id=3599
 " Repository: https://github.com/jiangmiao/auto-pairs
 
@@ -53,7 +53,7 @@ endif
 " Fly mode will for closed pair to jump to closed pair instead of insert.
 " also support AutoPairsBackInsert to insert pairs where jumped.
 if !exists('g:AutoPairsFlyMode')
-  let g:AutoPairsFlyMode = 1
+  let g:AutoPairsFlyMode = 0
 endif
 
 " Work with Fly Mode, insert pair where jumped
@@ -62,7 +62,7 @@ if !exists('g:AutoPairsShortcutBackInsert')
 endif
 
 
-" Will auto generated {']' => 1, ..., '}' => 1}in initialize.
+" Will auto generated {']' => '[', ..., '}' => '{'}in initialize.
 let g:AutoPairsClosedPairs = {}
 
 
@@ -88,33 +88,35 @@ function! AutoPairsInsert(key)
 
   " The key is difference open-pair, then it means only for ) ] } by default
   if !has_key(g:AutoPairs, a:key)
-    " Skip the character if next character is space
-    if current_char == ' ' && next_char == a:key
-      return "\<Right>\<Right>"
-    end
-
-    " Skip the character if closed pair is next character
-    if current_char == ''
-      let next_lineno = line('.')+1
-      let next_line = getline(nextnonblank(next_lineno))
-      let next_char = matchstr(next_line, '\s*\zs.')
-      if next_char == a:key
-        return "\<ESC>e^a"
-      endif
-    endif
+    let b:autopairs_saved_pair = [a:key, getpos('.')]
 
     " Skip the character if current character is the same as input
     if current_char == a:key
       return "\<Right>"
     end
 
+    if !g:AutoPairsFlyMode
+      " Skip the character if next character is space
+      if current_char == ' ' && next_char == a:key
+        return "\<Right>\<Right>"
+      end
+
+      " Skip the character if closed pair is next character
+      if current_char == ''
+        let next_lineno = line('.')+1
+        let next_line = getline(nextnonblank(next_lineno))
+        let next_char = matchstr(next_line, '\s*\zs.')
+        if next_char == a:key
+          return "\<ESC>e^a"
+        endif
+      endif
+    endif
+
     " Fly Mode, and the key is closed-pairs, search closed-pair and jump
     if g:AutoPairsFlyMode && has_key(g:AutoPairsClosedPairs, a:key)
-      let b:autopairs_saved_pair = [a:key, getpos('.')]
-      " Use 's' flag to overwritee '' or not is a question
-      if(search(a:key, 'W'))
+      if search(a:key, 'W')
         return "\<Right>"
-      end
+      endif
     endif
 
     " Input directly if the key is not an open key
@@ -215,6 +217,7 @@ endfunction
 
 function! AutoPairsMap(key)
   let escaped_key = substitute(a:key, "'", "''", 'g')
+  " use expr will cause search() doesn't work
   execute 'inoremap <buffer> <silent> '.a:key." <C-R>=AutoPairsInsert('".escaped_key."')<CR>"
 endfunction
 
@@ -282,16 +285,17 @@ function! AutoPairsInit()
     if open != close
       call AutoPairsMap(close)
     end
-    let g:AutoPairsClosedPairs[close] = 1
+    let g:AutoPairsClosedPairs[close] = open
   endfor
 
   " Still use <buffer> level mapping for <BS> <SPACE>
   if g:AutoPairsMapBS
-    execute 'inoremap <buffer> <silent> <expr> <BS> AutoPairsDelete()'
+    " Use <C-R> instead of <expr> for issue #14 sometimes press BS output strange words
+    execute 'inoremap <buffer> <silent> <BS> <C-R>=AutoPairsDelete()<CR>'
   end
 
   if g:AutoPairsMapSpace
-    execute 'inoremap <buffer> <silent> <expr> <SPACE> AutoPairsSpace()'
+    execute 'inoremap <buffer> <silent> <SPACE> <C-R>=AutoPairsSpace()<CR>'
   end
 
   if g:AutoPairsShortcutFastWrap != ''
@@ -315,28 +319,52 @@ function! AutoPairsInit()
 
 endfunction
 
+function! s:ExpandMap(map)
+  let map = a:map
+  if map =~ '<Plug>'
+    let map = substitute(map, '\(<Plug>\w\+\)', '\=maparg(submatch(1), "i")', 'g')
+  endif
+  return map
+endfunction
+
 function! AutoPairsForceInit()
   if exists('b:autopairs_loaded')
     return
-  else
-    call AutoPairsInit()
+  end
+  " for auto-pairs starts with 'a', so the priority is higher than supertab and vim-endwise
+  "
+  " vim-endwise doesn't support <Plug>AutoPairsReturn
+  " when use <Plug>AutoPairsReturn will cause <Plug> isn't expanded
+  "
+  " supertab doesn't support <SID>AutoPairsReturn
+  " when use <SID>AutoPairsReturn  will cause Duplicated <CR>
+  "
+  " and when load after vim-endwise will cause unexpected endwise inserted. 
+  " so always load AutoPairs at last
+  
+  " Buffer level keys mapping
+  " comptible with other plugin
+  if g:AutoPairsMapCR
+    let old_cr = maparg('<CR>', 'i')
+    if old_cr == ''
+      let old_cr = '<CR>'
+    else
+      let old_cr = s:ExpandMap(old_cr)
+    endif
+
+    if old_cr !~ 'AutoPairsReturn'
+      " generally speaking, <silent> should not be here because every plugin
+      " has there own silent solution. but for some plugin which wasn't double silent 
+      " mapping, when maparg expand the map will lose the silent info, so <silent> always.
+      execute 'imap <buffer> <silent> <CR> '.old_cr.'<SID>AutoPairsReturn'
+    end
   endif
+  call AutoPairsInit()
 endfunction
 
 " Always silent the command
 inoremap <silent> <SID>AutoPairsReturn <C-R>=AutoPairsReturn()<CR>
+imap <script> <Plug>AutoPairsReturn <SID>AutoPairsReturn
 
-" Global keys mapping
-" comptible with other plugin
-if g:AutoPairsMapCR
-  let old_cr = maparg('<CR>', 'i')
-  if old_cr == ''
-    let old_cr = '<CR>'
-  endif
-
-  if old_cr !~ 'AutoPairsReturn'
-    execute 'imap <CR> '.old_cr.'<SID>AutoPairsReturn'
-  end
-endif
 
 au BufEnter * :call AutoPairsForceInit()