EDiff doesn't create a new frame now
Merge branch 'master' of github.com:chanika/elisp