Re: Merging with GNU Emacs