From 383fb04903e9c5d70b76a9dfe523237edc28c930 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 8 Jun 1998 07:12:02 +0000 Subject: [PATCH] Sync up with SEMI 1.5.3. --- ChangeLog | 17 +++++++++++++++++ Makefile | 2 +- NEWS | 7 +++++++ VERSION | 43 ++++++++++++++++++++++--------------------- mime-edit.el | 28 ++++++++++++---------------- mime-parse.el | 10 +++++----- semi-def.el | 2 +- 7 files changed, 65 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7a0d59..c1e8d23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 1998-06-08 MORIOKA Tomohiko + * NEWS (`pgp-elkins' -> `pgp-mime'): New section. + + * mime-edit.el: Rename `pgp-elkins' -> `pgp-mime'. + +1998-06-08 MORIOKA Tomohiko + + * mime-edit.el (mime-edit-sign-pgp-elkins): Abolish unused local + variable. + (mime-edit-encrypt-pgp-elkins): Abolish unused local variable. + +1998-06-08 MORIOKA Tomohiko + + * mime-parse.el (mime-parse-multipart): fixed. + + +1998-06-08 MORIOKA Tomohiko + * WEMI: Version 1.5.2 (Hayakawa) released. * mime-play.el (mime-delq-null-situation): New function. diff --git a/Makefile b/Makefile index 844009f..ae1a880 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Makefile for WEMI. # -VERSION = 1.5.2 +VERSION = 1.5.3 PACKAGE = wemi SHELL = /bin/sh diff --git a/NEWS b/NEWS index 7ae1700..bde99e3 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,13 @@ Copyright (C) 1998 Free Software Foundation, Inc. * Changes in SEMI 1.5 +** `pgp-elkins' -> `pgp-mime' + + Rename `pgp-elkins' -> `pgp-mime'. Variable +`mime-edit-signing-type' and `mime-edit-encrypting-type' does not +allow `pgp-elkins'. + + ** type-subtype-score Now MIME-View chooses one entity to display body in diff --git a/VERSION b/VERSION index a1aaa40..06bbbd7 100644 --- a/VERSION +++ b/VERSION @@ -18,13 +18,13 @@ 0.115 Hinomiko $(BF|8f;R(B 0.115.1 Oyanagi $(B>.Lx(B 0.115.2 Inokuchi $(B0f8}(B -0.116 D-Dòhòji $(BF;K!;{(B-A +0.116 D-Dòhòji-A $(BF;K!;{(B 0.118 Sodani $(BA>C+(B 0.118.1 Shijima $(B;M==K|(B 0.118.2 Otomaru $(B254](B -1.0.0 Nukaj-Dþtaku-mae $(B3[=;BpA0(B-A +1.0.0 Nukaj-Dþtaku-mae-A $(B3[=;BpA0(B 1.0.1 Magae $(BGOBX(B -1.0.2 Nonoichi-K-Dòdaimae $(BLn!9;T9)BgA0(B-A +1.0.2 Nonoichi-K-Dòdaimae-A $(BLn!9;T9)BgA0(B 1.1.0 Nonoichi $(BLn!9;T(B 1.1.1 Oshino $(B2!Ln(B 1.1.2 Shin-Nishikanazawa $(B?7@>6bBt(B ; <=> JR $(B@>6bBt(B @@ -40,23 +40,24 @@ 1.2.4 Arimagawa $(BM-4V@n(B 1.3.0 Nadachi $(BL>N)(B 1.3.1 Tsutsuishi $(BE{@P(B -1.3.2 N-Dò $(BG=@8(B-A +1.3.2 N-Dò-A $(BG=@8(B 1.3.3 Uramoto $(B1:K\(B 1.3.4 Kajiyashiki $(B3a20I_(B 1.4.0 Itoigawa $(B;e5{@n(B ; = JR $(BBg;e@~(B -1.4.1 -DÒmi $(B@D3$(B-A +1.4.1 -DÒmi-A $(B@D3$(B 1.4.2 Oyashirazu $(B?FITCN(B 1.4.3 Ichiburi $(B;T?6(B -1.4.4 Ecch-Dþ-Miyazaki $(B1[Cf5\:j(B-A +1.4.4 Ecch-Dþ-Miyazaki-A $(B1[Cf5\:j(B 1.4.5 Tomari $(BGq(B -1.4.6 Ny-Dþzen $(BF~A1(B-A -1.5.0 Nishi-Ny-Dþzen $(B@>F~A1(B-A +1.4.6 Ny-Dþzen-A $(BF~A1(B +1.5.0 Nishi-Ny-Dþzen-A $(B@>F~A1(B 1.5.1 Ikuji $(B@8CO(B 1.5.2 Kurobe $(B9uIt(B ------ Uozu $(B5{DE(B ; <=> $(BIY;3COJ}E4F;(B -: : : +1.5.3 Uozu $(B5{DE(B ; <=> $(BIY;3COJ}E4F;(B +----- Higashi-Namerikawa $(BEl3j@n(B ----- Namerikawa $(B3j@n(B ; <=> $(BIY;3COJ}E4F;(B -: : : +----- Mizuhashi $(B?e66(B +----- Higashi-Toyama $(BElIY;3(B ----- Toyama $(BIY;3(B ; = JR $(B9b;3K\@~!"IY;39A@~(B : : : ------- Takaoka $(B9b2,(B ; = JR $(BI98+@~!">kC<@~(B @@ -68,7 +69,7 @@ : : : ------- Tsuruga $(BFX2l(B ; = JR $(B>.IM@~(B ------- Shin-Hikida $(B?7I%ED(B -------- -DÒmi-Shiotsu $(B6a9>1vDE(B ; = JR $(B8P@>@~(B-A +------- -DÒmi-Shiotsu-A $(B6a9>1vDE(B ; = JR $(B8P@>@~(B ------- Yogo $(BM>8b(B ------- Kinomoto $(BLZ%NK\(B ------- Takatsuki $(B9b7n(B @@ -103,7 +104,7 @@ 1.5.0 Kamonomiya $B3{5\(B 1.5.1 Odawara $(B>.ED86(B ; <=> $(B>.ED5^!"H":,EP;3E4F;!"0KF&H":,E4F;(B 1.5.2 Hayakawa $BAa@n(B ------ Nebukawa $B:,I\@n(B +1.5.3 Nebukawa $B:,I\@n(B ----- Manazuru $B??Da(B ----- Yugawara $BEr2O86(B ----- Atami $(BG.3$(B ; = JR $(B0KEl@~(B @@ -113,7 +114,7 @@ ----- Kan'nami $(BH!Fn(B : : : ----- Kanayama $(B6b;3(B ; =$(B!J(BJR $(BCf1{K\@~!K(B ------ Ot-Dòbashi $(BHxF,66(B-A +----- Ot-Dòbashi-A $(BHxF,66(B ----- Nagoya $(BL>8E20(B ; = JR $(B4X@>K\@~!J!&Cf1{K\@~!K(B : : : ----- Gifu $(B4tIl(B ; = JR $(B9b;3K\@~(B @@ -127,13 +128,13 @@ ----- Kusatsu $(BApDE(B ; = JR $(BApDE@~(B : : : ----- Yamashina $(B;32J(B ; = JR $(B8P@>@~(B ------ Ky-Dòto $(B5~ET(B ; = JR $(BF`NI@~!&;31"K\@~(B-A +----- Ky-Dòto-A $(B5~ET(B ; = JR $(BF`NI@~!&;31"K\@~(B ; <=> $(B6aE4(B $(B5~ET@~!"5~ET;T8rDL6I(B $(B1(4]@~(B : : : ------ -DÒsaka $(BBg:e(B ; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B-A +----- -DÒsaka-A $(BBg:e(B ; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B ; <=> $(BBg:e;T8rDL6I!":e?@!":e5^(B $(BG_ED(B : : : ------ K-Dòbe $(B?@8M(B ; = JR $(B;3M[K\@~(B-A +----- K-Dòbe-A $(B?@8M(B ; = JR $(B;3M[K\@~(B [REMI version names] @@ -145,10 +146,10 @@ 1.4.0 Himi $(BI98+(B 1.5.0 Shimao $(BEgHx(B 1.5.1 Amaharashi $(B1+@2(B -------- Ecch-Dþ-Kokubu $(B1[Cf9qJ,(B-A +------- Ecch-Dþ-Kokubu-A $(B1[Cf9qJ,(B ------- Fushiki $(BIzLZ(B ------- Noumachi $(BG=D.(B -------- Ecch-Dþ-Nakagawa $(B1[CfCf@n(B-A +------- Ecch-Dþ-Nakagawa-A $(B1[CfCf@n(B (Takaoka) ($(B9b2,(B) ; = JR $(BKLN&K\@~!">kC<@~(B @@ -158,7 +159,7 @@ ;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ ;; Kosei Line $(B8P@>@~(B ;;------------------------------------------------------------------------- -------- (-DÒmi-Shiotsu) ($(B6a9>1vDE(B) ; = JR $(BKLN&K\@~(B-A +------- (-DÒmi-Shiotsu)-A ($(B6a9>1vDE(B) ; = JR $(BKLN&K\@~(B : : : -------- Nishi--DÒtsu $(B@>BgDE(B-A +------- Nishi--DÒtsu-A $(B@>BgDE(B (Yamashina) ($(B;32J(B) ; = JR $(BEl3$F;K\@~(B diff --git a/mime-edit.el b/mime-edit.el index 9ad6408..c66b48e 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -536,11 +536,11 @@ If it is not specified for a major-mode, ;;; @@ about PGP ;;; -(defvar mime-edit-signing-type 'pgp-elkins - "*PGP signing type (pgp-elkins, pgp-kazu or nil).") +(defvar mime-edit-signing-type 'pgp-mime + "*PGP signing type (pgp-mime, pgp-kazu or nil).") -(defvar mime-edit-encrypting-type 'pgp-elkins - "*PGP encrypting type (pgp-elkins, pgp-kazu or nil).") +(defvar mime-edit-encrypting-type 'pgp-mime + "*PGP encrypting type (pgp-mime, pgp-kazu or nil).") ;;; @@ about tag @@ -1619,16 +1619,16 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (mime-edit-enquote-region bb eb) ) ((string-equal type "signed") - (cond ((eq mime-edit-signing-type 'pgp-elkins) - (mime-edit-sign-pgp-elkins bb eb boundary) + (cond ((eq mime-edit-signing-type 'pgp-mime) + (mime-edit-sign-pgp-mime bb eb boundary) ) ((eq mime-edit-signing-type 'pgp-kazu) (mime-edit-sign-pgp-kazu bb eb boundary) )) ) ((string-equal type "encrypted") - (cond ((eq mime-edit-encrypting-type 'pgp-elkins) - (mime-edit-encrypt-pgp-elkins bb eb boundary) + (cond ((eq mime-edit-encrypting-type 'pgp-mime) + (mime-edit-encrypt-pgp-mime bb eb boundary) ) ((eq mime-edit-encrypting-type 'pgp-kazu) (mime-edit-encrypt-pgp-kazu bb eb boundary) @@ -1666,7 +1666,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (replace-match (concat "-" (substring tag 2))) ))))) -(defun mime-edit-sign-pgp-elkins (beg end boundary) +(defun mime-edit-sign-pgp-mime (beg end boundary) (save-excursion (save-restriction (narrow-to-region beg end) @@ -1674,9 +1674,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (mime-edit-translate-region beg end boundary)) (ctype (car ret)) (encoding (nth 1 ret)) - (parts (nth 3 ret)) - (pgp-boundary (concat "pgp-sign-" boundary)) - ) + (pgp-boundary (concat "pgp-sign-" boundary))) (goto-char beg) (insert (format "Content-Type: %s\n" ctype)) (if encoding @@ -1724,7 +1722,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (vector from recipients header) )) -(defun mime-edit-encrypt-pgp-elkins (beg end boundary) +(defun mime-edit-encrypt-pgp-mime (beg end boundary) (save-excursion (save-restriction (let (from recipients header) @@ -1738,9 +1736,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (mime-edit-translate-region beg end boundary)) (ctype (car ret)) (encoding (nth 1 ret)) - (parts (nth 3 ret)) - (pgp-boundary (concat "pgp-" boundary)) - ) + (pgp-boundary (concat "pgp-" boundary))) (goto-char beg) (insert header) (insert (format "Content-Type: %s\n" ctype)) diff --git a/mime-parse.el b/mime-parse.el index 67c03b7..5ea30dd 100644 --- a/mime-parse.el +++ b/mime-parse.el @@ -229,12 +229,12 @@ If is is not found, return DEFAULT-ENCODING." (make-mime-content-type 'text 'plain) )) cb ce ret ncb children (i 0)) - (goto-char body-end) - (if (re-search-backward close-delimiter nil t) - (setq body-end (match-beginning 0)) - ) (save-restriction - (narrow-to-region header-end body-end) + (goto-char body-end) + (narrow-to-region header-end + (if (re-search-backward close-delimiter nil t) + (match-beginning 0) + body-end)) (goto-char header-start) (re-search-forward rsep nil t) (setq cb (match-end 0)) diff --git a/semi-def.el b/semi-def.el index 41032db..583b65a 100644 --- a/semi-def.el +++ b/semi-def.el @@ -29,7 +29,7 @@ (eval-when-compile (require 'cl)) -(defconst mime-module-version '("WEMI" "Hayakawa" 1 5 2) +(defconst mime-module-version '("WEMI" "Nebukawa" 1 5 3) "Implementation name, version name and numbers of MIME-kernel package.") (autoload 'mule-caesar-region "mule-caesar" -- 1.7.10.4