Fix typos: backport revision r117377 from emacs trunk