Merge egg-980316.

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

diff --git a/egg/sj3.el b/egg/sj3.el
index 865f42b..b011f05 100644 (file)
--- a/egg/sj3.el
+++ b/egg/sj3.el
@@ -29,9 +29,7 @@
 
 ;;; Code:
 
-(require 'egg-edep)
-
-(defconst sj3-support-languages '(Japanese))
+(defconst sj3-support-languages '("Japanese"))
 
 (eval-when-compile
   (defmacro SJ3-const (c)
@@ -75,7 +73,7 @@
       (set-buffer buf)
       (erase-buffer)
       (buffer-disable-undo)
-      (set-buffer-multibyte nil))
+      (setq enable-multibyte-characters nil))
     ;; Initialize dictionaries
     (setq sj3-sys-dict-list nil)
     (setq sj3-user-dict-list nil)
@@ -235,17 +233,17 @@
       (setq ret (sj3rpc-open-stdy proc name))
       (if (= ret 0)
          (setq trying nil)
-       (message "\e$B3X=,%U%!%$%k\e(B(%s)\e$B$,$"$j$^$;$s\e(B" name)
+       (message "\92\81³Ø\92\81½¬\92\81¥Õ\92\81¥¡\92\81¥¤\92\81¥ë(%s)\92\81¤¬\92\81¤¢\92\81¤ê\92\81¤Þ\92\81¤»\92\81¤ó" name)
        (if (/= ret (SJ3-const FileNotExist))
            (error "Fatal1")            ; XXX
          (if (and (y-or-n-p
-                   (format "\e$B3X=,%U%!%$%k\e(B(%s)\e$B$,$"$j$^$;$s!#:n$j$^$9$+\e(B? "
+                   (format "\92\81³Ø\92\81½¬\92\81¥Õ\92\81¥¡\92\81¥¤\92\81¥ë(%s)\92\81¤¬\92\81¤¢\92\81¤ê\92\81¤Þ\92\81¤»\92\81¤ó\92\81¡£\92\81ºî\92\81¤ê\92\81¤Þ\92\81¤¹\92\81¤«? "
                            name))
                   (sj3rpc-make-directory proc
                                          (file-name-directory name))
                   ;; ignore error
                   (= (sj3rpc-make-stdy proc name) 0))
-             (message "\e$B3X=,%U%!%$%k\e(B(%s)\e$B$r:n$j$^$7$?\e(B" name)
+             (message "\92\81³Ø\92\81½¬\92\81¥Õ\92\81¥¡\92\81¥¤\92\81¥ë(%s)\92\81¤ò\92\81ºî\92\81¤ê\92\81¤Þ\92\81¤·\92\81¤¿" name)
            (error "Fatal2")))))))      ; XXX
 
 (defun sj3-open-dictionary (proc name passwd)
@@ -255,15 +253,15 @@
       (setq ret (sj3rpc-open-dictionary proc name passwd))
       (if (>= ret 0)
          (setq trying nil)
-       (message "\e$B<-=q%U%!%$%k\e(B(%s)\e$B$,$"$j$^$;$s\e(B" name)
+       (message "\92\81¼­\92\81½ñ\92\81¥Õ\92\81¥¡\92\81¥¤\92\81¥ë(%s)\92\81¤¬\92\81¤¢\92\81¤ê\92\81¤Þ\92\81¤»\92\81¤ó" name)
        (setq ret (- ret))              ; Get error code.
        (if (/= ret (SJ3-const FileNotExist))
            (error "Fatal3 %d" ret)             ; XXX
          (if (and (y-or-n-p
-                   (format "\e$B<-=q%U%!%$%k\e(B(%s)\e$B$,$"$j$^$;$s!#:n$j$^$9$+\e(B? "
+                   (format "\92\81¼­\92\81½ñ\92\81¥Õ\92\81¥¡\92\81¥¤\92\81¥ë(%s)\92\81¤¬\92\81¤¢\92\81¤ê\92\81¤Þ\92\81¤»\92\81¤ó\92\81¡£\92\81ºî\92\81¤ê\92\81¤Þ\92\81¤¹\92\81¤«? "
                            name))
                   (= (sj3rpc-make-dictionary proc name) 0))
-             (message "\e$B<-=q%U%!%$%k\e(B(%s)\e$B$r:n$j$^$7$?\e(B" name)
+             (message "\92\81¼­\92\81½ñ\92\81¥Õ\92\81¥¡\92\81¥¤\92\81¥ë(%s)\92\81¤ò\92\81ºî\92\81¤ê\92\81¤Þ\92\81¤·\92\81¤¿" name)
            (error "Fatal4")))))        ; XXX
     ret))