X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=egg%2Fsj3.el;h=33abd343516e8721eda54df6f0c2c5ab61776172;hb=63c6f361251f5127e780b51c39e2df3e1fd98ac1;hp=bfa52224fddbc435db406b1e87c2147f667db01f;hpb=d0114d80c7a6a1a573bb3adc0fd4a3b25fa1e27e;p=elisp%2Fegg.git

diff --git a/egg/sj3.el b/egg/sj3.el
index bfa5222..33abd34 100644
--- 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
@@ -73,7 +73,7 @@
       (set-buffer buf)
       (erase-buffer)
       (buffer-disable-undo)
-      (setq enable-multibyte-characters nil))
+      (set-buffer-multibyte nil))
     ;; Initialize dictionaries
     (setq sj3-sys-dict-list nil)
     (setq sj3-user-dict-list nil)
@@ -233,17 +233,17 @@
       (setq ret (sj3rpc-open-stdy proc name))
       (if (= ret 0)
 	  (setq trying nil)
-	(message "’³Ø’½¬’¥Õ’¥¡’¥¤’¥ë(%s)’¤¬’¤¢’¤ê’¤Þ’¤»’¤ó" name)
+	(message "$B3X=,%U%!%$%k(B(%s)$B$,$"$j$^$;$s(B" name)
 	(if (/= ret (SJ3-const FileNotExist))
 	    (error "Fatal1")		; XXX
 	  (if (and (y-or-n-p
-		    (format "’³Ø’½¬’¥Õ’¥¡’¥¤’¥ë(%s)’¤¬’¤¢’¤ê’¤Þ’¤»’¤ó’¡£’ºî’¤ê’¤Þ’¤¹’¤«? "
+		    (format "$B3X=,%U%!%$%k(B(%s)$B$,$"$j$^$;$s!#:n$j$^$9$+(B? "
 			    name))
 		   (sj3rpc-make-directory proc
 					  (file-name-directory name))
 		   ;; ignore error
 		   (= (sj3rpc-make-stdy proc name) 0))
-	      (message "’³Ø’½¬’¥Õ’¥¡’¥¤’¥ë(%s)’¤ò’ºî’¤ê’¤Þ’¤·’¤¿" name)
+	      (message "$B3X=,%U%!%$%k(B(%s)$B$r:n$j$^$7$?(B" 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 "’¼­’½ñ’¥Õ’¥¡’¥¤’¥ë(%s)’¤¬’¤¢’¤ê’¤Þ’¤»’¤ó" name)
+	(message "$B<-=q%U%!%$%k(B(%s)$B$,$"$j$^$;$s(B" name)
 	(setq ret (- ret))		; Get error code.
 	(if (/= ret (SJ3-const FileNotExist))
 	    (error "Fatal3 %d" ret)		; XXX
 	  (if (and (y-or-n-p
-		    (format "’¼­’½ñ’¥Õ’¥¡’¥¤’¥ë(%s)’¤¬’¤¢’¤ê’¤Þ’¤»’¤ó’¡£’ºî’¤ê’¤Þ’¤¹’¤«? "
+		    (format "$B<-=q%U%!%$%k(B(%s)$B$,$"$j$^$;$s!#:n$j$^$9$+(B? "
 			    name))
 		   (= (sj3rpc-make-dictionary proc name) 0))
-	      (message "’¼­’½ñ’¥Õ’¥¡’¥¤’¥ë(%s)’¤ò’ºî’¤ê’¤Þ’¤·’¤¿" name)
+	      (message "$B<-=q%U%!%$%k(B(%s)$B$r:n$j$^$7$?(B" 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))