Changes to support bzr version of emacs, issue #114