egg-980404.

diff --git a/ChangeLog b/ChangeLog
index e6aca26..0b00d91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-1998-04-02  NIIBE Yutaka  <gniibe@akebono>
+1998-04-02  NIIBE Yutaka  <gniibe@mri.co.jp>
+
+       * egg-com.el (comm-unpack-u16-string): Call string-as-multibyte.
+       (comm-unpack-mb-string): Likewise.
 
        * egg.el (set-buffer-multibyte): Function for Emacs 20.2.
 
@@ -7,8 +10,8 @@
        * egg/canna.el (canna-open): Ditto.
 
 1998-04-02  KATAYAMA Yoshio <kate@pfu.co.jp>
-       
-       Implement face.
+
+       Implement hilight.
        * egg.el (egg-mark-list, egg-suppress-marking): New Variables.
        (egg-set-face, egg-mark-modification, egg-redraw-face): New
        Functions.

diff --git a/Egg.prj b/Egg.prj
index 11fa7a1..da30834 100644 (file)
--- a/Egg.prj
+++ b/Egg.prj
@@ -1,11 +1,11 @@
 ;; -*- Lisp -*-
 (Created-By-Prcs-Version 1 2 1)
 (Project-Description "")
-(Project-Version Egg 0 14)
-(Parent-Version Egg 0 13)
-(Version-Log "")
+(Project-Version Egg 0 15)
+(Parent-Version Egg 0 14)
+(Version-Log "Canna support.")
 (New-Version-Log "")
-(Checkin-Time "Sun, 15 Mar 1998 17:30:48 +0900")
+(Checkin-Time "Fri, 03 Apr 1998 08:34:49 +0900")
 (Checkin-Login gniibe)
 (Populate-Ignore ("^.*/RCS/.*$" "^RCS/.*$" "^\\.elc$"))
 (Project-Keywords)
@@ -106,23 +106,23 @@
   (incoming/ccl (Egg/b/40_ccl 1.1 644))
   (incoming/bushu.el (Egg/b/41_bushu.el 1.1 644))
   (egg/wnnrpc.el (Egg/b/42_wnnrpc.el 1.2 644))
-  (egg/wnn.el (Egg/b/43_wnn.el 1.4 644))
+  (egg/wnn.el (Egg/b/43_wnn.el 1.5 644))
   (egg/sj3rpc.el (Egg/b/44_sj3rpc.el 1.4 644))
-  (egg/sj3.el (Egg/b/45_sj3.el 1.5 644))
+  (egg/sj3.el (Egg/b/45_sj3.el 1.6 644))
   (menudiag.el (Egg/b/46_menudiag.e 1.2 644))
   (leim-list-egg.el (Egg/b/47_leim-list- 1.5 644))
-  (its.el (Egg/b/48_its.el 1.9 644))
+  (its.el (Egg/b/48_its.el 1.10 644))
 ;  (euc-china.el (Egg/b/49_euc-cn.el 1.2 644))
-  (egg.el (Egg/b/50_egg.el 1.5 644))
-  (egg-mlh.el (Egg/b/51_egg-mlh.el 1.5 644))
-  (egg-com.el (Egg/c/0_egg-com.el 1.5 644))
-  (egg-cnv.el (Egg/c/1_egg-cnv.el 1.6 644))
+  (egg.el (Egg/b/50_egg.el 1.6 644))
+  (egg-mlh.el (Egg/b/51_egg-mlh.el 1.6 644))
+  (egg-com.el (Egg/c/0_egg-com.el 1.6 644))
+  (egg-cnv.el (Egg/c/1_egg-cnv.el 1.7 644))
   (docomp.el (Egg/c/2_docomp.el 1.3 644))
   (TODO (Egg/c/3_TODO 1.1 644))
   (README (Egg/c/4_README 1.1 644))
   (PROBLEMS (Egg/c/5_PROBLEMS 1.1 644))
-  (Makefile (Egg/c/6_Makefile 1.6 644))
-  (ChangeLog (Egg/c/7_ChangeLog 1.13 644))
+  (Makefile (Egg/c/6_Makefile 1.7 644))
+  (ChangeLog (Egg/c/7_ChangeLog 1.14 644))
   (AUTHORS (Egg/c/8_AUTHORS 1.2 644))
 ;  (obsolete/its/RCS () :directory)
 ;  (obsolete/RCS/wnnfns.h,v ())
@@ -158,6 +158,8 @@
   (its/jeonkak.el (Egg/c/15_jeonkak.el 1.1 644))
   (its/hankata.el (Egg/c/16_hankata.el 1.1 644))
   (its/ascii.el (Egg/c/17_ascii.el 1.1 644))
+  (egg/cannarpc.el (Egg/c/18_cannarpc.e 1.1 644))
+  (egg/canna.el (Egg/c/19_canna.el 1.1 644))
 )
 (Merge-Parents)
 (New-Merge-Parents)

diff --git a/Makefile b/Makefile
index 0c319cc..b2d5eb2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ SRCS = menudiag.el its.el egg.el \
        its/zhuyin.el \
        its-keydef.el \
        egg-mlh.el egg-cnv.el egg-com.el \
+       egg/canna.el egg/cannarpc.el \
        egg/sj3.el egg/sj3rpc.el \
        egg/wnn.el egg/wnnrpc.el
 

diff --git a/egg-com.el b/egg-com.el
index 12d9cc4..72d8045 100644 (file)
--- a/egg-com.el
+++ b/egg-com.el
@@ -748,11 +748,11 @@ v means 8-bit vector."
   (let ((start (point)))
     (while (not (search-forward "\0\0" nil t))
       (comm-accept-process-output proc))
-    (set s  (string-as-multibyte
-            (buffer-substring start
-                              (+ start
-                                 (decode-coding-region start (- (point) 2)
-                                                       egg-fixed-euc)))))))
+    (set s (string-as-multibyte
+           (buffer-substring start
+                             (+ start
+                                (decode-coding-region start (- (point) 2)
+                                                      egg-fixed-euc)))))))
 
 ;;; XXX should support other conversion (euc-kr, cns)
 (defsubst comm-unpack-mb-string (proc s)

diff --git a/egg/canna.el b/egg/canna.el
index 845bfd1..736302d 100644 (file)
--- a/egg/canna.el
+++ b/egg/canna.el
@@ -70,7 +70,7 @@
       (set-buffer buf)
       (erase-buffer)
       (buffer-disable-undo)
-      (setq enable-multibyte-characters nil))
+      (set-buffer-multibyte nil))
     (setq result (cannarpc-open proc (user-login-name)))
     (if (< result 0)
        (let ((msg (cannarpc-get-error-message (- result))))