CVS update by james xemacs/lisp ...