Fix merge from Emacs.