CVS update by james xemacs/src ...