[Bug 225726] New: Merge Review: emacs