[Bug 225726] Merge Review: emacs