merging Emacs.app (NeXTstep port)