Catching up to emacs-20.4.
PR: ports/8833 Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>