From 0bb1b4945bb205a076a35b66174e5d66be8eaafe Mon Sep 17 00:00:00 2001 From: Charles Schimmelpfennig Date: Tue, 31 Oct 2023 11:45:18 -0500 Subject: [PATCH] Support angle bracket escaped markdown urls (#1211) * add angle brackets to regex definition * revert unecessary change to markdown link suffix * Update vimwiki.txt --------- Co-authored-by: Charles Schimmelpfennig Co-authored-by: NobleRat --- autoload/vimwiki/vars.vim | 4 ++-- doc/vimwiki.txt | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim index 922926f..5238618 100644 --- a/autoload/vimwiki/vars.vim +++ b/autoload/vimwiki/vars.vim @@ -1230,7 +1230,7 @@ function! s:populate_extra_markdown_vars() abort let mkd_syntax.rxWeblink1Prefix = '[' let mkd_syntax.rxWeblink1Suffix = ')' - let mkd_syntax.rxWeblink1EscapeCharsSuffix = '\(\\\)\@\=)\)' let mkd_syntax.rxWeblink1Separator = '](' let rxWeblink1Ext = '' @@ -1255,7 +1255,7 @@ function! s:populate_extra_markdown_vars() abort let valid_chars_url = '[^[:cntrl:]]' let mkd_syntax.rxWeblink1Prefix = vimwiki#u#escape(mkd_syntax.rxWeblink1Prefix) - let mkd_syntax.rxWeblink1Separator = vimwiki#u#escape(mkd_syntax.rxWeblink1Separator) + let mkd_syntax.rxWeblink1Separator = '\](<\=' let mkd_syntax.rxWeblink1Url = valid_chars_url.'\{-}' let mkd_syntax.rxWeblink1Descr = valid_chars.'\{-}' let mkd_syntax.WikiLinkMatchUrlTemplate = diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt index b4819f3..636612c 100644 --- a/doc/vimwiki.txt +++ b/doc/vimwiki.txt @@ -4000,6 +4000,7 @@ Contributors and their Github usernames in roughly chronological order: - Jean-Luc Bastarache (@jlbas) - Youssof Taha (@ysftaha) - Thomas Leyh (@leyhline) + - Charles Schimmelpfennig (@charlesschimmel) - nebulaeandstars (@nebulaeandstars) - dmitry kim (@jsn) - Julian Prein (@druckdev) @@ -4124,6 +4125,7 @@ New:~ current file * Feature: Add |VimwikiBaddLink| to add links to the buffer list, without loading, if they weren't listed yet + * PR 1211: Enable parsing Markdown links escaped with angle brackets Changed:~ * PR #1047: Allow to replace default mapping of VimwikiToggleListItem