Modification des plugins, utilisant le système de Vim 8

README.md

@@ -1,6 +1,6 @@
 # FichiersVim
 
-Mes fichiers de configuration de Vim
+Mes fichiers de configuration de Vim. **Les extensions ne marchent que sur les versions de Vim ultérieur à la 8.**
 
 ## Installation
 
@@ -15,6 +15,13 @@ Le fichier vimrc.bepo est une configuration spéciale pour les claviers bépo. V
 ## Sources
 
 * Thème de couleurs : [vim-code-dark](https://github.com/tomasiser/vim-code-dark)
-* [Pathogen](https://github.com/tpope/vim-pathogen)
+* [Vim Doge](https://github.com/kkoomen/vim-doge) : génère des commentaires.
-* [Vim Doge](https://github.com/kkoomen/vim-doge)
+* [Rainbow](https://github.com/luochen1990/rainbow) : colore les pairs de parenthèses et les accolades.
-* [Rainbow](https://github.com/luochen1990/rainbow)
+* [Auto-pairs](https://github.com/jiangmiao/auto-pairs) : créer la parenthèse/accolade/etc. fermante automatiquement.
+* [Vim Markdown](https://github.com/plasticboy/vim-markdown) : Plugin pour gérer la syntaxe Markdown.
+* [Endwise](https://github.com/tpope/vim-endwise) : Ferme le `if` ou le `while` (pour Bash par ex.). 
+
+**Plugins de l’ancienne version de ce dépôt qui seront remis plus tard :**
+
+* [Emmet](https://github.com/mattn/emmet-vim) : 
+* [Ragtag](https://github.com/tpope/vim-ragtag) : 

autoload/lightline/colorscheme/codedark.vim

@@ -0,0 +1,40 @@
+" =============================================================================
+" Filename: autoload/lightline/colorscheme/codedark.vim
+" Author: artanikin
+" License: MIT License
+" Last Change: 2019/12/05 12:26:00
+" =============================================================================
+
+let s:term_red = 204
+let s:term_green = 114
+let s:term_yellow = 180
+let s:term_blue = 39
+let s:term_purple = 170
+let s:term_white = 145
+let s:term_black = 235
+let s:term_grey = 236
+
+let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
+
+let s:p.normal.left = [ [ '#262626', '#608B4E', s:term_black, s:term_green, 'bold' ], [ '#608B4E', '#262626', s:term_green, s:term_black ] ]
+let s:p.normal.right = [ [ '#262626', '#608B4E', s:term_black, s:term_green ], [ '#D4D4D4', '#3C3C3C', s:term_white, s:term_grey ], [ '#608B4E', '#262626', s:term_green, s:term_black ] ]
+let s:p.inactive.right = [ [ '#262626', '#569CD6', s:term_black, s:term_blue], [ '#D4D4D4', '#3C3C3C', s:term_white, s:term_grey ] ]
+let s:p.inactive.left = s:p.inactive.right[1:]
+" her
+let s:p.insert.left = [ [ '#262626', '#569CD6', s:term_black, s:term_blue, 'bold' ], [ '#569CD6', '#262626', s:term_blue, s:term_black ] ]
+let s:p.insert.right = [ [ '#262626', '#569CD6', s:term_black, s:term_blue ], [ '#D4D4D4', '#3C3C3C', s:term_white, s:term_grey ], [ '#569CD6', '#262626', s:term_blue, s:term_black ] ]
+let s:p.replace.left = [ [ '#262626', '#D16969', s:term_black, s:term_red, 'bold' ], [ '#D16969', '#262626', s:term_red, s:term_black ] ]
+let s:p.replace.right = [ [ '#262626', '#D16969', s:term_black, s:term_red, 'bold' ], s:p.normal.right[1], [ '#D16969', '#262626', s:term_red, s:term_black ] ]
+let s:p.visual.left = [ [ '#262626', '#C586C0', s:term_black, s:term_purple, 'bold' ], [ '#C586C0', '#262626', s:term_purple, s:term_black ] ]
+let s:p.visual.right = [ [ '#262626', '#C586C0', s:term_black, s:term_purple, 'bold' ], s:p.normal.right[1], [ '#C586C0', '#262626', s:term_purple, s:term_black ] ]
+let s:p.normal.middle = [ [ '#D4D4D4', '#262626', s:term_white, s:term_black ] ]
+let s:p.insert.middle = s:p.normal.middle
+let s:p.replace.middle = s:p.normal.middle
+let s:p.tabline.left = [ s:p.normal.left[1] ]
+let s:p.tabline.tabsel = [ s:p.normal.left[0] ]
+let s:p.tabline.middle = s:p.normal.middle
+let s:p.tabline.right = [ s:p.normal.left[1] ]
+let s:p.normal.error = [ [ '#262626', '#D16969', s:term_black, s:term_red ] ]
+let s:p.normal.warning = [ [ '#262626', '#D7BA7D', s:term_black, s:term_yellow ] ]
+
+let g:lightline#colorscheme#codedark#palette = lightline#colorscheme#fill(s:p)

backup/after/ftplugin/java.vim

@@ -0,0 +1,31 @@
+" Preserve existing doge settings.
+let b:doge_patterns = get(b:, 'doge_patterns', {})
+let b:doge_supported_doc_standards = get(b:, 'doge_supported_doc_standards', [])
+if index(b:doge_supported_doc_standards, 'javadoc') < 0
+    call add(b:doge_supported_doc_standards, 'javadoc')
+endif
+
+" DoGe uses these patterns to identify comments, change if needed.
+let b:doge_pattern_single_line_comment = '\m\/\*.\{-}\*\/$'
+let b:doge_pattern_multi_line_comment = '\m\/\*.\{-}\*\/$'
+
+" Set the new doc standard as default.
+let b:doge_doc_standard = 'javadoc'
+
+" Ensure we do not overwrite an existing doc standard.
+if !has_key(b:doge_patterns, 'javadoc')
+    let b:doge_patterns['javadoc'] = [
+                \  {
+                \    'match': '',
+                \    'tokens': ['parameters'],
+                \    'parameters': {
+                \      'match': '',
+                \      'tokens': '',
+                \      'format': '',
+                \    },
+                \    'insert': 'above',
+                \    'template': [
+                \    ],
+                \  },
+                \]
+endif

backup/bundle/vim-markdown

@@ -0,0 +1 @@
+Subproject commit 8e5d86f7b85234d3d1b4207dceebc43a768ed5d4

backup/plugin/auto-pairs.vim

@@ -0,0 +1,673 @@
+" Insert or delete brackets, parens, quotes in pairs.
+" Maintainer:	JiangMiao <jiangfriend@gmail.com>
+" Contributor: camthompson
+" Last Change:  2019-02-02
+" Version: 2.0.0
+" Homepage: http://www.vim.org/scripts/script.php?script_id=3599
+" Repository: https://github.com/jiangmiao/auto-pairs
+" License: MIT
+
+if exists('g:AutoPairsLoaded') || &cp
+  finish
+end
+let g:AutoPairsLoaded = 1
+
+if !exists('g:AutoPairs')
+  let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '```':'```', '"""':'"""', "'''":"'''", "`":"`"}
+end
+
+" default pairs base on filetype
+func! AutoPairsDefaultPairs()
+  if exists('b:autopairs_defaultpairs')
+    return b:autopairs_defaultpairs
+  end
+  let r = copy(g:AutoPairs)
+  let allPairs = {
+        \ 'vim': {'\v^\s*\zs"': ''},
+        \ 'rust': {'\w\zs<': '>', '&\zs''': ''},
+        \ 'php': {'<?': '?>//k]', '<?php': '?>//k]'}
+        \ }
+  for [filetype, pairs] in items(allPairs)
+    if &filetype == filetype
+      for [open, close] in items(pairs)
+        let r[open] = close
+      endfor
+    end
+  endfor
+  let b:autopairs_defaultpairs = r
+  return r
+endf
+
+if !exists('g:AutoPairsMapBS')
+  let g:AutoPairsMapBS = 1
+end
+
+" Map <C-h> as the same BS
+if !exists('g:AutoPairsMapCh')
+  let g:AutoPairsMapCh = 1
+end
+
+if !exists('g:AutoPairsMapCR')
+  let g:AutoPairsMapCR = 1
+end
+
+if !exists('g:AutoPairsWildClosedPair')
+  let g:AutoPairsWildClosedPair = ''
+end
+
+if !exists('g:AutoPairsMapSpace')
+  let g:AutoPairsMapSpace = 1
+end
+
+if !exists('g:AutoPairsCenterLine')
+  let g:AutoPairsCenterLine = 1
+end
+
+if !exists('g:AutoPairsShortcutToggle')
+  let g:AutoPairsShortcutToggle = '<M-p>'
+end
+
+if !exists('g:AutoPairsShortcutFastWrap')
+  let g:AutoPairsShortcutFastWrap = '<M-e>'
+end
+
+if !exists('g:AutoPairsMoveCharacter')
+  let g:AutoPairsMoveCharacter = "()[]{}\"'"
+end
+
+if !exists('g:AutoPairsShortcutJump')
+  let g:AutoPairsShortcutJump = '<M-n>'
+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 = 0
+endif
+
+" When skipping the closed pair, look at the current and
+" next line as well.
+if !exists('g:AutoPairsMultilineClose')
+  let g:AutoPairsMultilineClose = 1
+endif
+
+" Work with Fly Mode, insert pair where jumped
+if !exists('g:AutoPairsShortcutBackInsert')
+  let g:AutoPairsShortcutBackInsert = '<M-b>'
+endif
+
+if !exists('g:AutoPairsSmartQuotes')
+  let g:AutoPairsSmartQuotes = 1
+endif
+
+" 7.4.849 support <C-G>U to avoid breaking '.'
+" Issue talk: https://github.com/jiangmiao/auto-pairs/issues/3
+" Vim note: https://github.com/vim/vim/releases/tag/v7.4.849
+if v:version > 704 || v:version == 704 && has("patch849")
+  let s:Go = "\<C-G>U"
+else
+  let s:Go = ""
+endif
+
+let s:Left = s:Go."\<LEFT>"
+let s:Right = s:Go."\<RIGHT>"
+
+
+
+
+" unicode len
+func! s:ulen(s)
+  return len(split(a:s, '\zs'))
+endf
+
+func! s:left(s)
+  return repeat(s:Left, s:ulen(a:s))
+endf
+
+func! s:right(s)
+  return repeat(s:Right, s:ulen(a:s))
+endf
+
+func! s:delete(s)
+  return repeat("\<DEL>", s:ulen(a:s))
+endf
+
+func! s:backspace(s)
+  return repeat("\<BS>", s:ulen(a:s))
+endf
+
+func! s:getline()
+  let line = getline('.')
+  let pos = col('.') - 1
+  let before = strpart(line, 0, pos)
+  let after = strpart(line, pos)
+  let afterline = after
+  if g:AutoPairsMultilineClose
+    let n = line('$')
+    let i = line('.')+1
+    while i <= n
+      let line = getline(i)
+      let after = after.' '.line
+      if !(line =~ '\v^\s*$')
+        break
+      end
+      let i = i+1
+    endwhile
+  end
+  return [before, after, afterline]
+endf
+
+" split text to two part
+" returns [orig, text_before_open, open]
+func! s:matchend(text, open)
+    let m = matchstr(a:text, '\V'.a:open.'\v$')
+    if m == ""
+      return []
+    end
+    return [a:text, strpart(a:text, 0, len(a:text)-len(m)), m]
+endf
+
+" returns [orig, close, text_after_close]
+func! s:matchbegin(text, close)
+    let m = matchstr(a:text, '^\V'.a:close)
+    if m == ""
+      return []
+    end
+    return [a:text, m, strpart(a:text, len(m), len(a:text)-len(m))]
+endf
+
+" add or delete pairs base on g:AutoPairs
+" AutoPairsDefine(addPairs:dict[, removeOpenPairList:list])
+"
+" eg:
+"   au FileType html let b:AutoPairs = AutoPairsDefine({'<!--' : '-->'}, ['{'])
+"   add <!-- --> pair and remove '{' for html file
+func! AutoPairsDefine(pairs, ...)
+  let r = AutoPairsDefaultPairs()
+  if a:0 > 0
+    for open in a:1
+      unlet r[open]
+    endfor
+  end
+  for [open, close] in items(a:pairs)
+    let r[open] = close
+  endfor
+  return r
+endf
+
+func! AutoPairsInsert(key)
+  if !b:autopairs_enabled
+    return a:key
+  end
+
+  let b:autopairs_saved_pair = [a:key, getpos('.')]
+
+  let [before, after, afterline] = s:getline()
+
+  " Ignore auto close if prev character is \
+  if before[-1:-1] == '\'
+    return a:key
+  end
+
+  " check open pairs
+  for [open, close, opt] in b:AutoPairsList
+    let ms = s:matchend(before.a:key, open)
+    let m = matchstr(afterline, '^\v\s*\zs\V'.close)
+    if len(ms) > 0
+      " process the open pair
+      
+      " remove inserted pair
+      " eg: if the pairs include < > and  <!-- --> 
+      " when <!-- is detected the inserted pair < > should be clean up 
+      let target = ms[1]
+      let openPair = ms[2]
+      if len(openPair) == 1 && m == openPair
+        break
+      end
+      let bs = ''
+      let del = ''
+      while len(before) > len(target)
+        let found = 0
+        " delete pair
+        for [o, c, opt] in b:AutoPairsList
+          let os = s:matchend(before, o)
+          if len(os) && len(os[1]) < len(target)
+            " any text before openPair should not be deleted
+            continue
+          end
+          let cs = s:matchbegin(afterline, c)
+          if len(os) && len(cs)
+            let found = 1
+            let before = os[1]
+            let afterline = cs[2]
+            let bs = bs.s:backspace(os[2])
+            let del = del.s:delete(cs[1])
+            break
+          end
+        endfor
+        if !found
+          " delete charactor
+          let ms = s:matchend(before, '\v.')
+          if len(ms)
+            let before = ms[1]
+            let bs = bs.s:backspace(ms[2])
+          end
+        end
+      endwhile
+      return bs.del.openPair.close.s:left(close)
+    end
+  endfor
+
+  " check close pairs
+  for [open, close, opt] in b:AutoPairsList
+    if close == ''
+      continue
+    end
+    if a:key == g:AutoPairsWildClosedPair || opt['mapclose'] && opt['key'] == a:key
+      " the close pair is in the same line
+      let m = matchstr(afterline, '^\v\s*\V'.close)
+      if m != ''
+        if before =~ '\V'.open.'\v\s*$' && m[0] =~ '\v\s'
+          " remove the space we inserted if the text in pairs is blank
+          return "\<DEL>".s:right(m[1:])
+        else
+          return s:right(m)
+        end
+      end
+      let m = matchstr(after, '^\v\s*\zs\V'.close)
+      if m != ''
+        if a:key == g:AutoPairsWildClosedPair || opt['multiline']
+          if b:autopairs_return_pos == line('.') && getline('.') =~ '\v^\s*$'
+            normal! ddk$
+          end
+          call search(m, 'We')
+          return "\<Right>"
+        else
+          break
+        end
+      end
+    end
+  endfor
+
+
+  " Fly Mode, and the key is closed-pairs, search closed-pair and jump
+  if g:AutoPairsFlyMode &&  a:key =~ '\v[\}\]\)]'
+    if search(a:key, 'We')
+      return "\<Right>"
+    endif
+  endif
+
+  return a:key
+endf
+
+func! AutoPairsDelete()
+  if !b:autopairs_enabled
+    return "\<BS>"
+  end
+
+  let [before, after, ig] = s:getline()
+  for [open, close, opt] in b:AutoPairsList
+    let b = matchstr(before, '\V'.open.'\v\s?$')
+    let a = matchstr(after, '^\v\s*\V'.close)
+    if b != '' && a != ''
+      if b[-1:-1] == ' '
+        if a[0] == ' '
+          return "\<BS>\<DELETE>"
+        else
+          return "\<BS>"
+        end
+      end
+      return s:backspace(b).s:delete(a)
+    end
+  endfor
+
+  return "\<BS>"
+  " delete the pair foo[]| <BS> to foo
+  for [open, close, opt] in b:AutoPairsList
+    let m = s:matchend(before, '\V'.open.'\v\s*'.'\V'.close.'\v$')
+    if len(m) > 0
+      return s:backspace(m[2])
+    end
+  endfor
+  return "\<BS>"
+endf
+
+
+" Fast wrap the word in brackets
+func! AutoPairsFastWrap()
+  let c = @"
+  normal! x
+  let [before, after, ig] = s:getline()
+  if after[0] =~ '\v[\{\[\(\<]'
+    normal! %
+    normal! p
+  else
+    for [open, close, opt] in b:AutoPairsList
+      if close == ''
+        continue
+      end
+      if after =~ '^\s*\V'.open
+        call search(close, 'We')
+        normal! p
+        let @" = c
+        return ""
+      end
+    endfor
+    if after[1:1] =~ '\v\w'
+      normal! e
+      normal! p
+    else
+      normal! p
+    end
+  end
+  let @" = c
+  return ""
+endf
+
+func! AutoPairsJump()
+  call search('["\]'')}]','W')
+endf
+
+func! AutoPairsMoveCharacter(key)
+  let c = getline(".")[col(".")-1]
+  let escaped_key = substitute(a:key, "'", "''", 'g')
+  return "\<DEL>\<ESC>:call search("."'".escaped_key."'".")\<CR>a".c."\<LEFT>"
+endf
+
+func! AutoPairsBackInsert()
+  let pair = b:autopairs_saved_pair[0]
+  let pos  = b:autopairs_saved_pair[1]
+  call setpos('.', pos)
+  return pair
+endf
+
+func! AutoPairsReturn()
+  if b:autopairs_enabled == 0
+    return ''
+  end
+  let b:autopairs_return_pos = 0
+  let before = getline(line('.')-1)
+  let [ig, ig, afterline] = s:getline()
+  let cmd = ''
+  for [open, close, opt] in b:AutoPairsList
+    if close == ''
+      continue
+    end
+
+    if before =~ '\V'.open.'\v\s*$' && afterline =~ '^\s*\V'.close
+      let b:autopairs_return_pos = line('.')
+      if g:AutoPairsCenterLine && winline() * 3 >= winheight(0) * 2
+        " Recenter before adding new line to avoid replacing line content
+        let cmd = "zz"
+      end
+
+      " If equalprg has been set, then avoid call =
+      " https://github.com/jiangmiao/auto-pairs/issues/24
+      if &equalprg != ''
+        return "\<ESC>".cmd."O"
+      endif
+
+      " conflict with javascript and coffee
+      " javascript   need   indent new line
+      " coffeescript forbid indent new line
+      if &filetype == 'coffeescript' || &filetype == 'coffee'
+        return "\<ESC>".cmd."k==o"
+      else
+        return "\<ESC>".cmd."=ko"
+      endif
+    end
+  endfor
+  return ''
+endf
+
+func! AutoPairsSpace()
+  if !b:autopairs_enabled
+    return "\<SPACE>"
+  end
+
+  let [before, after, ig] = s:getline()
+
+  for [open, close, opt] in b:AutoPairsList
+    if close == ''
+      continue
+    end
+    if before =~ '\V'.open.'\v$' && after =~ '^\V'.close
+      if close =~ '\v^[''"`]$'
+        return "\<SPACE>"
+      else
+        return "\<SPACE>\<SPACE>".s:Left
+      end
+    end
+  endfor
+  return "\<SPACE>"
+endf
+
+func! AutoPairsMap(key)
+  " | is special key which separate map command from text
+  let key = a:key
+  if key == '|'
+    let key = '<BAR>'
+  end
+  let escaped_key = substitute(key, "'", "''", 'g')
+  " use expr will cause search() doesn't work
+  execute 'inoremap <buffer> <silent> '.key." <C-R>=AutoPairsInsert('".escaped_key."')<CR>"
+endf
+
+func! AutoPairsToggle()
+  if b:autopairs_enabled
+    let b:autopairs_enabled = 0
+    echo 'AutoPairs Disabled.'
+  else
+    let b:autopairs_enabled = 1
+    echo 'AutoPairs Enabled.'
+  end
+  return ''
+endf
+
+func! s:sortByLength(i1, i2)
+  return len(a:i2[0])-len(a:i1[0])
+endf
+
+func! AutoPairsInit()
+  let b:autopairs_loaded  = 1
+  if !exists('b:autopairs_enabled')
+    let b:autopairs_enabled = 1
+  end
+
+  if !exists('b:AutoPairs')
+    let b:AutoPairs = AutoPairsDefaultPairs()
+  end
+
+  if !exists('b:AutoPairsMoveCharacter')
+    let b:AutoPairsMoveCharacter = g:AutoPairsMoveCharacter
+  end
+
+  let b:autopairs_return_pos = 0
+  let b:autopairs_saved_pair = [0, 0]
+  let b:AutoPairsList = []
+
+  " buffer level map pairs keys
+  " n - do not map the first charactor of closed pair to close key
+  " m - close key jumps through multi line
+  " s - close key jumps only in the same line
+  for [open, close] in items(b:AutoPairs)
+    let o = open[-1:-1]
+    let c = close[0]
+    let opt = {'mapclose': 1, 'multiline':1}
+    let opt['key'] = c
+    if o == c
+      let opt['multiline'] = 0
+    end
+    let m = matchlist(close, '\v(.*)//(.*)$')
+    if len(m) > 0 
+      if m[2] =~ 'n'
+        let opt['mapclose'] = 0
+      end
+      if m[2] =~ 'm'
+        let opt['multiline'] = 1
+      end
+      if m[2] =~ 's'
+        let opt['multiline'] = 0
+      end
+      let ks = matchlist(m[2], '\vk(.)')
+      if len(ks) > 0
+        let opt['key'] = ks[1]
+        let c = opt['key']
+      end
+      let close = m[1]
+    end
+    call AutoPairsMap(o)
+    if o != c && c != '' && opt['mapclose']
+      call AutoPairsMap(c)
+    end
+    let b:AutoPairsList += [[open, close, opt]]
+  endfor
+
+  " sort pairs by length, longer pair should have higher priority
+  let b:AutoPairsList = sort(b:AutoPairsList, "s:sortByLength")
+
+  for item in b:AutoPairsList
+    let [open, close, opt] = item
+    if open == "'" && open == close
+      let item[0] = '\v(^|\W)\zs'''
+    end
+  endfor
+
+
+  for key in split(b:AutoPairsMoveCharacter, '\s*')
+    let escaped_key = substitute(key, "'", "''", 'g')
+    execute 'inoremap <silent> <buffer> <M-'.key."> <C-R>=AutoPairsMoveCharacter('".escaped_key."')<CR>"
+  endfor
+
+  " Still use <buffer> level mapping for <BS> <SPACE>
+  if g:AutoPairsMapBS
+    " 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:AutoPairsMapCh
+    execute 'inoremap <buffer> <silent> <C-h> <C-R>=AutoPairsDelete()<CR>'
+  endif
+
+  if g:AutoPairsMapSpace
+    " Try to respect abbreviations on a <SPACE>
+    let do_abbrev = ""
+    if v:version == 703 && has("patch489") || v:version > 703
+      let do_abbrev = "<C-]>"
+    endif
+    execute 'inoremap <buffer> <silent> <SPACE> '.do_abbrev.'<C-R>=AutoPairsSpace()<CR>'
+  end
+
+  if g:AutoPairsShortcutFastWrap != ''
+    execute 'inoremap <buffer> <silent> '.g:AutoPairsShortcutFastWrap.' <C-R>=AutoPairsFastWrap()<CR>'
+  end
+
+  if g:AutoPairsShortcutBackInsert != ''
+    execute 'inoremap <buffer> <silent> '.g:AutoPairsShortcutBackInsert.' <C-R>=AutoPairsBackInsert()<CR>'
+  end
+
+  if g:AutoPairsShortcutToggle != ''
+    " use <expr> to ensure showing the status when toggle
+    execute 'inoremap <buffer> <silent> <expr> '.g:AutoPairsShortcutToggle.' AutoPairsToggle()'
+    execute 'noremap <buffer> <silent> '.g:AutoPairsShortcutToggle.' :call AutoPairsToggle()<CR>'
+  end
+
+  if g:AutoPairsShortcutJump != ''
+    execute 'inoremap <buffer> <silent> ' . g:AutoPairsShortcutJump. ' <ESC>:call AutoPairsJump()<CR>a'
+    execute 'noremap <buffer> <silent> ' . g:AutoPairsShortcutJump. ' :call AutoPairsJump()<CR>'
+  end
+
+  if &keymap != ''
+    let l:imsearch = &imsearch
+    let l:iminsert = &iminsert
+    let l:imdisable = &imdisable
+    execute 'setlocal keymap=' . &keymap
+    execute 'setlocal imsearch=' . l:imsearch
+    execute 'setlocal iminsert=' . l:iminsert
+    if l:imdisable
+      execute 'setlocal imdisable'
+    else
+      execute 'setlocal noimdisable'
+    end
+  end
+
+endf
+
+func! s:ExpandMap(map)
+  let map = a:map
+  let map = substitute(map, '\(<Plug>\w\+\)', '\=maparg(submatch(1), "i")', 'g')
+  let map = substitute(map, '\(<Plug>([^)]*)\)', '\=maparg(submatch(1), "i")', 'g')
+  return map
+endf
+
+func! 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
+  " 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
+    if v:version == 703 && has('patch32') || v:version > 703
+      " VIM 7.3 supports advancer maparg which could get <expr> info
+      " then auto-pairs could remap <CR> in any case.
+      let info = maparg('<CR>', 'i', 0, 1)
+      if empty(info)
+        let old_cr = '<CR>'
+        let is_expr = 0
+      else
+        let old_cr = info['rhs']
+        let old_cr = s:ExpandMap(old_cr)
+        let old_cr = substitute(old_cr, '<SID>', '<SNR>' . info['sid'] . '_', 'g')
+        let is_expr = info['expr']
+        let wrapper_name = '<SID>AutoPairsOldCRWrapper73'
+      endif
+    else
+      " VIM version less than 7.3
+      " the mapping's <expr> info is lost, so guess it is expr or not, it's
+      " not accurate.
+      let old_cr = maparg('<CR>', 'i')
+      if old_cr == ''
+        let old_cr = '<CR>'
+        let is_expr = 0
+      else
+        let old_cr = s:ExpandMap(old_cr)
+        " old_cr contain (, I guess the old cr is in expr mode
+        let is_expr = old_cr =~ '\V(' && toupper(old_cr) !~ '\V<C-R>'
+
+        " The old_cr start with " it must be in expr mode
+        let is_expr = is_expr || old_cr =~ '\v^"'
+        let wrapper_name = '<SID>AutoPairsOldCRWrapper'
+      end
+    end
+
+    if old_cr !~ 'AutoPairsReturn'
+      if is_expr
+        " remap <expr> to `name` to avoid mix expr and non-expr mode
+        execute 'inoremap <buffer> <expr> <script> '. wrapper_name . ' ' . old_cr
+        let old_cr = wrapper_name
+      end
+      " Always silent mapping
+      execute 'inoremap <script> <buffer> <silent> <CR> '.old_cr.'<SID>AutoPairsReturn'
+    end
+  endif
+  call AutoPairsInit()
+endf
+
+" Always silent the command
+inoremap <silent> <SID>AutoPairsReturn <C-R>=AutoPairsReturn()<CR>
+imap <script> <Plug>AutoPairsReturn <SID>AutoPairsReturn
+
+
+au BufEnter * :call AutoPairsTryInit()

backup/plugin/emmet.vim

@@ -0,0 +1,177 @@
+"=============================================================================
+" File: emmet.vim
+" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
+" Last Change: 26-Jul-2015.
+" Version: 0.86
+" WebPage: http://github.com/mattn/emmet-vim
+" Description: vim plugins for HTML and CSS hi-speed coding.
+" SeeAlso: http://emmet.io/
+" Usage:
+"
+"   This is vim script support expanding abbreviation like emmet.
+"   ref: http://emmet.io/
+"
+"   Type abbreviation
+"      +-------------------------------------
+"      | html:5_
+"      +-------------------------------------
+"   "_" is a cursor position. and type "<c-y>," (Ctrl+y and Comma)
+"   NOTE: Don't worry about key map. you can change it easily.
+"      +-------------------------------------
+"      | <!DOCTYPE HTML>
+"      | <html lang="en">
+"      | <head>
+"      |     <title></title>
+"      |     <meta charset="UTF-8">
+"      | </head>
+"      | <body>
+"      |      _
+"      | </body>
+"      | </html>
+"      +-------------------------------------
+"   Type following
+"      +-------------------------------------
+"      | div#foo$*2>div.bar
+"      +-------------------------------------
+"   And type "<c-y>,"
+"      +-------------------------------------
+"      |<div id="foo1">
+"      |    <div class="bar">_</div>
+"      |</div>
+"      |<div id="foo2">
+"      |    <div class="bar"></div>
+"      |</div>
+"      +-------------------------------------
+"
+" Tips:
+"
+"   You can customize behavior of expanding with overriding config.
+"   This configuration will be marged at loading plugin.
+"
+"     let g:user_emmet_settings = {
+"     \  'indentation' : '  ',
+"     \  'perl' : {
+"     \    'aliases' : {
+"     \      'req' : 'require '
+"     \    },
+"     \    'snippets' : {
+"     \      'use' : "use strict\nuse warnings\n\n",
+"     \      'warn' : "warn \"|\";",
+"     \    }
+"     \  }
+"     \}
+"
+"   You can set language attribute in html using 'emmet_settings.lang'.
+"
+" GetLatestVimScripts: 2981 1 :AutoInstall: emmet.vim
+" script type: plugin
+
+if &compatible || v:version < 702 || (exists('g:loaded_emmet_vim') && g:loaded_emmet_vim)
+  finish
+endif
+let g:loaded_emmet_vim = 1
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+if !exists('g:emmet_html5')
+  let g:emmet_html5 = 1
+endif
+
+if !exists('g:emmet_docroot')
+  let g:emmet_docroot = {}
+endif
+
+if !exists('g:emmet_debug')
+  let g:emmet_debug = 0
+endif
+
+if !exists('g:emmet_curl_command')
+  let g:emmet_curl_command = 'curl -s -L -A Mozilla/5.0'
+endif
+
+if !exists('g:user_emmet_leader_key')
+  let g:user_emmet_leader_key = '<c-y>'
+endif
+
+function! s:install_plugin(mode, buffer)
+  let buffer = a:buffer ? '<buffer>' : ''
+  let items = [
+  \ {'mode': 'i', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'emmet-expand-abbr', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#expandAbbr(0,"")<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'emmet-expand-abbr', 'func': ':call emmet#expandAbbr(3,"")<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'emmet-expand-abbr', 'func': ':call emmet#expandAbbr(2,"")<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'emmet-expand-word', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#expandAbbr(1,"")<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'emmet-expand-word', 'func': ':call emmet#expandAbbr(1,"")<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_update_tag', 'key': 'u', 'plug': 'emmet-update-tag', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#updateTag()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_update_tag', 'key': 'u', 'plug': 'emmet-update-tag', 'func': ':call emmet#updateTag()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'emmet-balance-tag-inward', 'func': '<esc>:call emmet#balanceTag(1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'emmet-balance-tag-inward', 'func': ':call emmet#balanceTag(1)<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'emmet-balance-tag-inward', 'func': ':call emmet#balanceTag(2)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_balancetagoutward_key', 'key': 'D', 'plug': 'emmet-balance-tag-outword', 'func': '<esc>:call emmet#balanceTag(-1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_balancetagoutward_key', 'key': 'D', 'plug': 'emmet-balance-tag-outword', 'func': ':call emmet#balanceTag(-1)<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_balancetagoutward_key', 'key': 'D', 'plug': 'emmet-balance-tag-outword', 'func': ':call emmet#balanceTag(-2)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_next_key', 'key': 'n', 'plug': 'emmet-move-next', 'func': '<esc>:call emmet#moveNextPrev(0)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_next_key', 'key': 'n', 'plug': 'emmet-move-next', 'func': ':call emmet#moveNextPrev(0)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'emmet-move-prev', 'func': '<esc>:call emmet#moveNextPrev(1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'emmet-move-prev', 'func': ':call emmet#moveNextPrev(1)<cr>'},
+  \ {'mode': 'i', 'var': '', 'key': '', 'plug': 'emmet-move-next-item', 'func': '<esc>:call emmet#moveNextPrevItem(0)<cr>'},
+  \ {'mode': 'n', 'var': '', 'key': '', 'plug': 'emmet-move-next-item', 'func': ':call emmet#moveNextPrevItem(0)<cr>'},
+  \ {'mode': 'i', 'var': '', 'key': '', 'plug': 'emmet-move-prev-item', 'func': '<esc>:call emmet#moveNextPrevItem(1)<cr>'},
+  \ {'mode': 'n', 'var': '', 'key': '', 'plug': 'emmet-move-prev-item', 'func': ':call emmet#moveNextPrevItem(1)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'emmet-image-size', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#imageSize()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'emmet-image-size', 'func': ':call emmet#imageSize()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'emmet-toggle-comment', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#toggleComment()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'emmet-toggle-comment', 'func': ':call emmet#toggleComment()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'emmet-split-join-tag', 'func': '<esc>:call emmet#splitJoinTag()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'emmet-split-join-tag', 'func': ':call emmet#splitJoinTag()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'emmet-remove-tag', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#removeTag()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'emmet-remove-tag', 'func': ':call emmet#removeTag()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'emmet-anchorize-url', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#anchorizeURL(0)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'emmet-anchorize-url', 'func': ':call emmet#anchorizeURL(0)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'emmet-anchorize-summary', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#anchorizeURL(1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'emmet-anchorize-summary', 'func': ':call emmet#anchorizeURL(1)<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_mergelines_key', 'key': 'm', 'plug': 'emmet-merge-lines', 'func': ':call emmet#mergeLines()<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_codepretty_key', 'key': 'c', 'plug': 'emmet-code-pretty', 'func': ':call emmet#codePretty()<cr>'},
+  \]
+
+  let only_plug = get(g:, 'emmet_install_only_plug', 0)
+  for item in items
+    if a:mode !=# 'a' && stridx(a:mode, item.mode) == -1
+      continue
+    endif
+    exe item.mode . 'noremap '. buffer .' <plug>(' . item.plug . ') ' . item.func
+    if item.var != '' && !only_plug
+      if exists('g:' . item.var)
+        let key = eval('g:' . item.var)
+      else
+        let key = g:user_emmet_leader_key . item.key
+      endif
+      if !hasmapto('<plug>(' . item.plug . ')', item.mode) && !len(maparg(key, item.mode))
+        exe item.mode . 'map ' . buffer . ' <unique> ' . key . ' <plug>(' . item.plug . ')'
+      endif
+    endif
+  endfor
+
+  if exists('g:user_emmet_complete_tag') && g:user_emmet_complete_tag
+    if get(g:, 'user_emmet_install_global', 1)
+      set omnifunc=emmet#completeTag
+    else
+      setlocal omnifunc=emmet#completeTag
+    endif
+  endif
+endfunction
+
+command! -nargs=0 -bar EmmetInstall call <SID>install_plugin(get(g:, 'user_emmet_mode', 'a'), 1)
+
+if get(g:, 'user_emmet_install_global', 1)
+  call s:install_plugin(get(g:, 'user_emmet_mode', 'a'), 0)
+endif
+
+if get(g:, 'user_emmet_install_command', 1)
+  command! -nargs=1 Emmet call emmet#expandAbbr(4, <q-args>)
+endif
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et:

backup/plugin/endwise.vim

@@ -0,0 +1,212 @@
+" Location:     plugin/endwise.vim
+" Author:       Tim Pope <http://tpo.pe/>
+" Version:      1.2
+" License:      Same as Vim itself.  See :help license
+" GetLatestVimScripts: 2386 1 :AutoInstall: endwise.vim
+
+if exists("g:loaded_endwise") || &cp
+  finish
+endif
+let g:loaded_endwise = 1
+
+augroup endwise " {{{1
+  autocmd!
+  autocmd FileType lua
+        \ let b:endwise_addition = 'end' |
+        \ let b:endwise_words = 'function,do,then' |
+        \ let b:endwise_pattern = '^\s*\zs\%(\%(local\s\+\)\=function\)\>\%(.*\<end\>\)\@!\|\<\%(then\|do\)\ze\s*$' |
+        \ let b:endwise_syngroups = 'luaFunction,luaStatement,luaCond'
+  autocmd FileType elixir
+        \ let b:endwise_addition = 'end' |
+        \ let b:endwise_words = 'do,fn' |
+        \ let b:endwise_pattern = '.*[^.:@$]\zs\<\%(do\(:\)\@!\|fn\)\>\ze\%(.*[^.:@$]\<end\>\)\@!' |
+        \ let b:endwise_syngroups = 'elixirBlockDefinition'
+  autocmd FileType ruby
+        \ let b:endwise_addition = 'end' |
+        \ let b:endwise_words = 'module,class,def,if,unless,case,while,until,begin,do' |
+        \ let b:endwise_pattern = '^\(.*=\)\?\s*\%(private\s\+\|protected\s\+\|public\s\+\|module_function\s\+\)*\zs\%(module\|class\|def\|if\|unless\|case\|while\|until\|for\|\|begin\)\>\%(.*[^.:@$]\<end\>\)\@!\|\<do\ze\%(\s*|.*|\)\=\s*$' |
+        \ let b:endwise_syngroups = 'rubyModule,rubyClass,rubyDefine,rubyControl,rubyConditional,rubyRepeat'
+  autocmd FileType crystal
+        \ let b:endwise_addition = 'end' |
+        \ let b:endwise_words = 'module,class,lib,macro,struct,union,enum,def,if,unless,ifdef,case,while,until,for,begin,do' |
+        \ let b:endwise_pattern = '^\(.*=\)\?\s*\%(private\s\+\|protected\s\+\|public\s\+\|abstract\s\+\)*\zs\%(module\|class\|lib\|macro\|struct\|union\|enum\|def\|if\|unless\|ifdef\|case\|while\|until\|for\|begin\)\>\%(.*[^.:@$]\<end\>\)\@!\|\<do\ze\%(\s*|.*|\)\=\s*$' |
+        \ let b:endwise_syngroups = 'crystalModule,crystalClass,crystalLib,crystalMacro,crystalStruct,crystalEnum,crystalDefine,crystalConditional,crystalRepeat,crystalControl'
+  autocmd FileType sh,zsh
+        \ let b:endwise_addition = '\=submatch(0)=="then" ? "fi" : submatch(0)=="case" ? "esac" : "done"' |
+        \ let b:endwise_words = 'then,case,do' |
+        \ let b:endwise_pattern = '\%(^\s*\zscase\>\ze\|\zs\<\%(do\|then\)\ze\s*$\)' |
+        \ let b:endwise_syngroups = 'shConditional,shLoop,shIf,shFor,shRepeat,shCaseEsac,zshConditional,zshRepeat,zshDelimiter'
+  autocmd FileType vb,vbnet,aspvbs
+        \ let b:endwise_addition = 'End &' |
+        \ let b:endwise_words = 'Function,Sub,Class,Module,Enum,Namespace' |
+        \ let b:endwise_pattern = '\%(\<End\>.*\)\@<!\<&\>' |
+        \ let b:endwise_syngroups = 'vbStatement,vbnetStorage,vbnetProcedure,vbnet.*Words,AspVBSStatement'
+  autocmd FileType vim
+        \ let b:endwise_addition = '\=submatch(0)=~"aug\\%[roup]" ? submatch(0) . " END" : "end" . submatch(0)' |
+        \ let b:endwise_words = 'fu\%[nction],wh\%[ile],if,for,try,aug\%[roup]\%(\s\+\cEND\)\@!' |
+        \ let b:endwise_end_pattern = '\%(end\%(fu\%[nction]\|wh\%[hile]\|if\|for\|try\)\)\|aug\%[roup]\%(\s\+\cEND\)' |
+        \ let b:endwise_syngroups = 'vimFuncKey,vimNotFunc,vimCommand,vimAugroupKey,vimAugroup,vimAugroupError'
+  autocmd FileType c,cpp,xdefaults,haskell
+        \ let b:endwise_addition = '#endif' |
+        \ let b:endwise_words = 'if,ifdef,ifndef' |
+        \ let b:endwise_pattern = '^\s*#\%(if\|ifdef\|ifndef\)\>' |
+        \ let b:endwise_syngroups = 'cPreCondit,cPreConditMatch,cCppInWrapper,xdefaultsPreProc'
+  autocmd FileType objc
+        \ let b:endwise_addition = '@end' |
+        \ let b:endwise_words = 'interface,implementation' |
+        \ let b:endwise_pattern = '^\s*@\%(interface\|implementation\)\>' |
+        \ let b:endwise_syngroups = 'objcObjDef'
+  autocmd FileType make
+        \ let b:endwise_addition = '\="end" . submatch(0)' |
+        \ let b:endwise_words = 'ifdef,ifndef,ifeq,ifneq,define' |
+        \ let b:endwise_pattern = '^\s*\(d\zsef\zeine\|\zsif\zen\=\(def\|eq\)\)\>' |
+        \ let b:endwise_syngroups = 'makePreCondit,makeDefine'
+  autocmd FileType verilog
+        \ let b:endwise_addition = '\="end" . submatch(0)' |
+        \ let b:endwise_words = 'begin,module,case,function,primitive,specify,task' |
+        \ let b:endwise_pattern = '\<\%(\zs\zebegin\|module\|case\|function\|primitive\|specify\|task\)\>.*$' |
+        \ let b:endwise_syngroups = 'verilogConditional,verilogLabel,verilogStatement'
+  autocmd FileType matlab
+        \ let b:endwise_addition = 'end' |
+        \ let b:endwise_words = 'function,if,for' |
+        \ let b:endwise_syngroups = 'matlabStatement,matlabFunction,matlabConditional,matlabRepeat'
+  autocmd FileType htmldjango
+        \ let b:endwise_addition = '{% end& %}' |
+        \ let b:endwise_words = 'autoescape,block,blocktrans,cache,comment,filter,for,if,ifchanged,ifequal,ifnotequal,language,spaceless,verbatim,with' |
+        \ let b:endwise_syngroups = 'djangoTagBlock,djangoStatement'
+  autocmd FileType htmljinja,jinja.html
+        \ let b:endwise_addition = '{% end& %}' |
+        \ let b:endwise_words = 'autoescape,block,cache,call,filter,for,if,macro,raw,set,trans,with' |
+        \ let b:endwise_syngroups = 'jinjaTagBlock,jinjaStatement'
+  autocmd FileType snippets
+        \ let b:endwise_addition = 'endsnippet' |
+        \ let b:endwise_words = 'snippet' |
+        \ let b:endwise_syngroups = 'snipSnippet,snipSnippetHeader,snipSnippetHeaderKeyword'
+  autocmd FileType * call s:abbrev()
+augroup END " }}}1
+
+function! s:abbrev()
+  if exists('g:endwise_abbreviations')
+    for word in split(get(b:, 'endwise_words', ''), ',')
+      execute 'iabbrev <buffer><script>' word word.'<CR><SID>DiscretionaryEnd<Space><C-U><BS>'
+    endfor
+  endif
+endfunction
+
+function! s:teardownMappings()
+  inoremap <buffer> <C-X><CR> <C-X><CR>
+  inoremap <buffer> <CR> <CR>
+endfunction
+
+" Functions {{{1
+
+function! EndwiseDiscretionary()
+  return <SID>crend(0)
+endfunction
+
+function! EndwiseAlways()
+  return <SID>crend(1)
+endfunction
+
+" }}}1
+
+" Maps {{{1
+
+if empty(maparg("<Plug>DiscretionaryEnd"))
+  inoremap <silent> <SID>DiscretionaryEnd <C-R>=<SID>crend(0)<CR>
+  inoremap <silent> <SID>AlwaysEnd        <C-R>=<SID>crend(1)<CR>
+  imap    <script> <Plug>DiscretionaryEnd <SID>DiscretionaryEnd
+  imap    <script> <Plug>AlwaysEnd        <SID>AlwaysEnd
+endif
+
+if !exists('g:endwise_no_mappings')
+  if maparg('<CR>','i') =~# '<C-R>=.*crend(.)<CR>\|<\%(Plug\|SNR\|SID\)>.*End'
+    " Already mapped
+  elseif maparg('<CR>','i') =~? '<cr>'
+    exe "imap <script> <C-X><CR> ".maparg('<CR>','i')."<SID>AlwaysEnd"
+    exe "imap <silent> <script> <CR>      ".maparg('<CR>','i')."<SID>DiscretionaryEnd"
+  elseif maparg('<CR>','i') =~# '<Plug>\w\+CR'
+    exe "imap <C-X><CR> ".maparg('<CR>', 'i')."<Plug>AlwaysEnd"
+    exe "imap <silent> <CR> ".maparg('<CR>', 'i')."<Plug>DiscretionaryEnd"
+  else
+    imap <script> <C-X><CR> <CR><SID>AlwaysEnd
+    imap <CR> <CR><Plug>DiscretionaryEnd
+  endif
+  autocmd endwise CmdwinEnter * call s:teardownMappings()
+endif
+
+" }}}1
+
+" Code {{{1
+
+function! s:mysearchpair(beginpat,endpat,synidpat)
+  let s:lastline = line('.')
+  call s:synid()
+  let line = searchpair(a:beginpat,'',a:endpat,'Wn','<SID>synid() !~# "^'.substitute(a:synidpat,'\\','\\\\','g').'$"',line('.')+50)
+  return line
+endfunction
+
+function! s:crend(always)
+  let n = ""
+  if !exists("b:endwise_addition") || !exists("b:endwise_words") || !exists("b:endwise_syngroups")
+    return n
+  endif
+  let synids = join(map(split(b:endwise_syngroups, ','), 'hlID(v:val)'), ',')
+  let wordchoice = '\%('.substitute(b:endwise_words,',','\\|','g').'\)'
+  if exists("b:endwise_pattern")
+    let beginpat = substitute(b:endwise_pattern,'&',substitute(wordchoice,'\\','\\&','g'),'g')
+  else
+    let beginpat = '\<'.wordchoice.'\>'
+  endif
+  let lnum = line('.') - 1
+  let space = matchstr(getline(lnum),'^\s*')
+  let col  = match(getline(lnum),beginpat) + 1
+  let word  = matchstr(getline(lnum),beginpat)
+  let endword = substitute(word,'.*',b:endwise_addition,'')
+  let y = n.endword."\<C-O>O"
+  if exists("b:endwise_end_pattern")
+    let endpat = '\w\@<!'.substitute(word, '.*', substitute(b:endwise_end_pattern, '\\', '\\\\', 'g'), '').'\w\@!'
+  elseif b:endwise_addition[0:1] ==# '\='
+    let endpat = '\w\@<!'.endword.'\w\@!'
+  else
+    let endpat = '\w\@<!'.substitute('\w\+', '.*', b:endwise_addition, '').'\w\@!'
+  endif
+  let synidpat  = '\%('.substitute(synids,',','\\|','g').'\)'
+  if a:always
+    return y
+  elseif col <= 0 || synID(lnum,col,1) !~ '^'.synidpat.'$'
+    return n
+  elseif getline('.') !~# '^\s*#\=$'
+    return n
+  endif
+  let line = s:mysearchpair(beginpat,endpat,synidpat)
+  " even is false if no end was found, or if the end found was less
+  " indented than the current line
+  let even = strlen(matchstr(getline(line),'^\s*')) >= strlen(space)
+  if line == 0
+    let even = 0
+  endif
+  if !even && line == line('.') + 1
+    return y
+  endif
+  if even
+    return n
+  endif
+  return y
+endfunction
+
+function! s:synid()
+  " Checking this helps to force things to stay in sync
+  while s:lastline < line('.')
+    let s = synID(s:lastline,indent(s:lastline)+1,1)
+    let s:lastline = nextnonblank(s:lastline + 1)
+  endwhile
+
+  let s = synID(line('.'),col('.'),1)
+  let s:lastline = line('.')
+  return s
+endfunction
+
+" }}}1
+
+" vim:set sw=2 sts=2:

backup/plugin/ragtag.vim

@@ -0,0 +1,571 @@
+" ragtag.vim - Ghetto XML/HTML mappings (formerly allml.vim)
+" Author:       Tim Pope <http://tpo.pe/>
+" Version:      2.0
+" GetLatestVimScripts: 1896 1 :AutoInstall: ragtag.vim
+
+if exists("g:loaded_ragtag") || &cp || v:version < 700
+  finish
+endif
+let g:loaded_ragtag = 1
+
+if !exists('g:html_indent_inctags')
+  let g:html_indent_inctags = 'body,head,html,tbody,p,li,dt,dd'
+endif
+if !exists('g:html_indent_autotags')
+  let g:html_indent_autotags = 'wbr'
+endif
+if !exists('g:html_indent_script1')
+  let g:html_indent_script1 = 'inc'
+endif
+if !exists('g:html_indent_style1')
+  let g:html_indent_style1 = 'inc'
+endif
+
+augroup ragtag
+  autocmd!
+  autocmd BufReadPost * if ! did_filetype() && getline(1)." ".getline(2).
+        \ " ".getline(3) =~? '<\%(!DOCTYPE \)\=html\>' | setf html | endif
+  autocmd FileType *html*,wml,jsp,gsp,mustache,smarty             call s:Init()
+  autocmd FileType php,asp*,cf,mason,eruby,liquid,jst,eelixir     call s:Init()
+  autocmd FileType xml,xslt,xsd,docbk                             call s:Init()
+  autocmd FileType javascript.jsx,jsx,javascriptreact,handlebars  call s:Init()
+  autocmd FileType typescript.tsx,tsx,typescriptreact             call s:Init()
+  autocmd InsertLeave * call s:Leave()
+  autocmd CursorHold * if exists("b:loaded_ragtag") | call s:Leave() | endif
+augroup END
+
+inoremap <silent> <Plug>ragtagHtmlComplete <C-R>=<SID>htmlEn()<CR><C-X><C-O><C-P><C-R>=<SID>htmlDis()<CR><C-N>
+
+" Public interface, for if you have your own filetypes to activate on
+function! RagtagInit()
+  call s:Init()
+endfunction
+
+function! AllmlInit()
+  call s:Init()
+endfunction
+
+function! s:isFiletype(ft)
+  return index(split(&filetype, '\.'), a:ft) >= 0
+endfunction
+
+function! s:Init()
+  let b:loaded_ragtag = 1
+  if s:subtype() == "xml"
+    imap <script> <buffer> <C-X>! <?xml version="1.0" encoding="<C-R>=toupper(<SID>charset())<CR>"?>
+  elseif s:subtype() == "xhtml"
+    imap <script> <buffer> <C-X>! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  else
+    imap <script> <buffer> <C-X>! <!DOCTYPE html>
+  endif
+
+  if empty(&l:define)
+    let &l:define = '\<id=["'']\='
+    let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') . '|setl def='
+  endif
+
+  imap <silent> <buffer> <C-X># <C-R>=<SID>charsetTag()<CR>
+  inoremap <silent> <buffer> <SID>HtmlComplete <C-R>=<SID>htmlEn()<CR><C-X><C-O><C-P><C-R>=<SID>htmlDis()<CR><C-N>
+  imap     <buffer> <C-X>H <SID>HtmlComplete
+  inoremap <silent> <buffer> <C-X>$ <C-R>=<SID>javascriptIncludeTag()<CR>
+  inoremap <silent> <buffer> <C-X>@ <C-R>=<SID>stylesheetTag()<CR>
+  inoremap <silent> <buffer> <C-X><Space> <Esc>ciW<Lt><C-R>"<C-R>=<SID>tagextras()<CR>></<C-R>"><Esc>F<i
+  inoremap <silent> <buffer> <C-X><CR> <Esc>ciW<Lt><C-R>"<C-R>=<SID>tagextras()<CR>><CR></<C-R>"><Esc>O
+  if exists("&omnifunc")
+    inoremap <silent> <buffer> <C-X>/ <Lt>/<C-R>=<SID>htmlEn()<CR><C-X><C-O><C-R>=<SID>htmlDis()<CR><C-R>=<SID>reindent()<CR>
+    if exists(":XMLns")
+      XMLns xhtml10s
+    endif
+  else
+    inoremap <silent> <buffer> <C-X>/ <Lt>/><Left>
+  endif
+  let b:surround_{char2nr("p")} = "<p>\n\t\r\n</p>"
+  let b:surround_{char2nr("d")} = "<div\1div: \r^[^ ]\r &\1>\n\t\r\n</div>"
+  imap <buffer> <C-X><C-_> <C-X>/
+  imap <buffer> <SID>ragtagOopen    <C-X><Lt><Space>
+  imap <buffer> <SID>ragtagOclose   <Space><C-X>><Left><Left>
+  if s:isFiletype('php')
+    inoremap <buffer> <C-X><Lt> <?php
+    inoremap <buffer> <C-X>>    ?>
+    inoremap <buffer> <SID>ragtagOopen    <?php<Space>echo<Space>
+    let b:surround_45 = "<?php \r ?>"
+    let b:surround_61 = "<?php echo \r ?>"
+  elseif s:isFiletype('htmltt') || s:isFiletype('tt2html')
+    inoremap <buffer> <C-X><Lt> [%
+    inoremap <buffer> <C-X>>    %]
+    let b:surround_45  = "[% \r %]"
+    let b:surround_61  = "[% \r %]"
+    if !exists("b:surround_101")
+      let b:surround_101 = "[% \r %]\n[% END %]"
+    endif
+  elseif s:isFiletype('mustache')
+    inoremap <buffer> <SID>ragtagOopen    {{<Space>
+    inoremap <buffer> <SID>ragtagOclose   <Space>}}<Left><Left>
+    inoremap <buffer> <C-X><Lt> {{
+    inoremap <buffer> <C-X>>    }}
+    let b:surround_45 = "{{ \r }}"
+    let b:surround_61 = "{{ \r }}"
+  elseif s:isFiletype('django') || s:isFiletype('htmldjango') || s:isFiletype('liquid') || s:isFiletype('htmljinja')
+    inoremap <buffer> <SID>ragtagOopen    {{<Space>
+    inoremap <buffer> <SID>ragtagOclose   <Space>}}<Left><Left>
+    inoremap <buffer> <C-X><Lt> {%
+    inoremap <buffer> <C-X>>    %}
+    let b:surround_45 = "{% \r %}"
+    let b:surround_61 = "{{ \r }}"
+  elseif s:isFiletype('mason')
+    inoremap <buffer> <SID>ragtagOopen    <&<Space>
+    inoremap <buffer> <SID>ragtagOclose   <Space>&><Left><Left>
+    inoremap <buffer> <C-X><Lt> <%
+    inoremap <buffer> <C-X>>    %>
+    let b:surround_45 = "<% \r %>"
+    let b:surround_61 = "<& \r &>"
+  elseif s:isFiletype('cf')
+    inoremap <buffer> <SID>ragtagOopen    <cfoutput>
+    inoremap <buffer> <SID>ragtagOclose   </cfoutput><Left><C-Left><Left>
+    inoremap <buffer> <C-X><Lt> <cf
+    inoremap <buffer> <C-X>>    >
+    let b:surround_45 = "<cf\r>"
+    let b:surround_61 = "<cfoutput>\r</cfoutput>"
+  elseif s:isFiletype('smarty')
+    inoremap <buffer> <SID>ragtagOopen    {
+    inoremap <buffer> <SID>ragtagOclose   }
+    inoremap <buffer> <C-X><Lt> {
+    inoremap <buffer> <C-X>>    }
+    let b:surround_45 = "{\r}"
+    let b:surround_61 = "{\r}"
+  elseif s:isFiletype('handlebars')
+    inoremap <buffer> <SID>ragtagOopen    {{
+    inoremap <buffer> <SID>ragtagOclose   }}
+    inoremap <buffer> <C-X><Lt> {{
+    inoremap <buffer> <C-X>>    }}
+    let b:surround_45 = "{{\r}}"
+    let b:surround_61 = "{{\r}}"
+  elseif &filetype ==# 'html'
+    inoremap <buffer> <SID>ragtagOopen    <!--#echo var=
+    inoremap <buffer> <C-X><Lt> <!--#
+    inoremap <buffer> <C-X>>    -->
+    let b:surround_45 = "<!--#\r -->"
+    let b:surround_61 = "<!--#echo var=\r -->"
+  else
+    inoremap <buffer> <SID>ragtagOopen    <%=<Space>
+    inoremap <buffer> <C-X><Lt> <%
+    inoremap <buffer> <C-X>>    %>
+    let b:surround_45 = "<% \r %>"
+    let b:surround_61 = "<%= \r %>"
+  endif
+  imap <script> <buffer> <C-X>= <SID>ragtagOopen<SID>ragtagOclose<Left>
+  imap <script> <buffer> <C-X>+ <C-V><NL><Esc>I<SID>ragtagOopen<Esc>A<SID>ragtagOclose<Esc>F<NL>s
+  " <%\n\n%>
+  if s:isFiletype('cf')
+    inoremap <buffer> <C-X>] <cfscript><CR></cfscript><Esc>O
+  elseif s:isFiletype('mason')
+    inoremap <buffer> <C-X>] <%perl><CR></%perl><Esc>O
+  elseif &filetype ==# 'html' || &filetype ==# 'xml' || &filetype ==# 'xhtml'
+    imap     <buffer> <C-X>] <script<C-R>=<SID>javascriptType()<CR>><CR></script><Esc>O
+  else
+    imap     <buffer> <C-X>] <C-X><Lt><CR><C-X>><Esc>O
+  endif
+  " <% %>
+  if s:isFiletype('eruby') || s:isFiletype('jst')
+    inoremap  <buffer> <C-X>- <%<Space><Space>%><Esc>2hi
+    inoremap  <buffer> <C-X>_ <C-V><NL><Esc>I<%<Space><Esc>A<Space>%><Esc>F<NL>s
+  elseif s:isFiletype('cf')
+    inoremap  <buffer> <C-X>- <cf><Left>
+    inoremap  <buffer> <C-X>_ <cfset ><Left>
+  elseif s:isFiletype('smarty')
+    imap <buffer> <C-X>- <C-X><Lt><C-X>><Esc>i
+    imap <buffer> <C-X>_ <C-V><NL><Esc>I<C-X><Lt><Esc>A<C-X>><Esc>F<NL>s
+  else
+    imap <buffer> <C-X>- <C-X><Lt><Space><Space><C-X>><Esc>2hi
+    imap <buffer> <C-X>_ <C-V><NL><Esc>I<C-X><Lt><Space><Esc>A<Space><C-X>><Esc>F<NL>s
+  endif
+  " Comments
+  if s:isFiletype('aspperl') || s:isFiletype('aspvbs')
+    imap <buffer> <C-X>' <C-X><Lt>'<Space><Space><C-X>><Esc>2hi
+    imap <buffer> <C-X>" <C-V><NL><Esc>I<C-X><Lt>'<Space><Esc>A<Space><C-X>><Esc>F<NL>s
+    let b:surround_35 = maparg("<C-X><Lt>","i")."' \r ".maparg("<C-X>>","i")
+  elseif s:isFiletype('jsp') || s:isFiletype('gsp')
+    inoremap <buffer> <C-X>'     <Lt>%--<Space><Space>--%><Esc>4hi
+    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<%--<Space><Esc>A<Space>--%><Esc>F<NL>s
+    let b:surround_35 = "<%-- \r --%>"
+  elseif s:isFiletype('cf')
+    inoremap <buffer> <C-X>'     <Lt>!---<Space><Space>---><Esc>4hi
+    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<!---<Space><Esc>A<Space>---><Esc>F<NL>s
+    setlocal commentstring=<!---%s--->
+    let b:surround_35 = "<!--- \r --->"
+  elseif &filetype ==# 'html' || &filetype ==# 'xml' || &filetype ==# 'xhtml'
+    inoremap <buffer> <C-X>'     <Lt>!--<Space><Space>--><Esc>3hi
+    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<!--<Space><Esc>A<Space>--><Esc>F<NL>s
+    let b:surround_35 = "<!-- \r -->"
+  elseif s:isFiletype('django') || s:isFiletype('htmldjango') || s:isFiletype('htmljinja')
+    inoremap <buffer> <C-X>'     {#<Space><Space>#}<Esc>2hi
+    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<C-X>{#<Space><Esc>A<Space>#}<Esc>F<NL>s
+    let b:surround_35 = "{# \r #}"
+  elseif s:isFiletype('liquid')
+    inoremap <buffer> <C-X>'     {%<Space>comment<Space>%}{%<Space>endcomment<Space>%}<Esc>15hi
+    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<C-X>{%<Space>comment<Space>%}<Esc>A{%<Space>endcomment<Space>%}<Esc>F<NL>s
+    let b:surround_35 = "{% comment %}\r{% endcomment %}"
+  elseif s:isFiletype('smarty')
+    inoremap <buffer> <C-X>'     {*<Space><Space>*}<Esc>2hi
+    inoremap <buffer> <C-X>"     <C-V><NL><Esc>I<C-X>{*<Space><Esc>A<Space>*}<Esc>F<NL>s
+    let b:surround_35 = "{* \r *}"
+  elseif s:isFiletype('handlebars')
+    imap <script> <buffer> <C-X>= <SID>ragtagOopen<SID>ragtagOclose<Left><Left>
+    inoremap  <buffer> <C-X>_ <Esc>ciW{{#<C-R>"}}<CR>{{/<C-R>"}}<Esc>khi
+    inoremap  <buffer> <C-X>' {{!}}<Esc>hi
+    inoremap  <buffer> <C-X>" <C-V><NL><Esc>I{{!<Esc>A}}<Esc>F<NL>s
+  else
+    imap <buffer> <C-X>' <C-X><Lt>#<Space><Space><C-X>><Esc>2hi
+    imap <buffer> <C-X>" <C-V><NL><Esc>I<C-X><Lt>#<Space><Esc>A<Space><C-X>><Esc>F<NL>s
+    let b:surround_35 = maparg("<C-X><Lt>","i")."# \r ".maparg("<C-X>>","i")
+  endif
+  imap <buffer> <C-X>%           <Plug>ragtagUrlEncode
+  imap <buffer> <C-X>&           <Plug>ragtagXmlEncode
+  imap <buffer> <C-V>%           <Plug>ragtagUrlV
+  imap <buffer> <C-V>&           <Plug>ragtagXmlV
+  if !exists("b:did_indent")
+    if s:subtype() == "xml"
+      runtime! indent/xml.vim
+    else
+      runtime! indent/html.vim
+    endif
+  endif
+  if exists("g:html_indent_tags") && g:html_indent_tags !~ '\\|p\>'
+    let g:html_indent_tags = g:html_indent_tags.'\|p\|li\|dt\|dd'
+    let g:html_indent_tags = g:html_indent_tags.'\|article\|aside\|audio\|bdi\|canvas\|command\|datalist\|details\|figcaption\|figure\|footer\|header\|hgroup\|mark\|meter\|nav\|output\|progress\|rp\|rt\|ruby\|section\|summary\|time\|video'
+  endif
+  set indentkeys+=!^F
+  let b:surround_indent = 1
+  silent doautocmd User Ragtag
+  silent doautocmd User ragtag
+endfunction
+
+function! s:Leave()
+  call s:disableescape()
+endfunction
+
+function! s:length(str)
+  return strlen(substitute(a:str,'.','.','g'))
+endfunction
+
+function! s:repeat(str,cnt)
+  let cnt = a:cnt
+  let str = ""
+  while cnt > 0
+    let str = str . a:str
+    let cnt = cnt - 1
+  endwhile
+  return str
+endfunction
+
+function! s:reindent()
+  if (len(&indentexpr) || &cindent)
+    return "\<C-F>"
+  endif
+  return ""
+endfun
+
+function! s:stylesheetType()
+  if s:subtype() == 'html5'
+    return ''
+  else
+    return ' type="text/css"'
+  endif
+endfunction
+
+function! s:stylesheetTag()
+  if !exists("b:ragtag_stylesheet_link_tag")
+    if exists("b:allml_stylesheet_link_tag")
+      let b:ragtag_stylesheet_link_tag = b:allml_stylesheet_link_tag
+    else
+      let b:ragtag_stylesheet_link_tag = '<link rel="stylesheet"'.s:stylesheetType()." href=\"/stylesheets/\r.css\" />"
+    endif
+  endif
+  return s:insertTag(b:ragtag_stylesheet_link_tag)
+endfunction
+
+function! s:javascriptType()
+  if s:subtype() == 'html5'
+    return ''
+  else
+    return ' type="text/javascript"'
+  endif
+endfunction
+
+function! s:javascriptIncludeTag()
+  if !exists("b:ragtag_javascript_include_tag")
+    if exists("b:allml_javascript_include_tag")
+      let b:ragtag_javascript_include_tag = b:allml_javascript_include_tag
+    else
+      let b:ragtag_javascript_include_tag = '<script'.s:javascriptType()." src=\"/javascripts/\r.js\"></script>"
+    endif
+  endif
+  return s:insertTag(b:ragtag_javascript_include_tag)
+endfunction
+
+function! s:insertTag(tag)
+  let tag = a:tag
+  if s:subtype() == "html"
+    let tag = substitute(a:tag,'\s*/>','>','g')
+  endif
+  let before = matchstr(tag,'^.\{-\}\ze\r')
+  let after  = matchstr(tag,'\r\zs\%(.*\r\)\@!.\{-\}$')
+  " middle isn't currently used
+  let middle = matchstr(tag,'\r\zs.\{-\}\ze\r')
+  return before.after.s:repeat("\<Left>",s:length(after))
+endfunction
+
+function! s:htmlEn()
+  let b:ragtag_omni = &l:omnifunc
+  let b:ragtag_isk = &l:isk
+  let b:ragtag_completeopt = &l:completeopt
+  " : is for namespaced xml attributes
+  setlocal omnifunc=htmlcomplete#CompleteTags isk+=: completeopt=
+  return ""
+endfunction
+
+function! s:htmlDis()
+  if exists("b:ragtag_omni")
+    let &l:omnifunc = b:ragtag_omni
+    unlet b:ragtag_omni
+  endif
+  if exists("b:ragtag_isk")
+    let &l:isk = b:ragtag_isk
+    unlet b:ragtag_isk
+  endif
+  if exists("b:ragtag_completeopt")
+    let &l:completeopt = b:ragtag_completeopt
+    unlet b:ragtag_completeopt
+  endif
+  return ""
+endfunction
+
+function! s:subtype()
+  let top = getline(1)."\n".getline(2)
+  if (top =~ '<?xml\>' && &ft !~? 'html') || &ft =~? '^\%(xml\|xsd\|xslt\|docbk\)$'
+    return "xml"
+  elseif top =~? '\<xhtml\>'
+    return 'xhtml'
+  elseif top =~? '<!DOCTYPE html>'
+    return 'html5'
+  elseif top =~? '[^<]\<html\>'
+    return "html"
+  elseif s:isFiletype('xhtml')
+    return "xhtml"
+  elseif exists("b:loaded_ragtag")
+    return "html5"
+  else
+    return ""
+  endif
+endfunction
+
+function! s:closetagback()
+  if s:subtype() == "html"
+    return ">\<Left>"
+  else
+    return " />\<Left>\<Left>\<Left>"
+  endif
+endfunction
+
+function! s:closetag()
+  if s:subtype() == "html"
+    return ">"
+  else
+    return " />"
+  endif
+endfunction
+
+function! s:charset()
+  let enc = &fileencoding
+  if enc == ""
+    let enc = &encoding
+  endif
+  if enc == "latin1"
+    return "ISO-8859-1"
+  elseif enc == ""
+    return "US-ASCII"
+  else
+    return enc
+  endif
+endfunction
+
+function! s:charsetTag()
+  if s:subtype() == 'html5'
+    return '<meta charset="'.s:charset().'"'.s:closetag()
+  else
+    return '<meta http-equiv="Content-Type" content="text/html; charset='.s:charset().'"'.s:closetag()
+  endif
+endfunction
+
+function! s:tagextras()
+  if s:subtype() == "xml"
+    return ""
+  elseif @" == 'html' && s:subtype() == 'xhtml'
+    let lang = "en"
+    if exists("$LANG") && $LANG =~ '^..'
+      let lang = strpart($LANG,0,2)
+    endif
+    return ' xmlns="http://www.w3.org/1999/xhtml" lang="'.lang.'" xml:lang="'.lang.'"'
+  elseif @" == 'style'
+    return s:stylesheetType()
+  elseif @" == 'script'
+    return s:javascriptType()
+  elseif @" == 'table'
+    return ' cellspacing="0"'
+  else
+    return ""
+  endif
+endfunction
+
+inoremap <silent> <SID>urlspace <C-R>=<SID>getinput()=~?'\%([?&]\<Bar>&amp;\)[%a-z0-9._~+-]*=[%a-z0-9._~+-]*$'?'+':'%20'<CR>
+
+function! s:urltab(htmlesc)
+  let line = s:getinput()
+  let g:line = line
+  if line =~ '[^ <>"'."'".']\@<!\w\+$'
+    return ":"
+  elseif line =~ '[^ <>"'."'".']\@<!\w\+:/\=/\=[%a-z0-9._~+-]*$'
+    return "/"
+  elseif line =~? '\%([?&]\|&amp;\)[%a-z0-9._~+-]*$'
+    return "="
+  elseif line =~? '\%([?&]\|&amp;\)[%a-z0-9._~+-]*=[%a-z0-9._~+-]*$'
+    if a:htmlesc || synIDattr(synID(line('.'),col('.')-1,1),"name") =~ 'mlString$'
+      return "&amp;"
+    else
+      return "&"
+    endif
+  elseif line =~ '/$\|\.\w\+$'
+    return "?"
+  else
+    return "/"
+  endif
+endfunction
+
+function! s:toggleurlescape()
+  let htmllayer = 0
+  if exists("b:ragtag_escape_mode")
+    if b:ragtag_escape_mode == "url"
+      call s:disableescape()
+      return ""
+    elseif b:ragtag_escape_mode == "xml"
+      let htmllayer = 1
+    endif
+    call s:disableescape()
+  endif
+  let b:ragtag_escape_mode = "url"
+  imap     <buffer> <BS> <Plug>ragtagBSUrl
+  inoremap <buffer> <CR> %0A
+  imap <script> <buffer> <Space> <SID>urlspace
+  inoremap <buffer> <Tab> &
+  inoremap <buffer> <Bar> %7C
+  if htmllayer
+    inoremap <silent> <buffer> <Tab> <C-R>=<SID>urltab(1)<CR>
+  else
+    inoremap <silent> <buffer> <Tab> <C-R>=<SID>urltab(0)<CR>
+  endif
+  let i = 33
+  while i < 127
+    " RFC3986: reserved = :/?#[]@ !$&'()*+,;=
+    if nr2char(i) =~# '[|=A-Za-z0-9_.~-]'
+    else
+      call s:urlmap(nr2char(i))
+    endif
+    let i = i + 1
+  endwhile
+  return ""
+endfunction
+
+function! s:urlencode(char)
+  let i = 0
+  let repl = ""
+  while i < strlen(a:char)
+    let repl  = repl . printf("%%%02X",char2nr(strpart(a:char,i,1)))
+    let i = i + 1
+  endwhile
+  return repl
+endfunction
+
+function! s:urlmap(char)
+  let repl = s:urlencode(a:char)
+  exe "inoremap <buffer> ".a:char." ".repl
+endfunction
+
+function! s:urlv()
+  return s:urlencode(nr2char(getchar()))
+endfunction
+
+function! s:togglexmlescape()
+  if exists("b:ragtag_escape_mode")
+    if b:ragtag_escape_mode == "xml"
+      call s:disableescape()
+      return ""
+    endif
+    call s:disableescape()
+  endif
+  let b:ragtag_escape_mode = "xml"
+  imap <buffer> <BS> <Plug>ragtagBSXml
+  inoremap <buffer> <Lt> &lt;
+  inoremap <buffer> >    &gt;
+  inoremap <buffer> &    &amp;
+  inoremap <buffer> "    &quot;
+  return ""
+endfunction
+
+function! s:disableescape()
+  if exists("b:ragtag_escape_mode")
+    if b:ragtag_escape_mode == "xml"
+      silent! iunmap <buffer> <BS>
+      silent! iunmap <buffer> <Lt>
+      silent! iunmap <buffer> >
+      silent! iunmap <buffer> &
+      silent! iunmap <buffer> "
+    elseif b:ragtag_escape_mode == "url"
+      silent! iunmap <buffer> <BS>
+      silent! iunmap <buffer> <Tab>
+      silent! iunmap <buffer> <CR>
+      silent! iunmap <buffer> <Space>
+      silent! iunmap <buffer> <Bar>
+      let i = 33
+      while i < 127
+        if nr2char(i) =~# '[|A-Za-z0-9_.~-]'
+        else
+          exe "silent! iunmap <buffer> ".nr2char(i)
+        endif
+        let i = i + 1
+      endwhile
+    endif
+    unlet b:ragtag_escape_mode
+  endif
+endfunction
+
+function! s:getinput()
+  return strpart(getline('.'),0,col('.')-1)
+endfunction
+
+function! s:bspattern(pattern)
+  let start = s:getinput()
+  let match = matchstr(start,'\%('.a:pattern.'\)$')
+  if match == ""
+    return "\<BS>"
+  else
+    return s:repeat("\<BS>",strlen(match))
+  endif
+endfunction
+
+inoremap <silent> <Plug>ragtagBSUrl     <C-R>=<SID>bspattern('%\x\x\=\<Bar>&amp;')<CR>
+inoremap <silent> <Plug>ragtagBSXml     <C-R>=<SID>bspattern('&#\=\w*;\<Bar><[^><]*>\=')<CR>
+inoremap <silent>  <SID>ragtagUrlEncode <C-R>=<SID>toggleurlescape()<CR>
+inoremap <silent>  <SID>ragtagXmlEncode <C-R>=<SID>togglexmlescape()<CR>
+inoremap <silent> <Plug>ragtagUrlEncode <C-R>=<SID>toggleurlescape()<CR>
+inoremap <silent> <Plug>ragtagXmlEncode <C-R>=<SID>togglexmlescape()<CR>
+inoremap <silent> <Plug>ragtagUrlV      <C-R>=<SID>urlv()<CR>
+inoremap <silent> <Plug>ragtagXmlV      <C-R>="&#".getchar().";"<CR>
+
+if exists("g:ragtag_global_maps")
+  imap     <C-X>H      <Plug>ragtagHtmlComplete
+  imap     <C-X>/    </<Plug>ragtagHtmlComplete
+  imap     <C-X>%      <Plug>ragtagUrlEncode
+  imap     <C-X>&      <Plug>ragtagXmlEncode
+  imap     <C-V>%      <Plug>ragtagUrlV
+  imap     <C-V>&      <Plug>ragtagXmlV
+endif

backup/plugin/rainbow.vim

@@ -0,0 +1,163 @@
+"==============================================================================
+"Script Title: rainbow parentheses improved
+"Script Version: 2.52
+"Author: luochen1990, Francisco Lopes
+"Last Edited: 2013 Sep 12
+
+" By default, use rainbow colors copied from gruvbox colorscheme (https://github.com/morhetz/gruvbox).
+" They are generally good for both light and dark colorschemes.
+let s:guifgs = exists('g:rainbow_guifgs')? g:rainbow_guifgs : [
+            \ '#458588',
+            \ '#b16286',
+            \ '#cc241d',
+            \ '#d65d0e',
+            \ '#458588',
+            \ '#b16286',
+            \ '#cc241d',
+            \ '#d65d0e',
+            \ '#458588',
+            \ '#b16286',
+            \ '#cc241d',
+            \ '#d65d0e',
+            \ '#458588',
+            \ '#b16286',
+            \ '#cc241d',
+            \ '#d65d0e',
+            \ ]
+
+let s:ctermfgs = exists('g:rainbow_ctermfgs')? g:rainbow_ctermfgs : [
+            \ 'brown',
+            \ 'Darkblue',
+            \ 'darkgray',
+            \ 'darkgreen',
+            \ 'darkcyan',
+            \ 'darkred',
+            \ 'darkmagenta',
+            \ 'brown',
+            \ 'gray',
+            \ 'black',
+            \ 'darkmagenta',
+            \ 'Darkblue',
+            \ 'darkgreen',
+            \ 'darkcyan',
+            \ 'darkred',
+            \ 'red',
+            \ ]
+
+let s:max = has('gui_running')? len(s:guifgs) : len(s:ctermfgs)
+
+func! rainbow#load(...)
+    if exists('b:loaded')
+        cal rainbow#clear()
+    endif
+
+    if a:0 >= 1
+        let b:loaded = a:1
+    elseif &ft == 'cpp'
+        let b:loaded = [
+                    \ ['(', ')'],
+                    \ ['\[', '\]'],
+                    \ ['{', '}'],
+                    \ ['\v%(<operator\_s*)@<!%(%(\i|^\_s*|template\_s*)@<=\<[<#=]@!|\<@<!\<[[:space:]<#=]@!)', '\v%(-)@<!\>']
+                    \ ]
+    elseif &ft == 'rust' || &ft == 'cs' || &ft == 'java'
+        let b:loaded = [
+                    \ ['(', ')'],
+                    \ ['\[', '\]'],
+                    \ ['{', '}'],
+                    \ ['\v%(\i|^\_s*)@<=\<[<#=]@!|\<@<!\<[[:space:]<#=]@!', '\v%(-)@<!\>']
+                    \ ]
+    else
+        let b:loaded = [ ['(', ')'], ['\[', '\]'], ['{', '}'] ]
+    endif
+
+    let b:operators = (a:0 < 2) ? '"\v[{\[(<_"''`#*/>)\]}]@![[:punct:]]|\*/@!|/[/*]@!|\<#@!|#@<!\>"' : a:2
+
+    if b:operators != ''
+        exe 'syn match op_lv0 '.b:operators
+        let cmd = 'syn match %s %s containedin=%s contained'
+        for [left , right] in b:loaded
+            for each in range(1, s:max)
+                exe printf(cmd, 'op_lv'.each, b:operators, 'lv'.each)
+            endfor
+        endfor
+    endif
+
+    let str = 'TOP'
+    for each in range(1, s:max)
+        let str .= ',lv'.each
+    endfor
+
+    let cmd = 'syn region %s matchgroup=%s start=+%s+ end=+%s+ containedin=%s contains=%s,%s,@Spell fold'
+    for [left , right] in b:loaded
+        for each in range(1, s:max)
+            exe printf(cmd, 'lv'.each, 'lv'.each.'c', left, right, 'lv'.(each % s:max + 1), str, 'op_lv'.each)
+        endfor
+    endfor
+
+    cal rainbow#activate()
+endfunc
+
+func! rainbow#clear()
+    if exists('b:loaded')
+        unlet b:loaded
+        exe 'syn clear op_lv0'
+        for each in range(1 , s:max)
+            exe 'syn clear lv'.each
+            exe 'syn clear op_lv'.each
+        endfor
+    endif
+endfunc
+
+func! rainbow#activate()
+    if !exists('b:loaded')
+        cal rainbow#load()
+    endif
+    exe 'hi default op_lv0 ctermfg='.s:ctermfgs[-1].' guifg='.s:guifgs[-1]
+    for id in range(1 , s:max)
+        let ctermfg = s:ctermfgs[(s:max - id) % len(s:ctermfgs)]
+        let guifg = s:guifgs[(s:max - id) % len(s:guifgs)]
+        exe 'hi default lv'.id.'c ctermfg='.ctermfg.' guifg='.guifg
+        exe 'hi default op_lv'.id.' ctermfg='.ctermfg.' guifg='.guifg
+    endfor
+    exe 'syn sync fromstart'
+    let b:active = 'active'
+endfunc
+
+func! rainbow#inactivate()
+    if exists('b:active')
+        exe 'hi clear op_lv0'
+        for each in range(1, s:max)
+            exe 'hi clear lv'.each.'c'
+            exe 'hi clear op_lv'.each.''
+        endfor
+        exe 'syn sync fromstart'
+        unlet b:active
+    endif
+endfunc
+
+func! rainbow#toggle()
+    if exists('b:active')
+        cal rainbow#inactivate()
+    else
+        cal rainbow#activate()
+    endif
+endfunc
+
+if exists('g:rainbow_active') && g:rainbow_active
+    if exists('g:rainbow_load_separately')
+        let ps = g:rainbow_load_separately
+        for i in range(len(ps))
+            if len(ps[i]) < 3
+                exe printf('au syntax,colorscheme %s call rainbow#load(ps[%d][1])' , ps[i][0] , i)
+            else
+                exe printf('au syntax,colorscheme %s call rainbow#load(ps[%d][1] , ps[%d][2])' , ps[i][0] , i , i)
+            endif
+        endfor
+    else
+        au syntax,colorscheme * call rainbow#load()
+    endif
+endif
+
+command! RainbowToggle call rainbow#toggle()
+command! RainbowLoad call rainbow#load()

backup/plugin/rainbow_main.vim

@@ -0,0 +1,12 @@
+" Copyright 2013 LuoChen (luochen1990@gmail.com). Licensed under the Apache License 2.0.
+
+if exists('s:loaded') || !(exists('g:rainbow_active') || exists('g:rainbow_conf')) | finish | endif | let s:loaded = 1
+
+command! RainbowToggle call rainbow_main#toggle()
+command! RainbowToggleOn call rainbow_main#load()
+command! RainbowToggleOff call rainbow_main#clear()
+
+if (exists('g:rainbow_active') && g:rainbow_active)
+	auto syntax * call rainbow_main#load()
+	auto colorscheme * call rainbow_main#load()
+endif

colors/codedark.vim

@@ -98,8 +98,8 @@ let s:cdDiffRedLightLight = {'gui': '#FB0101', 'cterm': s:cterm08, 'cterm256': '
 let s:cdDiffGreenDark = {'gui': '#373D29', 'cterm': s:cterm0B, 'cterm256': '237'}
 let s:cdDiffGreenLight = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'}
 
-let s:cdSearchCurrent = {'gui': '#49545F', 'cterm': s:cterm09, 'cterm256': '236'}
+let s:cdSearchCurrent = {'gui': '#4B5632', 'cterm': s:cterm09, 'cterm256': '58'} 
-let s:cdSearch = {'gui': '#4C4E50', 'cterm': s:cterm0A, 'cterm256': '236'}
+let s:cdSearch = {'gui': '#264F78', 'cterm': s:cterm03, 'cterm256': '24'}
 
 " Syntax colors:
 
@@ -113,7 +113,7 @@ let s:cdBlue = {'gui': '#569CD6', 'cterm': s:cterm0D, 'cterm256': '75'}
 let s:cdDarkBlue = {'gui': '#223E55', 'cterm': s:cterm0D, 'cterm256': '73'}
 let s:cdLightBlue = {'gui': '#9CDCFE', 'cterm': s:cterm0C, 'cterm256': '117'}
 if g:codedark_conservative | let s:cdLightBlue = s:cdFront | endif
-let s:cdGreen = {'gui': '#608B4E', 'cterm': s:cterm0B, 'cterm256': '65'}
+let s:cdGreen = {'gui': '#6A9955', 'cterm': s:cterm0B, 'cterm256': '65'}
 let s:cdBlueGreen = {'gui': '#4EC9B0', 'cterm': s:cterm0F, 'cterm256': '43'}
 let s:cdLightGreen = {'gui': '#B5CEA8', 'cterm': s:cterm09, 'cterm256': '151'}
 let s:cdRed = {'gui': '#F44747', 'cterm': s:cterm08, 'cterm256': '203'}
@@ -158,9 +158,6 @@ call <sid>hi('PmenuThumb', {}, s:cdPopupFront, 'none', {})
 call <sid>hi('Question', s:cdBlue, s:cdBack, 'none', {})
 call <sid>hi('Search', s:cdNone, s:cdSearch, 'none', {})
 call <sid>hi('SpecialKey', s:cdBlue, s:cdNone, 'none', {})
-call <sid>hi('SpellBad', s:cdNone, s:cdNone, 'undercurl', {})
-call <sid>hi('SpellCap', s:cdNone, s:cdNone, 'undercurl', {})
-call <sid>hi('SpellLocal', s:cdNone, s:cdNone, 'undercurl', {})
 call <sid>hi('StatusLine', s:cdFront, s:cdLeftMid, 'none', {})
 call <sid>hi('StatusLineNC', s:cdFront, s:cdLeftDark, 'none', {})
 call <sid>hi('TabLine', s:cdFront, s:cdTabOther, 'none', {})
@@ -203,7 +200,7 @@ call <sid>hi('StorageClass', s:cdBlue, {}, 'none', {})
 call <sid>hi('Structure', s:cdBlue, {}, 'none', {})
 call <sid>hi('Typedef', s:cdBlue, {}, 'none', {})
 
-call <sid>hi('Special', s:cdFront, {}, 'none', {})
+call <sid>hi('Special', s:cdYellowOrange, {}, 'none', {})
 call <sid>hi('SpecialChar', s:cdFront, {}, 'none', {})
 call <sid>hi('Tag', s:cdFront, {}, 'none', {})
 call <sid>hi('Delimiter', s:cdFront, {}, 'none', {})
@@ -219,6 +216,11 @@ call <sid>hi('Error', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
 
 call <sid>hi('Todo', s:cdNone, s:cdLeftMid, 'none', {})
 
+call <sid>hi('SpellBad', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
+call <sid>hi('SpellCap', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
+call <sid>hi('SpellRare', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
+call <sid>hi('SpellLocal', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
+
 " Markdown:
 call <sid>hi('markdownBold', s:cdBlue, {}, 'bold', {})
 call <sid>hi('markdownCode', s:cdOrange, {}, 'none', {})
@@ -244,6 +246,16 @@ call <sid>hi('htmlTagName', s:cdBlue, {}, 'none', {})
 call <sid>hi('htmlSpecialTagName', s:cdBlue, {}, 'none', {})
 call <sid>hi('htmlArg', s:cdLightBlue, {}, 'none', {})
 
+" PHP:
+call <sid>hi('phpStaticClasses', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('phpMethod', s:cdYellow, {}, 'none', {})
+call <sid>hi('phpClass', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('phpFunction', s:cdYellow, {}, 'none', {})
+call <sid>hi('phpInclude', s:cdBlue, {}, 'none', {})
+call <sid>hi('phpUseClass', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('phpRegion', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('phpMethodsVar', s:cdLightBlue, {}, 'none', {})
+
 " CSS:
 call <sid>hi('cssBraces', s:cdFront, {}, 'none', {})
 call <sid>hi('cssInclude', s:cdPink, {}, 'none', {})
@@ -264,12 +276,16 @@ call <sid>hi('cssVendor', s:cdOrange, {}, 'none', {})
 call <sid>hi('cssValueNumber', s:cdOrange, {}, 'none', {})
 call <sid>hi('cssValueLength', s:cdOrange, {}, 'none', {})
 call <sid>hi('cssUnitDecorators', s:cdOrange, {}, 'none', {})
+call <sid>hi('cssStyle', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('cssImportant', s:cdBlue, {}, 'none', {})
 
 " JavaScript:
 call <sid>hi('jsVariableDef', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('jsFuncArgs', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('jsFuncBlock', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('jsRegexpString', s:cdLightRed, {}, 'none', {})
 call <sid>hi('jsThis', s:cdBlue, {}, 'none', {})
+call <sid>hi('jsOperatorKeyword', s:cdBlue, {}, 'none', {})
 call <sid>hi('jsDestructuringBlock', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('jsObjectKey', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('jsGlobalObjects', s:cdBlueGreen, {}, 'none', {})
@@ -279,9 +295,80 @@ call <sid>hi('jsClassKeyword', s:cdBlue, {}, 'none', {})
 call <sid>hi('jsExtendsKeyword', s:cdBlue, {}, 'none', {})
 call <sid>hi('jsExportDefault', s:cdPink, {}, 'none', {})
 call <sid>hi('jsFuncCall', s:cdYellow, {}, 'none', {})
-call <sid>hi('jsObjectKey', s:cdYellow, {}, 'none', {})
 call <sid>hi('jsObjectValue', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('jsParen', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('jsObjectProp', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('jsIfElseBlock', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('jsParenIfElse', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('jsSpreadOperator', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('jsSpreadExpression', s:cdLightBlue, {}, 'none', {})
+
+" Typescript:
+call <sid>hi('typescriptLabel', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptExceptions', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptBraces', s:cdFront, {}, 'none', {})
+call <sid>hi('typescriptEndColons', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptParens', s:cdFront, {}, 'none', {})
+call <sid>hi('typescriptDocTags', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptDocComment', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptLogicSymbols', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptImport', s:cdPink, {}, 'none', {})
+call <sid>hi('typescriptBOM', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptVariableDeclaration', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptVariable', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptExport', s:cdPink, {}, 'none', {})
+call <sid>hi('typescriptAliasDeclaration', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptAliasKeyword', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptClassName', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptAccessibilityModifier', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptOperator', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptArrowFunc', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptMethodAccessor', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptMember', s:cdYellow, {}, 'none', {})
+call <sid>hi('typescriptTypeReference', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptDefault', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptTemplateSB', s:cdYellowOrange, {}, 'none', {})
+call <sid>hi('typescriptArrowFuncArg', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptParamImpl', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptFuncComma', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptCastKeyword', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptCall', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptCase', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptReserved', s:cdPink, {}, 'none', {})
+call <sid>hi('typescriptDefault', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptDecorator', s:cdYellow, {}, 'none', {})
+call <sid>hi('typescriptPredefinedType', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptClassHeritage', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptClassExtends', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptClassKeyword', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptBlock', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptDOMDocProp', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptTemplateSubstitution', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptClassBlock', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptFuncCallArg', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptIndexExpr', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptConditionalParen', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptArray', s:cdYellow, {}, 'none', {})
+call <sid>hi('typescriptES6SetProp', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptObjectLiteral', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptTypeParameter', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptEnumKeyword', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptEnum', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptLoopParen', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptParenExp', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptModule', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('typescriptAmbientDeclaration', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptModule', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptFuncTypeArrow', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptInterfaceHeritage', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptInterfaceName', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptInterfaceKeyword', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptInterfaceExtends', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptGlobal', s:cdBlueGreen, {}, 'none', {})
+call <sid>hi('typescriptAsyncFuncKeyword', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptFuncKeyword', s:cdBlue, {}, 'none', {})
+call <sid>hi('typescriptGlobalMethod', s:cdYellow, {}, 'none', {})
+call <sid>hi('typescriptPromiseMethod', s:cdYellow, {}, 'none', {})
 
 " XML:
 call <sid>hi('xmlTag', s:cdBlueGreen, {}, 'none', {})
@@ -300,11 +387,11 @@ call <sid>hi('goImport', s:cdBlue, {}, 'none', {})
 call <sid>hi('goVar', s:cdBlue, {}, 'none', {})
 call <sid>hi('goConst', s:cdBlue, {}, 'none', {})
 call <sid>hi('goStatement', s:cdPink, {}, 'none', {})
-call <sid>hi('goType', s:cdBlue, {}, 'none', {})
+call <sid>hi('goType', s:cdBlueGreen, {}, 'none', {})
-call <sid>hi('goSignedInts', s:cdBlue, {}, 'none', {})
+call <sid>hi('goSignedInts', s:cdBlueGreen, {}, 'none', {})
-call <sid>hi('goUnsignedInts', s:cdBlue, {}, 'none', {})
+call <sid>hi('goUnsignedInts', s:cdBlueGreen, {}, 'none', {})
-call <sid>hi('goFloats', s:cdBlue, {}, 'none', {})
+call <sid>hi('goFloats', s:cdBlueGreen, {}, 'none', {})
-call <sid>hi('goComplexes', s:cdBlue, {}, 'none', {})
+call <sid>hi('goComplexes', s:cdBlueGreen, {}, 'none', {})
 call <sid>hi('goBuiltins', s:cdYellow, {}, 'none', {})
 call <sid>hi('goBoolean', s:cdBlue, {}, 'none', {})
 call <sid>hi('goPredefinedIdentifiers', s:cdBlue, {}, 'none', {})
@@ -316,7 +403,7 @@ call <sid>hi('goTypeName', s:cdBlueGreen, {}, 'none', {})
 call <sid>hi('goVarAssign', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('goVarDefs', s:cdLightBlue, {}, 'none', {})
 call <sid>hi('goReceiver', s:cdFront, {}, 'none', {})
-call <sid>hi('goReceiverType', s:cdDarkBlue, {}, 'none', {})
+call <sid>hi('goReceiverType', s:cdFront, {}, 'none', {})
 call <sid>hi('goFunctionCall', s:cdYellow, {}, 'none', {})
 call <sid>hi('goMethodCall', s:cdYellow, {}, 'none', {})
 call <sid>hi('goSingleDecl', s:cdLightBlue, {}, 'none', {})
@@ -356,3 +443,23 @@ call <sid>hi('gitcommitOverflow', s:cdRed, {}, 'none', {})
 call <sid>hi('gitcommitSummary', s:cdPink, {}, 'none', {})
 call <sid>hi('gitcommitBlank', s:cdPink, {}, 'none', {})
 
+" Lua:
+call <sid>hi('luaFuncCall', s:cdYellow, {}, 'none', {})
+call <sid>hi('luaFuncArgName', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('luaFuncKeyword', s:cdPink, {}, 'none', {})
+call <sid>hi('luaLocal', s:cdPink, {}, 'none', {})
+call <sid>hi('luaBuiltIn', s:cdBlue, {}, 'none', {})
+
+" SH:
+call <sid>hi('shDeref', s:cdLightBlue, {}, 'none', {})
+call <sid>hi('shVariable', s:cdLightBlue, {}, 'none', {})
+
+" SQL:
+call <sid>hi('sqlKeyword', s:cdPink, {}, 'none', {})
+call <sid>hi('sqlFunction', s:cdYellowOrange, {}, 'none', {})
+call <sid>hi('sqlOperator', s:cdPink, {}, 'none', {})
+
+" YAML:
+call <sid>hi('yamlKey', s:cdBlue, {}, 'none', {})
+call <sid>hi('yamlConstant', s:cdBlue, {}, 'none', {})
+

pack/plugins/opt/vim-testalgo

@@ -0,0 +1 @@
+/home/rick/Documents/projets/testalgo/vim-testalgo/

pack/plugins/start/auto-pairs

@@ -0,0 +1 @@
+Subproject commit 39f06b873a8449af8ff6a3eee716d3da14d63a76

pack/plugins/start/rainbow

@@ -0,0 +1 @@
+Subproject commit 4d15633cdaf61602e1d9fd216a77fc02e0881b2d

pack/plugins/start/vim-doge

@@ -0,0 +1 @@
+Subproject commit 9519bd95e291c6d94bc63c6b58470fe1a0fdede8

pack/plugins/start/vim-endwise

@@ -0,0 +1 @@
+Subproject commit 97180a73ad26e1dcc1eebe8de201f7189eb08344

pack/plugins/start/vim-markdown

@@ -0,0 +1 @@
+Subproject commit 8e5d86f7b85234d3d1b4207dceebc43a768ed5d4

vimrc

@@ -1,14 +1,14 @@
-"source ~/.vim/vimrc.bepo
+" source ~/.vim/vimrc.bepo
 
 " load plugins
-execute pathogen#infect()
+" execute pathogen#infect()
 filetype plugin indent on
 
 let mapleader=' '
 let g:rainbow_active = 1
 
 colorscheme codedark
-syntax enable
+syntax on
 
 set tabstop=4
 set softtabstop=4
@@ -31,6 +31,7 @@ set showmatch           " highlight matching [{()}]
 set incsearch           " search as characters are entered
 set hlsearch            " highlight matches
 
-" parametre pour la taille des espaces
+" parametre pour la taille des espaces selon le langage
 autocmd Filetype java setlocal expandtab tabstop=8 shiftwidth=8 softtabstop=8
 autocmd Filetype javascript setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2
+autocmd Filetype c setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2