Squashed '.vim/bundle/password-store/' changes from dc759ab3..474a7dfc

[etc/vim.git] / ftplugin / pass.vim

diff --git a/ftplugin/pass.vim b/ftplugin/pass.vim
index f728b00b7dbe0dcf79d552888622d8ab42c1637f..5c8b41e38db7dfb8a10db532f6824612a8461449 100644 (file)
--- a/ftplugin/pass.vim
+++ b/ftplugin/pass.vim
@@ -1,10 +1,14 @@
-if exists('did_pass_ftplugin') || &compatible  || version < 700
+if exists('did_pass_ftplugin') || &compatible  || v:version < 700

     finish
 endif
 let g:did_pass = 'did_pass_ftplugin'
 let s:save_cpo = &cpoptions
     finish
 endif
 let g:did_pass = 'did_pass_ftplugin'
 let s:save_cpo = &cpoptions

-set compatible&vim
+set cpoptions&vim

 
 

+nmap <buffer> <Plug>rotate_password :call password_store#replace()<Cr>
+if ! hasmapto( '\<Plug>rotate_password', 'n')
+    nmap <C-X> <Plug>rotate_password
+endif

 
 setlocal nospell
 
 
 setlocal nospell
 


@@ -36,15 +40,15 @@ endfunction
 call s:CheckArgsRedact()
 
 function! s:reveal_pass() abort
 call s:CheckArgsRedact()
 
 function! s:reveal_pass() abort

-    highlight! link password_store_password Comment
+    setlocal syntax=pass

 endfunction
 command! Reveal call <SID>reveal_pass()
 
 function! s:conceal_pass() abort
 endfunction
 command! Reveal call <SID>reveal_pass()
 
 function! s:conceal_pass() abort

-    highlight! password_store_password guifg=DarkGray guibg=DarkGray ctermfg=8 ctermbg=8
+    setlocal syntax=pass.obfuscated

 endfunction
 command! Conceal call <SID>conceal_pass()
 endfunction
 command! Conceal call <SID>conceal_pass()

-normal GG
+normal! GG

 
 " Cleanup at end
 let &cpoptions = s:save_cpo
 
 " Cleanup at end
 let &cpoptions = s:save_cpo