Updated for emacs-24.3.

Author:yangyingchao, 2013-03-29