diff --git a/CHANGES.md b/CHANGES.md index a8aece5d1c..a233d0bf7c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +merlin NEXT_VERSION +=================== + + + editor modes + - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim) + merlin 4.12 =========== Tue Sep 26 17:45:42 CEST 2023 diff --git a/vim/merlin/autoload/merlin.vim b/vim/merlin/autoload/merlin.vim index c743c60310..f78424cdd1 100644 --- a/vim/merlin/autoload/merlin.vim +++ b/vim/merlin/autoload/merlin.vim @@ -1,7 +1,7 @@ if !exists('g:merlin') | let g:merlin = {} | endif | let s:c = g:merlin if !exists('g:merlin_python_version') - if has('python3') + if has('python3') || has('python3_dynamic') let g:merlin_python_version = 3 elseif has('python') || has('python2') let g:merlin_python_version = 2