Sync upstream and XEmacs package