From 1c486b36432c65427d48c3bb9fd440c394405587 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 8 Jun 1998 10:47:00 +0000 Subject: [PATCH] Sync up with flim-1_2_1 to flim-1_3_0. --- ChangeLog | 42 ++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- TESTPAT | 2 ++ mel-q.el | 7 +++---- mime-def.el | 25 +++++++++++++++++++++++-- std11.el | 22 ++++++++++++++-------- 6 files changed, 85 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf9cad0..ecbc77a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1998-06-08 Tanaka Akira + + * Sync up with flim-1_2_1 to flim-1_3_0. + 1998-05-27 Tanaka Akira * eword-decode.el (eword-after-encoded-word-in-phrase-regexp): remove ` @@ -114,6 +118,44 @@ * Sync up with flim-1_0_0 to flim-1_0_1. +1998-06-01 MORIOKA Tomohiko + + * FLIM: Version 1.3.0 (Fushimi) was released. + +1998-05-28 MORIOKA Tomohiko + + * std11.el (std11-fetch-field): New function. + (std11-field-body): Use 'std11-fetch-field. + +1998-05-28 MORIOKA Tomohiko + + * 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)). + + +1998-05-17 MORIOKA Tomohiko + + * FLIM: Version 1.2.2 (Takeda) was released. + + * FLIM-VERSION: New file. + +1998-05-15 MORIOKA Tomohiko + + * mel-q.el (quoted-printable-internal-encode-region): Use + 'looking-at-as-unibyte instead of local binding for + enable-multibyte-characters. + + 1998-05-09 MORIOKA Tomohiko * FLIM: Version 1.2.1 (Kamitobaguchi) was released. diff --git a/Makefile b/Makefile index d550eec..00e3361 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Makefile for FLIM. # -VERSION = 1.2.1 +VERSION = 1.3.0 TAR = tar RM = /bin/rm -f diff --git a/TESTPAT b/TESTPAT index a08e29a..f2ec1e2 100644 --- a/TESTPAT +++ b/TESTPAT @@ -37,6 +37,7 @@ Subject: "a"=?ISO-2022-JP?B?GyRCJCIbKEI=?="b" Subject: (Re: =?ISO-2022-JP?B?GyRCJCIbKEI=?=) Subject: =?ISO-2022-JP?B?GyRCJCIbKEI=?=: Subject: =?ISO-2022-JP?B??= +Subject: =?ISO-2022-JP?B?DQoNCgo=?= From: あ From: あい @@ -69,4 +70,5 @@ Subject: "a"=?ISO-2022-JP?B?GyRCJCIbKEI=?="b" Subject: (Re: =?ISO-2022-JP?B?GyRCJCIbKEI=?=) Subject: =?ISO-2022-JP?B?GyRCJCIbKEI=?=: Subject: =?ISO-2022-JP?B??= +Subject: diff --git a/mel-q.el b/mel-q.el index 6ec4f0b..130865e 100644 --- a/mel-q.el +++ b/mel-q.el @@ -44,19 +44,18 @@ (save-restriction (narrow-to-region start end) (goto-char start) - (let ((col 0) - enable-multibyte-characters) + (let ((col 0)) (while (< (point)(point-max)) (cond ((>= col 75) (insert "=\n") (setq col 0) ) - ((looking-at "^From ") + ((looking-at-as-unibyte "^From ") (replace-match "=46rom ") (backward-char 1) (setq col (+ col 6)) ) - ((looking-at "[ \t]\n") + ((looking-at-as-unibyte "[ \t]\n") (forward-char 1) (insert "=\n") (forward-char 1) diff --git a/mime-def.el b/mime-def.el index 48b3f51..521c165 100644 --- a/mime-def.el +++ b/mime-def.el @@ -25,7 +25,7 @@ ;;; Code: (defconst mime-spadework-module-version-string - "FLIM-FLAM 1.2.1 - \"桜\" 2.5R7.0/7.0") + "FLIM-FLAM 1.3.0 - \"肉\" 2.5YR8.0/4.0") ;;; @ 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 --- 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 -- 1.7.10.4