Sync up with flim-1_0_0 to flim-1_0_1.

diff --git a/ChangeLog b/ChangeLog
index 82ae004..0426511 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+1998-04-17  Tanaka Akira  <akr@jaist.ac.jp>
+
+       * Sync up with flim-1_0_0 to flim-1_0_1.
+
+1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * FLIM: Version 1.0.1 (Ky\e,Dr\e(Bto) was released.
+
+       * mime-def.el (mime-spadework-module-version-string): New
+       constant.
+
+       * eword-encode.el: Abolish constant 'eword-encode-version.
+
+       * eword-decode.el: Abolish constant 'eword-decode-version.
+
+1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * eword-encode.el (eword-encode-divide-into-charset-words): Use
+       'char-length or 'char-next-index instead of 'char-bytes.
+       (tm-eword::encode-string-1): Use 'char-next-index instead of
+       'char-bytes.
+
+1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mel.el (base64-dl-module): Must check base64.so actually exists.
+
+\f
 1998-04-13  Tanaka Akira  <akr@jaist.ac.jp>
 
        * eword-decode.el: Copied from AKEMI branch of SEMI.

diff --git a/Makefile b/Makefile
index d793687..4a79bd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for FLIM.
 #
 
-VERSION = 1.0.0
+VERSION = 1.0.1
 
 TAR    = tar
 RM     = /bin/rm -f

diff --git a/eword-decode.el b/eword-decode.el
index c5d17c5..257b4aa 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -39,8 +39,6 @@
   "Encoded-word decoding"
   :group 'mime)
 
-(defconst eword-decode-version "1.2.2")
-
 
 ;;; @ MIME encoded-word definition
 ;;;

diff --git a/eword-encode.el b/eword-encode.el
index 2748d71..41bb25f 100644 (file)
--- a/eword-encode.el
+++ b/eword-encode.el
@@ -31,12 +31,6 @@
 (require 'eword-decode)
 
 
-;;; @ version
-;;;
-
-(defconst eword-encode-version "1.2")
-
-
 ;;; @ variables
 ;;;
 
@@ -119,13 +113,12 @@ MODE is allows `text', `comment', `phrase' or nil.  Default value is
     (while (> len 0)
       (let* ((chr (sref string 0))
             (charset (eword-encode-char-type chr))
-            (i (char-bytes chr))
-            )
+            (i (char-length chr)))
        (while (and (< i len)
                    (setq chr (sref string i))
                    (eq charset (eword-encode-char-type chr))
                    )
-         (setq i (+ i (char-bytes chr)))
+         (setq i (char-next-index chr i))
          )
        (setq dest (cons (cons charset (substring string 0 i)) dest)
              string (substring string i)
@@ -302,7 +295,7 @@ MODE is allows `text', `comment', `phrase' or nil.  Default value is
                    (str "") nstr)
               (while (and (< p len)
                           (progn
-                            (setq np (+ p (char-bytes (sref string p))))
+                            (setq np (char-next-index (sref string p) p))
                             (setq nstr (substring string 0 np))
                             (setq ret (tm-eword::encoded-word-length
                                        (cons nstr (cdr rword))

diff --git a/mel.el b/mel.el
index 50cc8f8..9cc504e 100644 (file)
--- a/mel.el
+++ b/mel.el
@@ -28,7 +28,7 @@
 
 (require 'emu)
 
-(defconst mel-version "7.3")
+(defconst mel-version "7.4")
 
 
 ;;; @ variable
@@ -41,7 +41,9 @@
 
 (defvar base64-dl-module
   (and (fboundp 'dynamic-link)
-       (expand-file-name "base64.so" exec-directory)))
+       (let ((path (expand-file-name "base64.so" exec-directory)))
+        (and (file-exists-p path)
+             path))))
 
 
 ;;; @ autoload

diff --git a/mime-def.el b/mime-def.el
index dfbeece..0809c6a 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,6 +24,9 @@
 
 ;;; Code:
 
+(defconst mime-spadework-module-version-string
+  "FLIM 1.0.1 - \"Ky\e-Dòto\"\e-A ")
+
 (require 'custom)
 
 (defgroup mime nil