Update Plug version
This commit is contained in:
		| @@ -22,7 +22,7 @@ | |||||||
| "   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' | "   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' | ||||||
| " | " | ||||||
| "   " On-demand loading | "   " On-demand loading | ||||||
| "   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' } | "   Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' } | ||||||
| "   Plug 'tpope/vim-fireplace', { 'for': 'clojure' } | "   Plug 'tpope/vim-fireplace', { 'for': 'clojure' } | ||||||
| " | " | ||||||
| "   " Using a non-default branch | "   " Using a non-default branch | ||||||
| @@ -242,6 +242,8 @@ function! plug#begin(...) | |||||||
|     let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) |     let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) | ||||||
|   elseif exists('g:plug_home') |   elseif exists('g:plug_home') | ||||||
|     let home = s:path(g:plug_home) |     let home = s:path(g:plug_home) | ||||||
|  |   elseif has('nvim') | ||||||
|  |     let home = stdpath('data') . '/plugged' | ||||||
|   elseif !empty(&rtp) |   elseif !empty(&rtp) | ||||||
|     let home = s:path(split(&rtp, ',')[0]) . '/plugged' |     let home = s:path(split(&rtp, ',')[0]) . '/plugged' | ||||||
|   else |   else | ||||||
| @@ -350,7 +352,7 @@ function! plug#end() | |||||||
|   endif |   endif | ||||||
|   let lod = { 'ft': {}, 'map': {}, 'cmd': {} } |   let lod = { 'ft': {}, 'map': {}, 'cmd': {} } | ||||||
|  |  | ||||||
|   if exists('g:did_load_filetypes') |   if get(g:, 'did_load_filetypes', 0) | ||||||
|     filetype off |     filetype off | ||||||
|   endif |   endif | ||||||
|   for name in g:plugs_order |   for name in g:plugs_order | ||||||
| @@ -405,7 +407,7 @@ function! plug#end() | |||||||
|  |  | ||||||
|   for [map, names] in items(lod.map) |   for [map, names] in items(lod.map) | ||||||
|     for [mode, map_prefix, key_prefix] in |     for [mode, map_prefix, key_prefix] in | ||||||
|           \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] |           \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] | ||||||
|       execute printf( |       execute printf( | ||||||
|       \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>', |       \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>', | ||||||
|       \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) |       \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) | ||||||
| @@ -2619,26 +2621,34 @@ function! s:preview_commit() | |||||||
|  |  | ||||||
|   let sha = matchstr(getline('.'), '^  \X*\zs[0-9a-f]\{7,9}') |   let sha = matchstr(getline('.'), '^  \X*\zs[0-9a-f]\{7,9}') | ||||||
|   if empty(sha) |   if empty(sha) | ||||||
|     return |     let name = matchstr(getline('.'), '^- \zs[^:]*\ze:$') | ||||||
|  |     if empty(name) | ||||||
|  |       return | ||||||
|  |     endif | ||||||
|  |     let title = 'HEAD@{1}..' | ||||||
|  |     let command = 'git diff --no-color HEAD@{1}' | ||||||
|  |   else | ||||||
|  |     let title = sha | ||||||
|  |     let command = 'git show --no-color --pretty=medium '.sha | ||||||
|  |     let name = s:find_name(line('.')) | ||||||
|   endif |   endif | ||||||
|  |  | ||||||
|   let name = s:find_name(line('.')) |  | ||||||
|   if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) |   if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) | ||||||
|     return |     return | ||||||
|   endif |   endif | ||||||
|  |  | ||||||
|   if exists('g:plug_pwindow') && !s:is_preview_window_open() |   if exists('g:plug_pwindow') && !s:is_preview_window_open() | ||||||
|     execute g:plug_pwindow |     execute g:plug_pwindow | ||||||
|     execute 'e' sha |     execute 'e' title | ||||||
|   else |   else | ||||||
|     execute 'pedit' sha |     execute 'pedit' title | ||||||
|     wincmd P |     wincmd P | ||||||
|   endif |   endif | ||||||
|   setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable |   setlocal previewwindow filetype=git buftype=nofile bufhidden=wipe nobuflisted modifiable | ||||||
|   let batchfile = '' |   let batchfile = '' | ||||||
|   try |   try | ||||||
|     let [sh, shellcmdflag, shrd] = s:chsh(1) |     let [sh, shellcmdflag, shrd] = s:chsh(1) | ||||||
|     let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha |     let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && '.command | ||||||
|     if s:is_win |     if s:is_win | ||||||
|       let [batchfile, cmd] = s:batchfile(cmd) |       let [batchfile, cmd] = s:batchfile(cmd) | ||||||
|     endif |     endif | ||||||
| @@ -2764,9 +2774,9 @@ function! s:snapshot(force, ...) abort | |||||||
|   1 |   1 | ||||||
|   let anchor = line('$') - 3 |   let anchor = line('$') - 3 | ||||||
|   let names = sort(keys(filter(copy(g:plugs), |   let names = sort(keys(filter(copy(g:plugs), | ||||||
|         \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) |         \'has_key(v:val, "uri") && isdirectory(v:val.dir)'))) | ||||||
|   for name in reverse(names) |   for name in reverse(names) | ||||||
|     let sha = s:git_revision(g:plugs[name].dir) |     let sha = has_key(g:plugs[name], 'commit') ? g:plugs[name].commit : s:git_revision(g:plugs[name].dir) | ||||||
|     if !empty(sha) |     if !empty(sha) | ||||||
|       call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) |       call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) | ||||||
|       redraw |       redraw | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user