A new patch with further changes.

-- 
Best regards, Xue Fuqiao.
http://www.gnu.org/software/emacs/