Sync up with SEMI 1.5.3.

diff --git a/ChangeLog b/ChangeLog
index d7a0d59..c1e8d23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
+       * NEWS (`pgp-elkins' -> `pgp-mime'): New section.
+
+       * mime-edit.el: Rename `pgp-elkins' -> `pgp-mime'.
+
+1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * 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  <morioka@jaist.ac.jp>
+
+       * mime-parse.el (mime-parse-multipart): fixed.
+
+\f
+1998-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
        * 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 (file)
--- 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 (file)
--- 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 (file)
--- a/VERSION
+++ b/VERSION
@@ -18,13 +18,13 @@
 0.115  Hinomiko                \e$(BF|8f;R\e(B
 0.115.1        Oyanagi                 \e$(B>.Lx\e(B
 0.115.2        Inokuchi                \e$(B0f8}\e(B
-0.116  D\e-Dòhòji                       \e$(BF;K!;{\e(B\e-A
+0.116  D\e-Dòhòji\e-A                    \e$(BF;K!;{\e(B
 0.118  Sodani                  \e$(BA>C+\e(B
 0.118.1        Shijima                 \e$(B;M==K|\e(B
 0.118.2        Otomaru                 \e$(B254]\e(B
-1.0.0  Nukaj\e-Dþtaku-mae               \e$(B3[=;BpA0\e(B\e-A
+1.0.0  Nukaj\e-Dþtaku-mae\e-A            \e$(B3[=;BpA0\e(B
 1.0.1  Magae                   \e$(BGOBX\e(B
-1.0.2  Nonoichi-K\e-Dòdaimae    \e$(BLn!9;T9)BgA0\e(B\e-A
+1.0.2  Nonoichi-K\e-Dòdaimae\e-A \e$(BLn!9;T9)BgA0\e(B
 1.1.0  Nonoichi                \e$(BLn!9;T\e(B
 1.1.1  Oshino                  \e$(B2!Ln\e(B
 1.1.2  Shin-Nishikanazawa      \e$(B?7@>6bBt\e(B ; <=> JR \e$(B@>6bBt\e(B
@@ -40,23 +40,24 @@
 1.2.4  Arimagawa               \e$(BM-4V@n\e(B
 1.3.0  Nadachi                 \e$(BL>N)\e(B
 1.3.1  Tsutsuishi              \e$(BE{@P\e(B
-1.3.2  N\e-Dò                   \e$(BG=@8\e(B\e-A
+1.3.2  N\e-Dò\e-A                        \e$(BG=@8\e(B
 1.3.3  Uramoto                 \e$(B1:K\\e(B
 1.3.4  Kajiyashiki             \e$(B3a20I_\e(B
 1.4.0  Itoigawa                \e$(B;e5{@n\e(B           ; = JR \e$(BBg;e@~\e(B
-1.4.1  \e-DÒmi                  \e$(B@D3$\e(B\e-A
+1.4.1  \e-DÒmi\e-A                       \e$(B@D3$\e(B
 1.4.2  Oyashirazu              \e$(B?FITCN\e(B
 1.4.3  Ichiburi                \e$(B;T?6\e(B
-1.4.4  Ecch\e-Dþ-Miyazaki               \e$(B1[Cf5\:j\e(B\e-A
+1.4.4  Ecch\e-Dþ-Miyazaki\e-A            \e$(B1[Cf5\:j\e(B
 1.4.5  Tomari                  \e$(BGq\e(B
-1.4.6  Ny\e-Dþzen                       \e$(BF~A1\e(B\e-A
-1.5.0  Nishi-Ny\e-Dþzen         \e$(B@>F~A1\e(B\e-A
+1.4.6  Ny\e-Dþzen\e-A                    \e$(BF~A1\e(B
+1.5.0  Nishi-Ny\e-Dþzen\e-A              \e$(B@>F~A1\e(B
 1.5.1  Ikuji                   \e$(B@8CO\e(B
 1.5.2  Kurobe                  \e$(B9uIt\e(B
------  Uozu                    \e$(B5{DE\e(B             ; <=> \e$(BIY;3COJ}E4F;\e(B
-:      :                       :
+1.5.3  Uozu                    \e$(B5{DE\e(B             ; <=> \e$(BIY;3COJ}E4F;\e(B
+-----  Higashi-Namerikawa      \e$(BEl3j@n\e(B
 -----  Namerikawa              \e$(B3j@n\e(B             ; <=> \e$(BIY;3COJ}E4F;\e(B
-:      :                       :
+-----  Mizuhashi               \e$(B?e66\e(B
+-----  Higashi-Toyama          \e$(BElIY;3\e(B
 -----  Toyama                  \e$(BIY;3\e(B             ; = JR \e$(B9b;3K\@~!"IY;39A@~\e(B
 :      :                       :
 -------        Takaoka                 \e$(B9b2,\e(B             ; = JR \e$(BI98+@~!">kC<@~\e(B
@@ -68,7 +69,7 @@
 :      :                       :
 -------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
 -------        Shin-Hikida             \e$(B?7I%ED\e(B
--------        \e-DÒmi-Shiotsu          \e$(B6a9>1vDE\e(B ; = JR \e$(B8P@>@~\e(B\e-A
+-------        \e-DÒmi-Shiotsu\e-A               \e$(B6a9>1vDE\e(B ; = JR \e$(B8P@>@~\e(B
 -------        Yogo                    \e$(BM>8b\e(B
 -------        Kinomoto                \e$(BLZ%NK\\e(B
 -------        Takatsuki               \e$(B9b7n\e(B
@@ -103,7 +104,7 @@
 1.5.0  Kamonomiya      \e$B3{5\\e(B
 1.5.1  Odawara         \e$(B>.ED86\e(B   ; <=> \e$(B>.ED5^!"H":,EP;3E4F;!"0KF&H":,E4F;\e(B
 1.5.2  Hayakawa        \e$BAa@n\e(B
------  Nebukawa        \e$B:,I\@n\e(B
+1.5.3  Nebukawa        \e$B:,I\@n\e(B
 -----  Manazuru        \e$B??Da\e(B
 -----  Yugawara        \e$BEr2O86\e(B
 -----  Atami           \e$(BG.3$\e(B     ; = JR \e$(B0KEl@~\e(B
@@ -113,7 +114,7 @@
 -----  Kan'nami        \e$(BH!Fn\e(B
 :      :               :
 -----  Kanayama        \e$(B6b;3\e(B     ; =\e$(B!J\e(BJR \e$(BCf1{K\@~!K\e(B
------  Ot\e-Dòbashi     \e$(BHxF,66\e(B\e-A
+-----  Ot\e-Dòbashi\e-A  \e$(BHxF,66\e(B
 -----  Nagoya          \e$(BL>8E20\e(B   ; = JR \e$(B4X@>K\@~!J!&Cf1{K\@~!K\e(B
 :      :               :
 -----  Gifu            \e$(B4tIl\e(B     ; = JR \e$(B9b;3K\@~\e(B
@@ -127,13 +128,13 @@
 -----  Kusatsu         \e$(BApDE\e(B     ; = JR \e$(BApDE@~\e(B
 :      :               :
 -----  Yamashina       \e$(B;32J\e(B     ; = JR \e$(B8P@>@~\e(B
------  Ky\e-Dòto                \e$(B5~ET\e(B     ; = JR \e$(BF`NI@~!&;31"K\@~\e(B\e-A
+-----  Ky\e-Dòto\e-A             \e$(B5~ET\e(B     ; = JR \e$(BF`NI@~!&;31"K\@~\e(B
                                ;   <=> \e$(B6aE4\e(B \e$(B5~ET@~!"5~ET;T8rDL6I\e(B \e$(B1(4]@~\e(B
 :      :               :
------  \e-DÒsaka                \e$(BBg:e\e(B     ; = JR \e$(BBg:e4D>u@~\e(B <=> JR \e$(BEl@>@~\e(B \e$(BKL?7CO\e(B\e-A
+-----  \e-DÒsaka\e-A             \e$(BBg:e\e(B     ; = JR \e$(BBg:e4D>u@~\e(B <=> JR \e$(BEl@>@~\e(B \e$(BKL?7CO\e(B
                                ;   <=> \e$(BBg:e;T8rDL6I!":e?@!":e5^\e(B \e$(BG_ED\e(B
 :      :               :
------  K\e-Dòbe         \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B\e-A
+-----  K\e-Dòbe\e-A              \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B
 
 
 [REMI version names]
@@ -145,10 +146,10 @@
 1.4.0  Himi                    \e$(BI98+\e(B
 1.5.0  Shimao                  \e$(BEgHx\e(B
 1.5.1  Amaharashi              \e$(B1+@2\e(B
--------        Ecch\e-Dþ-Kokubu         \e$(B1[Cf9qJ,\e(B\e-A
+-------        Ecch\e-Dþ-Kokubu\e-A              \e$(B1[Cf9qJ,\e(B
 -------        Fushiki                 \e$(BIzLZ\e(B
 -------        Noumachi                \e$(BG=D.\e(B
--------        Ecch\e-Dþ-Nakagawa               \e$(B1[CfCf@n\e(B\e-A
+-------        Ecch\e-Dþ-Nakagawa\e-A            \e$(B1[CfCf@n\e(B
        (Takaoka)               (\e$(B9b2,\e(B)           ; = JR \e$(BKLN&K\@~!">kC<@~\e(B
 
 
@@ -158,7 +159,7 @@
 ;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
 ;;     Kosei Line              \e$(B8P@>@~\e(B
 ;;-------------------------------------------------------------------------
--------        (\e-DÒmi-Shiotsu)                (\e$(B6a9>1vDE\e(B)       ; = JR \e$(BKLN&K\@~\e(B\e-A
+-------        (\e-DÒmi-Shiotsu)\e-A             (\e$(B6a9>1vDE\e(B)       ; = JR \e$(BKLN&K\@~\e(B
 :      :                       :
--------        Nishi-\e-DÒtsu           \e$(B@>BgDE\e(B\e-A
+-------        Nishi-\e-DÒtsu\e-A                \e$(B@>BgDE\e(B
        (Yamashina)             (\e$(B;32J\e(B)           ; = JR \e$(BEl3$F;K\@~\e(B

diff --git a/mime-edit.el b/mime-edit.el
index 9ad6408..c66b48e 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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"