Continue of https://github.com/macvim-dev/macvim/pull/715#issuecomment-422152518 