Added a patch in case of conflict with Emacs.