Mac x11 support

I've been using this change on my Mac and Linux systems. I've verified that it does not affect the behavior of MacVim (i.e., the native, non-X11, version).