Merge egg-980316.

[elisp/egg.git] / egg / canna.el

diff --git a/egg/canna.el b/egg/canna.el
index c401aa2..845bfd1 100644 (file)
--- a/egg/canna.el
+++ b/egg/canna.el
@@ -29,9 +29,7 @@
 
 ;;; Code:
 
-(require 'egg-edep)
-
-(defconst canna-support-languages '(Japanese))
+(defconst canna-support-languages '("Japanese"))
 
 (eval-when-compile
   (defmacro CANNA-const (c)
@@ -72,7 +70,7 @@
       (set-buffer buf)
       (erase-buffer)
       (buffer-disable-undo)
-      (set-buffer-multibyte nil))
+      (setq enable-multibyte-characters nil))
     (setq result (cannarpc-open proc (user-login-name)))
     (if (< result 0)
        (let ((msg (cannarpc-get-error-message (- result))))