Merge remote-tracking branch 'origin/calendar-support' into feature-gap

# Conflicts:
#	development/vimwiki-gap.md

development/vimwiki-gap.md

@@ -611,7 +611,6 @@ audits don't re-flag them.
   backed by LSP foldingRange.
 - `key_mappings` (dict) — replaced by Lua `mappings.<group>` + the
   `g:nuwiki_no_<group>_mappings` globals.
-- `use_calendar` — no calendar.vim integration.
 - `auto_tags` (upstream `0`) — upstream auto-updates an on-disk tag *metadata*
   file on save. nuwiki has no such file: the LSP re-indexes tags on every
   `didChange`, so tag search/jump/completion are always fresh. The setting's
@@ -708,3 +707,9 @@ audits don't re-flag them.
   fallback, now via `table_align_or_cmd`); `:VimwikiSearch`/`VWS` scoped to the
   wiki root; and global `Index`/`TabIndex` entry points. All client-side (no
   server change). Both harnesses green (Neovim 299, Vim 291/18/21).
+- Merged the `calendar-support` branch (2026-06-03): calendar-vim integration
+  now wires `g:calendar_action`/`g:calendar_sign` to nuwiki's diary paths via a
+  `FileType vimwiki` autocmd (`plugin/nuwiki.vim`, both clients), with a
+  `use_calendar` opt-out (`g:nuwiki_no_calendar` / setup `use_calendar = false`).
+  So `use_calendar` is no longer an intentional divergence — removed from that
+  list above. See `development/calendar-vim-integration.md`.