Merge canna.el for XEmacs.
-rw-r--r-- 41924 canna.c
-rw-r--r-- 46897 canna.el