diff --git a/pack/ttm/opt/prv/doc/prv.txt b/pack/ttm/opt/prv/doc/prv.txt index 65bfa9a..3309ad9 100644 --- a/pack/ttm/opt/prv/doc/prv.txt +++ b/pack/ttm/opt/prv/doc/prv.txt @@ -47,7 +47,7 @@ CONTENTS *prv-index* *prv-plugins* PRV is a package, which currently consists of these plugins: -* |prv|, the core: naviation strategies of files, tags and Vim interface. +* |prv|, the core: navigation strategies of files, tags and Vim interface. * |aa|, algorithmic autoregulation: periodic note-taking for dedication tracking. * |realcolors|, 24 bit true color for Vim: on-the-fly tweak your color scheme, diff --git a/pack/ttm/opt/prv/plugin/prv.vim b/pack/ttm/opt/prv/plugin/prv.vim index 8426219..90a3ee4 100644 --- a/pack/ttm/opt/prv/plugin/prv.vim +++ b/pack/ttm/opt/prv/plugin/prv.vim @@ -8,6 +8,9 @@ " FAPESP (project 2017/05838-3) " Ricardo Fabbri (PhD, IPRJ/UERJ) +let s:mapleader = exists('g:mapleader') ? g:mapleader : "\\" +let s:maplocalleader = exists('g:maplocalleader') ? g:maplocalleader : "\\" + " Load Once: {{{1 if exists("g:loaded_prvplugin") && (exists("g:prv_not_hacking") || exists("g:prv_not_hacking_all")) finish @@ -43,15 +46,17 @@ fu! PRVLeaderHelper(...) endf fu! PRVDeclareLeader(plug) cal assert_equal(type(a:plug), 1, 'only strings are accepted as arg to PRVDeclareLeader(plug)') - let g:prv.leaders[a:plug] = [g:mapleader, g:maplocalleader] + let g:prv.leaders[a:plug] = [s:mapleader, s:maplocalleader] " exe 'let g:'.a:plug.'_keepleaders = [g:mapleader, g:maplocalleader]' if has_key(g:prvset.leaders, a:plug) let g:mapleader = g:prvset.leaders[a:plug][0] let g:maplocalleader = g:prvset.leaders[a:plug][1] + let [s:mapleader, s:maplocalleader] = [g:mapleader, g:maplocalleader] en endf fu! PRVRestoreLeader(plug) let [g:mapleader, g:maplocalleader] = g:prv.leaders[a:plug] + let [s:mapleader, s:maplocalleader] = [g:mapleader, g:maplocalleader] endf " insert one char {{{2 @@ -275,7 +280,7 @@ fu! DecryptVimwiki() " encryption {{{2 if &ft == 'vimwiki' "ec 'found vimwiki' " call input('1 Press any key to continue') - e + e " call input('3 Press any key to continue') setl key= " call input('4 Press any key to continue') @@ -657,8 +662,10 @@ fu! PRVMkMappings(str) " {{{3 en if a:str =~# 'a' " {{{4 auxleader - let l:foo = g:mapleader - let g:mapleader = g:prvset.leaders.prv[2] + if exists('g:prvset.leaders.prv') + let l:foo = s:mapleader + let g:mapleader = g:prvset.leaders.prv[2] + en nn a :exec "normal li".nr2char(getchar())."\e" nn A :cal InsertAfterAfter() nn f :cal system("wmctrl -ir " . v:windowid . " -b toggle,fullscreen") @@ -688,7 +695,9 @@ fu! PRVMkMappings(str) " {{{3 nn ep :PRVRedir v exec "normal g\"xf"Dh nn eP :PRVRedir t exec "normal g\"xf"Dh nn ep :PRVRedir n exec "normal g\"xf"Dh - let g:mapleader = l:foo + if exists('g:prvset.leaders.prv') + let g:mapleader = l:foo + en en endf