* Sync up with flim-1_0_1 to flim-1_1_0.

diff --git a/ChangeLog b/ChangeLog
index 8518892..bc745ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-05-06  Tanaka Akira  <akr@jaist.ac.jp>
+
+       * Sync up with flim-1_0_1 to flim-1_1_0.
+
 1998-04-25  Tanaka Akira  <akr@jaist.ac.jp>
 
        * eword-decode.el (eword-decode-string): Fix arguments order to calling
@@ -80,8 +84,46 @@
 
        * Sync up with flim-1_0_0 to flim-1_0_1.
 
+1998-05-05  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * FLIM: Version 1.1.0 (T\e-Dòji) was released.\e-A
+
+1998-05-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-def.el (quoted-printable-hex-chars): New constant.
+       (quoted-printable-octet-regexp): New constant.
+
+       * mel-q.el, eword-decode.el: Move definition of constant
+       'quoted-printable-hex-chars and 'quoted-printable-octet-regexp to
+       mime-def.el.
+
+1998-05-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mailcap.el (mailcap-look-at-mtext): Strip quoted character.
+
+1998-05-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mailcap.el (mailcap-look-at-mtext): Fix typo.
+
+1998-05-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * FLIM-ELS (flim-modules): Add mailcap.
+
+       * mailcap.el: New file (copied from SEMI).
+
+1998-04-23  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+       * eword-decode.el (eword-decode-ignored-field-list): Add
+       `received'.
+       
+       * mel.el (mime-temp-directory): Use TMPDIR, TMP, or TEMP
+       environment variables.
+
+\f
 1998-04-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
+       * FLIM: Version 1.0.1 (Ky\e-Dòto) was released.\e-A
+
        * mime-def.el (mime-spadework-module-version-string): New
        constant.
 

diff --git a/FLIM-ELS b/FLIM-ELS
index d42f9b7..7695f0d 100644 (file)
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -1,11 +1,13 @@
 ;;; -*-Emacs-Lisp-*-
-;;;
-;;; $Id: FLIM-ELS,v 1.1 1998-04-13 13:08:14 morioka Exp $
-;;;
+
+;; FLIM-ELS: list of FLIM modules to install
+
+;;; Code:
 
 (setq flim-modules '(std11 std11-parse
                           mel mel-dl mel-b mel-q mel-u mel-g
                           mime-def eword-decode eword-encode
+                          mailcap
                           ))
 
 (if (fboundp 'dynamic-link)

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

diff --git a/eword-decode.el b/eword-decode.el
index a3d729e..55bf8b5 100644 (file)
--- a/eword-decode.el
+++ b/eword-decode.el
@@ -129,11 +129,6 @@ however this behaviour violates RFC2047."
 ;;; @@ Quoted-Printable
 ;;;
 
-(defconst quoted-printable-hex-chars "0123456789ABCDEF")
-(defconst quoted-printable-octet-regexp
-  (concat "=[" quoted-printable-hex-chars
-         "][" quoted-printable-hex-chars "]"))
-
 (defconst eword-Q-encoded-text-regexp
   (concat "\\([^=?]\\|" quoted-printable-octet-regexp "\\)+"))
 ;; (defconst eword-Q-encoding-and-encoded-text-regexp

diff --git a/mailcap.el b/mailcap.el
index 0e6711f..a27be3e 100644 (file)
--- a/mailcap.el
+++ b/mailcap.el
@@ -99,10 +99,19 @@
       )))
 
 (defsubst mailcap-look-at-mtext ()
-  (let ((beg (point)))
-    (while (or (mailcap-look-at-qchar)
-              (mailcap-look-at-schar)))
-    (buffer-substring beg (point))
+  (let ((p0 (point))
+       dest)
+    (while (cond ((mailcap-look-at-qchar)
+                 (setq dest
+                       (concat dest
+                               (buffer-substring p0 (- (point) 2))
+                               (char-to-string (char-before (point)))
+                               )
+                       p0 (point))
+                 )
+                ((mailcap-look-at-schar)
+                 t)))
+    (concat dest (buffer-substring p0 (point)))
     ))
 
 
@@ -182,78 +191,6 @@ order.  Otherwise result is not sorted."
     (mailcap-parse-buffer (current-buffer) order)
     ))
 
-(defun mailcap-format-command (mtext situation)
-  "Return formated command string from MTEXT and SITUATION.
-
-MTEXT is a command text of mailcap specification, such as
-view-command.
-
-SITUATION is an association-list about information of entity.  Its key
-may be:
-
-       'type           primary media-type
-       'subtype        media-subtype
-       'filename       filename
-       STRING          parameter of Content-Type field"
-  (let ((i 0)
-       (len (length mtext))
-       (p 0)
-       dest)
-    (while (< i len)
-      (let ((chr (aref mtext i)))
-       (cond ((eq chr ?%)
-              (setq i (1+ i)
-                    chr (aref mtext i))
-              (cond ((eq chr ?s)
-                     (let ((file (cdr (assq 'filename situation))))
-                       (if (null file)
-                           (error "'filename is not specified in situation.")
-                         (setq dest (concat dest
-                                            (substring mtext p (1- i))
-                                            file)
-                               i (1+ i)
-                               p i)
-                         )))
-                    ((eq chr ?t)
-                     (let ((type (or (mime-type/subtype-string
-                                      (cdr (assq 'type situation))
-                                      (cdr (assq 'subtype situation)))
-                                     "text/plain")))
-                       (setq dest (concat dest
-                                          (substring mtext p (1- i))
-                                          type)
-                             i (1+ i)
-                             p i)
-                       ))
-                    ((eq chr ?\{)
-                     (setq i (1+ i))
-                     (if (not (string-match "}" mtext i))
-                         (error "parse error!!!")
-                       (let* ((me (match-end 0))
-                              (attribute (substring mtext i (1- me)))
-                              (parameter (cdr (assoc attribute situation))))
-                         (if (null parameter)
-                             (error "\"%s\" is not specified in situation."
-                                    attribute)
-                           (setq dest (concat dest
-                                              (substring mtext p (- i 2))
-                                              parameter)
-                                 i me
-                                 p i)
-                           )
-                         )))
-                    (t (error "Invalid sequence `%%%c'." chr))
-                    ))
-             ((eq chr ?\\)
-              (setq dest (concat dest (substring mtext p i))
-                    p (1+ i)
-                    i (+ i 2))
-              )
-             (t (setq i (1+ i)))
-             )))
-    (concat dest (substring mtext p))
-    ))
-
 
 ;;; @ end
 ;;;

diff --git a/mel-q.el b/mel-q.el
index 63d95fb..9a8f954 100644 (file)
--- a/mel-q.el
+++ b/mel-q.el
@@ -26,13 +26,12 @@
 ;;; Code:
 
 (require 'emu)
+(require 'mime-def)
 
 
 ;;; @ Quoted-Printable encoder
 ;;;
 
-(defconst quoted-printable-hex-chars "0123456789ABCDEF")
-
 (defsubst quoted-printable-quote-char (character)
   (concat
    "="
@@ -188,10 +187,6 @@ It calls external quoted-printable encoder specified by
                        )))
               string "")))
 
-(defconst quoted-printable-octet-regexp
-  (concat "=[" quoted-printable-hex-chars
-         "][" quoted-printable-hex-chars "]"))
-
 (defun quoted-printable-internal-decode-region (start end)
   (save-excursion
     (save-restriction

diff --git a/mime-def.el b/mime-def.el
index 873ece5..3b3156a 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (defconst mime-spadework-module-version-string
-  "FLIM-FLAM 1.0.1 - \"\e$B9HG_\e(B\" 2.5R7.0/8.0")
+  "FLIM-FLAM 1.1.0 - \"\e$B4Z9H2V\e(B\" 4.0R4.0/14.0")
 
 (require 'custom)
 
@@ -71,6 +71,16 @@
   (concat mime-token-regexp "/" mime-token-regexp))
 
 
+;;; @@ Quoted-Printable
+;;;
+
+(defconst quoted-printable-hex-chars "0123456789ABCDEF")
+
+(defconst quoted-printable-octet-regexp
+  (concat "=[" quoted-printable-hex-chars
+         "][" quoted-printable-hex-chars "]"))
+
+
 ;;; @ end
 ;;;