Upstream: https://github.com/macvim-dev/macvim/pull/423 (reverting partly) --- src/MacVim/vimrc +++ src/MacVim/vimrc @@ -13,41 +13,3 @@ " the entire MacVim menu is set up in a nib file which currently only is " translated to English). set langmenu=none - -" Python2 -" MacVim is configured by default to use the pre-installed System python2 -" version. However, following code tries to find a Homebrew, MacPorts or -" an installation from python.org: -if exists("&pythondll") && exists("&pythonhome") - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") - " Homebrew python 2.7 - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python - set pythonhome=/usr/local/Frameworks/Python.framework/Versions/2.7 - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") - " MacPorts python 2.7 - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python - set pythonhome=/opt/local/Library/Frameworks/Python.framework/Versions/2.7 - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") - " https://www.python.org/downloads/mac-osx/ - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python - set pythonhome=/Library/Frameworks/Python.framework/Versions/2.7 - endif -endif - -" Python3 -" MacVim is configured by default to use Homebrew python3 version -" If this cannot be found, following code tries to find a MacPorts -" or an installation from python.org: -if exists("&pythonthreedll") && exists("&pythonthreehome") && - \ !filereadable(&pythonthreedll) - if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python") - " MacPorts python 3.7 - set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/Python - set pythonthreehome=/opt/local/Library/Frameworks/Python.framework/Versions/3.7 - elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.7/Python") - " https://www.python.org/downloads/mac-osx/ - set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.7/Python - set pythonthreehome=/Library/Frameworks/Python.framework/Versions/3.7 - endif -endif -