Fix: count ignored when looking up diary frequency

When calling VimwikiMakeYesterdayDiary (or Tomorrow) the wiki_nr is
looked up by vimwiki#diary#diary_date_link without access to the passed
count, which would result in the creation of the file in the correct
place, but with the diary_frequency of another wiki. Modify
vimwiki#diary#diary_date_link to take a possible third argument as the
wiki_nr+1 and modify the commands to pass <count> as the third argument.

Fixes: #1365
This commit is contained in:
Bence Ferdinandy
2023-08-28 14:16:51 +02:00
committed by NobleRat
parent 65575fb103
commit 5d86b625f5
3 changed files with 17 additions and 9 deletions
+5 -1
View File
@@ -37,8 +37,12 @@ endfunction
function! vimwiki#diary#diary_date_link(...) abort function! vimwiki#diary#diary_date_link(...) abort
" Return: <String> date " Return: <String> date
if a:0 > 2
" user supply wiki number as 1 indexed, not 0 indexed
let wiki_nr = a:3 - 1
else
let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr') let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
endif
if wiki_nr < 0 " this happens when called outside a wiki buffer if wiki_nr < 0 " this happens when called outside a wiki buffer
let wiki_nr = 0 let wiki_nr = 0
endif endif
+4
View File
@@ -4005,6 +4005,7 @@ Contributors and their Github usernames in roughly chronological order:
- Julian Prein (@druckdev) - Julian Prein (@druckdev)
- Luke Atkinson (@LukeDAtkinson) - Luke Atkinson (@LukeDAtkinson)
- Joe Planisky (@jplanisky) - Joe Planisky (@jplanisky)
- Bence Ferdinandy (@ferdinandyb)
============================================================================== ==============================================================================
@@ -4027,6 +4028,9 @@ New:~
* Issue #1279: Fix/Improvement: When re-wrap a long line in a definition * Issue #1279: Fix/Improvement: When re-wrap a long line in a definition
by 'gq' it should insert ':: ' at the new line by 'gq' it should insert ':: ' at the new line
Fixed:~
* Issue #1365: Fix: count ignored when looking up diary frequency
2023.04.04~ 2023.04.04~
+4 -4
View File
@@ -366,11 +366,11 @@ command! -count=0 VimwikiTabMakeDiaryNote
command! -count=0 VimwikiMakeYesterdayDiaryNote command! -count=0 VimwikiMakeYesterdayDiaryNote
\ call vimwiki#diary#make_note(<count>, 0, \ call vimwiki#diary#make_note(<count>, 0,
\ vimwiki#diary#diary_date_link(localtime(), -1)) \ vimwiki#diary#diary_date_link(localtime(), -1, <count>))
command! -count=0 VimwikiMakeTomorrowDiaryNote command! -count=0 VimwikiMakeTomorrowDiaryNote
\ call vimwiki#diary#make_note(<count>, 0, \ call vimwiki#diary#make_note(<count>, 0,
\ vimwiki#diary#diary_date_link(localtime(), 1)) \ vimwiki#diary#diary_date_link(localtime(), 1, <count>))
command! VimwikiDiaryGenerateLinks command! VimwikiDiaryGenerateLinks
\ call vimwiki#diary#generate_diary_section() \ call vimwiki#diary#generate_diary_section()
@@ -399,10 +399,10 @@ nnoremap <silent><script> <Plug>VimwikiTabMakeDiaryNote
\ :<C-U>call vimwiki#diary#make_note(v:count, 1)<CR> \ :<C-U>call vimwiki#diary#make_note(v:count, 1)<CR>
nnoremap <silent><script> <Plug>VimwikiMakeYesterdayDiaryNote nnoremap <silent><script> <Plug>VimwikiMakeYesterdayDiaryNote
\ :<C-U>call vimwiki#diary#make_note(v:count, 0, \ :<C-U>call vimwiki#diary#make_note(v:count, 0,
\ vimwiki#diary#diary_date_link(localtime(), -1))<CR> \ vimwiki#diary#diary_date_link(localtime(), -1, v:count))<CR>
nnoremap <silent><script> <Plug>VimwikiMakeTomorrowDiaryNote nnoremap <silent><script> <Plug>VimwikiMakeTomorrowDiaryNote
\ :<C-U>call vimwiki#diary#make_note(v:count, 0, \ :<C-U>call vimwiki#diary#make_note(v:count, 0,
\ vimwiki#diary#diary_date_link(localtime(), 1))<CR> \ vimwiki#diary#diary_date_link(localtime(), 1, v:count))<CR>
" Set default global key mappings " Set default global key mappings