Sync up with chao-1_2_0_9.

diff --git a/ChangeLog b/ChangeLog
index 34c707b..78ed3c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+1998-05-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * std11.el (std11-fetch-field): New function.
+       (std11-field-body): Use 'std11-fetch-field.
+
+1998-05-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-def.el (regexp-*): New function (moved from mime-parse.el
+       of SEMI (REMI)).
+       (regexp-or): New function (moved from mime-parse.el of
+       SEMI (REMI)).
+
+       (std11-quoted-pair-regexp): New constant (moved from mime-parse.el
+       of SEMI (REMI)).
+       (std11-non-qtext-char-list): New constant (copied from std11.el).
+       (std11-qtext-regexp): New constant (moved from mime-parse.el of
+       SEMI (REMI)).
+       (std11-quoted-string-regexp): New constant (moved from
+       mime-parse.el of SEMI (REMI)).
+
+\f
 1998-05-17  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * FLIM: Version 1.2.2 (Takeda) was released.

diff --git a/FLIM-VERSION b/FLIM-VERSION
index 46985a0..7021437 100644 (file)
--- a/FLIM-VERSION
+++ b/FLIM-VERSION
@@ -3,11 +3,24 @@
 1.0.0  -----
 
 ;;-------------------------------------------------------------------------
-;;     Kinki Nippon Railway    \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
-;;     Ky\e-Dòto\e-A Line                \e$(B5~ET@~\e(B
+;;     Kinki Nippon Railway
+;;                     \e$(B6a5&F|K\E4F;\e(B     http://www.kintetsu.co.jp/
+;;     Ky\e-Dòto\e-A Line        \e$(B5~ET@~\e(B
 ;;-------------------------------------------------------------------------
 1.0.1  Ky\e-Dòto\e-A             \e$(B5~ET\e(B             ; <=> JR
 1.1.0  T\e-Dòji\e-A              \e$(BEl;{\e(B
 1.2.0  J\e-Dþjò\e-A              \e$(B==>r\e(B
 1.2.1  Kamitobaguchi   \e$(B>eD;1)8}\e(B
 1.2.2  Takeda          \e$(BC]ED\e(B             ; = \e$(B5~ET;T8rDL6I\e(B \e$(B1(4]@~\e(B
+
+
+[Chao Version names]
+
+;;-------------------------------------------------------------------------
+;;     Kyoto Municipal Transfer Bureau
+;;                     \e$(B5~ET;T8rDL6I\e(B
+;;                             http://www.city.kyoto.jp/kotsu/main.htm
+;;     Karasuma Line   \e$(B1(4]@~\e(B
+;;-------------------------------------------------------------------------
+1.2.0  Takeda          \e$(BC]ED\e(B             ; = \e$(B6aE4\e(B \e$(B5~ET@~\e(B
+1.3.0  Kuinabashi      \e$(B$/$$$J66\e(B

diff --git a/mime-def.el b/mime-def.el
index d7acd5b..bb18d8e 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (defconst mime-spadework-module-version-string
-  "FLIM 1.2.2 - \"Takeda\"")
+  "FLIM 1.3.0 - \"Fushimi\"")
 
 
 ;;; @ variables
@@ -77,8 +77,29 @@
       (substring string (match-end 0))
     string))
 
+(defsubst regexp-* (regexp)
+  (concat regexp "*"))
 
-;;; @ definitions about MIME
+(defsubst regexp-or (&rest args)
+  (concat "\\(" (mapconcat (function identity) args "\\|") "\\)"))
+
+
+;;; @ about STD 11
+;;;
+
+(defconst std11-quoted-pair-regexp "\\\\.")
+(defconst std11-non-qtext-char-list '(?\" ?\\ ?\r ?\n))
+(defconst std11-qtext-regexp
+  (concat "[^" (char-list-to-string std11-non-qtext-char-list) "]"))
+(defconst std11-quoted-string-regexp
+  (concat "\""
+         (regexp-*
+          (regexp-or std11-qtext-regexp std11-quoted-pair-regexp)
+          )
+         "\""))
+
+
+;;; @ about MIME
 ;;;
 
 (defconst mime-tspecials "][()<>@,\;:\\\"/?=")

diff --git a/std11.el b/std11.el
index f36830d..080cae2 100644 (file)
--- a/std11.el
+++ b/std11.el
@@ -48,18 +48,24 @@
   (point)
   )
 
+(defsubst std11-fetch-field (name)
+  "Return the value of the header field NAME.
+The buffer is expected to be narrowed to just the headers of the message."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((case-fold-search t))
+      (if (re-search-forward (concat "^" name ":[ \t]*") nil t)
+         (buffer-substring-no-properties (match-end 0) (std11-field-end))
+       ))))
+
 (defun std11-field-body (name &optional boundary)
-  "Return body of field NAME.
-If BOUNDARY is not nil, it is used as message header separator.
-\[std11.el]"
+  "Return the value of the header field NAME.
+If BOUNDARY is not nil, it is used as message header separator."
   (save-excursion
     (save-restriction
       (std11-narrow-to-header boundary)
-      (goto-char (point-min))
-      (let ((case-fold-search t))
-       (if (re-search-forward (concat "^" name ":[ \t]*") nil t)
-           (buffer-substring-no-properties (match-end 0) (std11-field-end))
-         )))))
+      (std11-fetch-field name)
+      )))
 
 (defun std11-find-field-body (field-names &optional boundary)
   "Return the first found field-body specified by FIELD-NAMES