* Sync up with semi-1_13_4.

* semi-def.el (mime-user-interface-product): Bump up to
AKEMI 1.13.2.

diff --git a/AKEMI-VERSION b/AKEMI-VERSION
index 808a23e..240d1c1 100644 (file)
--- a/AKEMI-VERSION
+++ b/AKEMI-VERSION
@@ -1,6 +1,6 @@
 \e$B>K;RBN\e(B           AKEMI 1.12.1
 \e$B?e>=BN\e(B           AKEMI 1.13.1
-\e$BA04cK<\e(B
+\e$BA04cK<\e(B           AKEMI 1.13.2
 \e$B3QKl\e(B
 \e$BFz:L\e(B
 \e$B7kKl\e(B

diff --git a/ChangeLog b/ChangeLog
index b40e9c6..8cf9ca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-06-02  Tanaka Akira  <akr@jaist.ac.jp>
+
+       * Sync up with semi-1_13_4.
+
+       * semi-def.el (mime-user-interface-product): Bump up to
+       AKEMI 1.13.2.
+
 1999-05-03  Tanaka Akira  <akr@jaist.ac.jp>
 
        * mime-view.el (unpack): Abolish unused local variable.
@@ -126,6 +133,59 @@
         (mime-preview-condition): Set up for 'mime-preview-text/x-vcard.
 
 \f
+1999-05-12  MORIOKA Tomohiko  <tomo@m17n.org>
+
+       * SEMI: Version 1.13.4 (Terai) released.
+
+1999-04-06  Shuhei KOBAYASHI  <shuhei@aqua.ocn.ne.jp>
+
+       * mime-edit.el (mime-delete-field): Use `std11-field-end'.
+
+1999-03-30  Keiichi Suzuki  <kei-suzu@mail.wbs.ne.jp>
+
+       * mime-edit.el (mime-edit-decode-single-part-in-buffer): Normalize
+       EOL code in MIME encoded text part.
+
+1999-03-27  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el (mime-preview-follow-current-entity): Don't copy
+       header if current entity is root.
+
+1999-03-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-charset-type-list): Add `tis-620'.
+
+\f
+1999-02-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI: Version 1.13.3 (Komaiko) released.
+
+1999-02-26  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * SEMI-MK (install-semi-package): Install mime-setup.el(c).
+       (compile-semi-package): Compile mime-setup.el as well.
+
+1999-02-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-content-types): Add definition of
+       application/vnd.ms-powerpoint for myself :-P
+       (mime-file-types): Add setting of *.ppt for
+       application/vnd.ms-powerpoint.
+
+1999-02-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-partial.el
+       (mime-combine-message/partial-pieces-automatically): Call
+       `mime-store-message/partial-piece' in the buffer when it is
+       called.
+
+       * mime-play.el (mime-store-message/partial-piece): Don't move to
+       point-min.
+
+       * mime-play.el (mime-store-message/partial-piece): Don't expect
+       called in raw-buffer.
+
+\f
 1999-01-27  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * SEMI: Version 1.13.2 (Mikawa) released.
@@ -250,7 +310,7 @@
 \f
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.13.0 (Matt\e.D\8eò) released.
+       * SEMI: Version 1.13.0 (Matt\e-Dò)\e-A released.
 
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -748,7 +808,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.3 (Ecch\8eþ-Nakagawa) released.
+       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa)\e-A released.
 
        * mime-play.el (mime-delq-null-situation): Add new optional
        argument `ignored-value'.
@@ -777,7 +837,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.2 (N\8eòmachi) released.
+       * REMI: Version 1.8.2 (N\e-Dòmachi)\e-A released.
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -896,7 +956,7 @@
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.0 (Ecch\8eþ-Kokubu) released.
+       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu)\e-A released.
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -1732,7 +1792,7 @@
 \f
 1998-06-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.5.0 (Nishi-Ny\8eþzen) released.
+       * SEMI: Version 1.5.0 (Nishi-Ny\e-Dþzen)\e-A released.
 
        * README.en (Required environment): Modify for FLIM 1.3.0.
 
@@ -1784,7 +1844,7 @@
 \f
 1998-06-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.6 (Ny\8eþzen) released.
+       * SEMI: Version 1.4.6 (Ny\e-Dþzen)\e-A released.
 
 1998-05-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -1997,7 +2057,7 @@
 \f
 1998-05-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.4 (Ecch\8eþ-Miyazaki) released.
+       * SEMI: Version 1.4.4 (Ecch\e-Dþ-Miyazaki)\e-A released.
 
        * mime-play.el (mime-mailcap-method-filename-alist): New variable.
        (mime-mailcap-method-sentinel): New function.
@@ -2123,7 +2183,7 @@
 \f
 1998-05-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.1 (\8eÒmi) released.
+       * SEMI: Version 1.4.1 (\e-DÒmi)\e-A released.
 
        * README.en (Required environment): Modify for FLIM 1.2.0.
 
@@ -2283,7 +2343,7 @@
 \f
 1998-04-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.3.2 (N\8eò) was released.
+       * SEMI: Version 1.3.2 (N\e-Dò)\e-A was released.
 
        * mime-edit.el (mime-edit-mode-entity-prefix): New variable.
        (mime-edit-mode-entity-map): New variable.
@@ -2938,7 +2998,7 @@
 \f
 1998-03-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.2 (Nonoichi-K\8eòdaimae) was released.
+       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae)\e-A was released.
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -3021,7 +3081,7 @@
        * mime-file.el: Rename `mime-article/extract-file' ->
        `mime-extract-current-entity'.
 
-1998-03-03  Fran\e.A\8eçois Pinard   <pinard@iro.umontreal.ca>
+1998-03-03  François Pinard   <pinard@iro.umontreal.ca>
 
        * mime-edit.el (mime-edit-insert-signature): Function
        `mime-edit-insert-tag' is sometimes called with more arguments
@@ -3050,7 +3110,7 @@
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e.D\8eþtaku-mae) was released.
+       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
 
        * SEMI-ELS: Remove mime-tar.el.
 
@@ -3187,14 +3247,14 @@
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\8eòh\8eòji) was released.
+       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mime-view.el, mime-pgp.el, mime-partial.el: Rename
        `mime::article/content-info' -> `mime-raw-content-info'.
 
-1997-11-11  Fran\e.A\8eçois Pinard   <pinard@iro.umontreal.ca>
+1997-11-11  François Pinard   <pinard@iro.umontreal.ca>
 
        * mime-edit.el: Modify space in prompt and removespurious trailing
        spaces in the files. (cf. [tm-en:1507])

diff --git a/Makefile b/Makefile
index a5c9677..b46e356 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 PACKAGE = semi
 API    = 1.13
-RELEASE = 2
+RELEASE = 4
 
 TAR    = tar
 RM     = /bin/rm -f
@@ -23,7 +23,7 @@ VERSION_SPECIFIC_LISPDIR = NONE
 GOMI   = *.elc
 
 VERSION        = $(API).$(RELEASE)
-ARC_DIR = /pub/GNU/elisp/semi/semi-$(API)-for-flim-1.12
+ARC_DIR = /pub/mule/semi/semi-$(API)-for-flim-1.12
 
 
 elc:

diff --git a/SEMI-MK b/SEMI-MK
index 6a0de68..d74efc4 100644 (file)
--- a/SEMI-MK
+++ b/SEMI-MK
@@ -83,14 +83,14 @@ LISPDIR=%s\n" PREFIX EXEC_PREFIX LISPDIR))
   (Custom-make-dependencies)
 
   (compile-elisp-modules (append semi-modules-to-compile
-                                '(auto-autoloads custom-load))
+                                '(mime-setup auto-autoloads custom-load))
                         ".")
   )
 
 (defun install-semi-package ()
   (config-semi-package)
   (install-elisp-modules (append semi-modules
-                                '(mime auto-autoloads custom-load))
+                                '(mime-setup auto-autoloads custom-load))
                         "./"
                         (expand-file-name SEMI_PREFIX
                                           (expand-file-name "lisp"

diff --git a/VERSION b/VERSION
index 54312ec..1b62189 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -76,8 +76,8 @@
 1.13.0 Matt\e-Dò\e-A                     \e$(B>>G$\e(B
 1.13.1 Kaga-Kasama             \e$(B2C2l3^4V\e(B
 1.13.2 Mikawa                  \e$(BH~@n\e(B
------- Komaiko                 \e$(B>.Iq;R\e(B
------- Terai                   \e$(B;{0f\e(B
+1.13.3 Komaiko                 \e$(B>.Iq;R\e(B
+1.13.4 Terai                   \e$(B;{0f\e(B
 ------ Meih\e-Dò\e-A                     \e$(BL@Jv\e(B
 ------ Komatsu                 \e$(B>.>>\e(B
 :      :                       :
@@ -144,8 +144,8 @@
 1.13.0 Shizuoka                \e$(B@E2,\e(B
 1.13.1 Abekawa                 \e$(B0BG\@n\e(B
 1.13.2 Mochimune               \e$(BMQ=!\e(B
------- Yaizu                   \e$(B>FDE\e(B
------- Nishi-Yaizu             \e$(B@>>FDE\e(B
+1.13.3 Yaizu                   \e$(B>FDE\e(B
+1.13.4 Nishi-Yaizu             \e$(B@>>FDE\e(B
 ------ Fijieda                 \e$(BF#;^\e(B
 ------ Rokug\e-Dò\e-A                    \e$(BO;9g\e(B
 ------ Shimada                 \e$(BEgED\e(B

diff --git a/ftp.in b/ftp.in
index 6c3ad02..9da2fb4 100644 (file)
--- a/ftp.in
+++ b/ftp.in
@@ -2,12 +2,12 @@
 
   It is available from
 
-    ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-API-for-flim-1.12
+    ftp://ftp.etl.go.jp/pub/mule/semi/semi-API-for-flim-1.12
 
 --[[message/external-body;
        access-type=anon-ftp;
-       site="ftp.jaist.ac.jp";
-       directory="/pub/GNU/elisp/semi/semi-API-for-flim-1.12";
+       site="ftp.etl.go.jp";
+       directory="/pub/mule/semi/semi-API-for-flim-1.12";
        name="PACKAGE-VERSION.tar.gz";
        mode=image]]
 Content-Type: application/octet-stream;

diff --git a/mime-edit.el b/mime-edit.el
index 3a5ec24..0ab79ad 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -219,6 +219,7 @@ To insert a signature file automatically, call the function
     ("application"
      ("octet-stream" ("type" "" "tar" "shar"))
      ("postscript")
+     ("vnd.ms-powerpoint")
      ("x-kiss" ("x-cnf")))
     ("image"
      ("gif")
@@ -303,6 +304,11 @@ To insert a signature file automatically, call the function
      "base64"
      "attachment" (("filename" . file))
      )
+    ("\\.ppt$"                         ; MS Power Point
+     "application" "vnd.ms-powerpoint" nil
+     "base64"
+     "attachment" (("filename" . file))
+     )
 
     ("\\.pln$"
      "text"    "plain"         nil
@@ -483,6 +489,7 @@ If encoding is nil, it is determined from its contents."
     (cn-big5           8 "base64")
     (big5              8 "base64")
     (shift_jis         8 "base64")
+    (tis-620           8 "base64")
     (iso-2022-jp-2     7 "base64")
     (iso-2022-int-1    7 "base64")
     ))
@@ -2170,8 +2177,7 @@ Content-Transfer-Encoding: 7bit
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (delete-region (match-beginning 0)
-                    (progn (forward-line 1) (point)))
-      )))
+                    (1+ (std11-field-end))))))
 
 \f
 ;;;
@@ -2706,9 +2712,15 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                              encoding nil)
                        )))))))
     (if (or encoded (not not-decode-text))
-       (decode-mime-charset-region (point-min)(point-max)
-                                   (or charset default-mime-charset))
-      )
+       (progn
+         (save-excursion
+           (goto-char (point-min))
+           (while (re-search-forward "\r\n" nil t)
+             (replace-match "\n")
+             ))
+         (decode-mime-charset-region (point-min)(point-max)
+                                     (or charset default-mime-charset))
+         ))
     (let ((he (if (re-search-forward "^$" nil t)
                  (match-end 0)
                (point-min)

diff --git a/mime-partial.el b/mime-partial.el
index 14b3ff9..733f7f3 100644 (file)
--- a/mime-partial.el
+++ b/mime-partial.el
@@ -35,6 +35,7 @@ automatically."
   (let* ((id (cdr (assoc "id" situation)))
         (target (cdr (assq 'major-mode situation)))
         (subject-buf (eval (cdr (assq 'summary-buffer-exp situation))))
+        (mother (current-buffer))
         subject-id
         (root-dir (expand-file-name
                    (concat "m-prts-" (user-login-name))
@@ -71,8 +72,7 @@ automatically."
                   (situation (mime-entity-situation message))
                   (the-id (cdr (assoc "id" situation))))
              (when (string= the-id id)
-               (save-excursion
-                 (set-buffer (mime-entity-buffer message))
+               (with-current-buffer mother
                  (mime-store-message/partial-piece message situation)
                  )
                (if (file-exists-p full-file)

diff --git a/mime-play.el b/mime-play.el
index 47ea860..6e1d206 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -546,7 +546,6 @@ It is registered to variable `mime-preview-quitting-method-alist'."
 ;;;
 
 (defun mime-store-message/partial-piece (entity cal)
-  (goto-char (mime-entity-point-min entity))
   (let* ((root-dir
          (expand-file-name
           (concat "m-prts-" (user-login-name)) temporary-file-directory))
@@ -554,7 +553,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
         (number (cdr (assoc "number" cal)))
         (total (cdr (assoc "total" cal)))
         file
-        (mother mime-preview-buffer)
+        (mother (current-buffer))
         )
     (or (file-exists-p root-dir)
        (make-directory root-dir)

diff --git a/mime-view.el b/mime-view.el
index cbed0a7..be89e18 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -1320,9 +1320,10 @@ It calls following-method selected from variable
                           (concat "^"
                                   (apply (function regexp-or) fields)
                                   ":") ""))))
-                    (if (and
-                         (eq (mime-entity-media-type ci) 'message)
-                         (eq (mime-entity-media-subtype ci) 'rfc822))
+                    (if (or (null entity-node-id)
+                            (and
+                             (eq (mime-entity-media-type ci) 'message)
+                             (eq (mime-entity-media-subtype ci) 'rfc822)))
                         nil
                       (if str
                           (insert str)

diff --git a/semi-def.el b/semi-def.el
index df215ad..d4eb6f4 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -30,7 +30,7 @@
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["AKEMI" (1 13 1) "\e$B?e>=BN\e(B"]
+(defconst mime-user-interface-product ["AKEMI" (1 13 2) "\e$BA04cK<\e(B"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"