change from emacs on branch1 revision 4.