[PATCH 2/2] emacs: less guessing of character set in messages