Skip to content

Prv leader fix #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rfabbri wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prv leader fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86bdf64
prv loads with default leaders
rfabbri Apr 5, 2018
a848958
prv correctly updates leaders for default case
rfabbri Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pack/ttm/opt/prv/doc/prv.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
19 changes: 14 additions & 5 deletions pack/ttm/opt/prv/plugin/prv.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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 <leader>a :exec "normal li".nr2char(getchar())."\e"<CR>
nn <leader>A :cal InsertAfterAfter()<CR>
nn <leader>f :cal system("wmctrl -ir " . v:windowid . " -b toggle,fullscreen")<CR>
Expand Down Expand Up @@ -688,7 +695,9 @@ fu! PRVMkMappings(str) " {{{3
nn <leader>ep :PRVRedir v exec "normal g\<C-G>"<CR>xf"Dh
nn <leader>eP :PRVRedir t exec "normal g\<C-G>"<CR>xf"Dh
nn <leader>e<leader>p :PRVRedir n exec "normal g\<C-G>"<CR>xf"Dh
let g:mapleader = l:foo
if exists('g:prvset.leaders.prv')
let g:mapleader = l:foo
en
en
endf

Expand Down