Skip to content

Commit

Permalink
[B] add test for dynamic python3 installation (ocaml#1688)
Browse files Browse the repository at this point in the history
from nilsbecker/nilsbecker-patch-1
  • Loading branch information
voodoos committed Nov 8, 2023
1 parent 75fd361 commit af5256d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion vim/merlin/autoload/merlin.vim
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit af5256d

Please sign in to comment.