[ Merge from Emacs: ]