Merge XEmacs changes.