Merge egg-980316.

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

diff --git a/egg/sj3.el b/egg/sj3.el
index bfa5222..b011f05 100644 (file)
--- a/egg/sj3.el
+++ b/egg/sj3.el
@@ -8,7 +8,7 @@
 ;; Author: NIIBE Yutaka <gniibe@mri.co.jp>
 ;; Maintainer: NIIBE Yutaka <gniibe@mri.co.jp>
 
-;; This file will be part of EGG.
+;; This file is part of EGG.
 
 ;; EGG is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -233,17 +233,17 @@
       (setq ret (sj3rpc-open-stdy proc name))
       (if (= ret 0)
          (setq trying nil)
-       (message "\92³Ø\92½¬\92¥Õ\92¥¡\92¥¤\92¥ë(%s)\92¤¬\92¤¢\92¤ê\92¤Þ\92¤»\92¤ó" 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 "\92³Ø\92½¬\92¥Õ\92¥¡\92¥¤\92¥ë(%s)\92¤¬\92¤¢\92¤ê\92¤Þ\92¤»\92¤ó\92¡£\92ºî\92¤ê\92¤Þ\92¤¹\92¤«? "
+                   (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 "\92³Ø\92½¬\92¥Õ\92¥¡\92¥¤\92¥ë(%s)\92¤ò\92ºî\92¤ê\92¤Þ\92¤·\92¤¿" 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)
@@ -253,15 +253,15 @@
       (setq ret (sj3rpc-open-dictionary proc name passwd))
       (if (>= ret 0)
          (setq trying nil)
-       (message "\92¼­\92½ñ\92¥Õ\92¥¡\92¥¤\92¥ë(%s)\92¤¬\92¤¢\92¤ê\92¤Þ\92¤»\92¤ó" 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 "\92¼­\92½ñ\92¥Õ\92¥¡\92¥¤\92¥ë(%s)\92¤¬\92¤¢\92¤ê\92¤Þ\92¤»\92¤ó\92¡£\92ºî\92¤ê\92¤Þ\92¤¹\92¤«? "
+                   (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 "\92¼­\92½ñ\92¥Õ\92¥¡\92¥¤\92¥ë(%s)\92¤ò\92ºî\92¤ê\92¤Þ\92¤·\92¤¿" 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))
 
@@ -274,22 +274,24 @@ Return the list of bunsetsu."
   (let ((env (sj3-get-environment)))
     (sj3rpc-begin env yomi)))
 
-(defun sj3-end-conversion (bunsetsu-list)
-  (let ((env (sj3bunsetsu-get-env (car bunsetsu-list)))
-       (l bunsetsu-list)
-       bunsetsu stdy kugiri-changed)
-    (while l
-      (setq bunsetsu (car l))
-      (setq l (cdr l))
-      (setq stdy (sj3bunsetsu-get-stdy bunsetsu))
-      (if stdy
-         (sj3rpc-bunsetsu-stdy env stdy))
-      (if (setq kugiri-changed (sj3bunsetsu-get-kugiri-changed bunsetsu))
-         (let ((yomi1 (sj3bunsetsu-get-source bunsetsu))
-               (yomi2 (sj3bunsetsu-get-source (car l))))
-           (if (/= kugiri-changed (length yomi1))
-               (sj3rpc-kugiri-stdy env yomi1 yomi2
-                                   (sj3bunsetsu-get-stdy (car l)))))))))
+(defun sj3-end-conversion (bunsetsu-list abort)
+  (if abort
+      ()
+    (let ((env (sj3bunsetsu-get-env (car bunsetsu-list)))
+         (l bunsetsu-list)
+         bunsetsu stdy kugiri-changed)
+      (while l
+       (setq bunsetsu (car l))
+       (setq l (cdr l))
+       (setq stdy (sj3bunsetsu-get-stdy bunsetsu))
+       (if stdy
+           (sj3rpc-bunsetsu-stdy env stdy))
+       (if (setq kugiri-changed (sj3bunsetsu-get-kugiri-changed bunsetsu))
+           (let ((yomi1 (sj3bunsetsu-get-source bunsetsu))
+                 (yomi2 (sj3bunsetsu-get-source (car l))))
+             (if (/= kugiri-changed (length yomi1))
+                 (sj3rpc-kugiri-stdy env yomi1 yomi2
+                                     (sj3bunsetsu-get-stdy (car l))))))))))
 
 (defun sj3-list-candidates (bunsetsu prev-bunsetsu)
   (let* ((env (sj3bunsetsu-get-env bunsetsu))