Merge canna.el for XEmacs.