golden-ratio.el: Improve compatibility with the ediff-mode.
Merge branch 'master' into macbook-pro