Sync up with the latest semi-1_13 branch.

diff --git a/ChangeLog b/ChangeLog
index 6a4aabc..10e6d01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-26  MORIOKA Tomohiko  <tomo@m17n.org>
+
+       * mime-play.el (mime-store-message/partial-piece): Don't refer
+       `mime-preview-buffer'.
+
 1999-08-25  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * SEMI-CFG: Use `if' instead of `when'.

diff --git a/Makefile b/Makefile
index 1f659c7..d0ffeec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 PACKAGE = wemi
 API    = 1.13
-RELEASE = 5
+RELEASE = 6
 
 FLIM_API= 1.13
 
@@ -60,9 +60,11 @@ tar:
        $(RM) /tmp/$(PACKAGE)-$(VERSION)/ftp.in
        cd /tmp; $(TAR) cvzf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
        cd /tmp; $(RM) -r $(PACKAGE)-$(VERSION)
-       sed "s/VERSION/$(VERSION)/" < ftp.in | sed "s/API/$(API)/" \
-               | sed "s/PACKAGE/$(PACKAGE)/" \
-               | sed "s/FLIM_API/$(FLIM_API)/" > ftp
+
+invoice:
+       sed -e "s/VERSION/$(VERSION)/" -e "s/API/$(API)/" \
+               -e "s/PACKAGE/$(PACKAGE)/" \
+               -e "s/FLIM_API/$(FLIM_API)/" < ftp.in > ftp
 
 release:
        -$(RM) $(ARC_DIR)/$(PACKAGE)-$(VERSION).tar.gz

diff --git a/VERSION b/VERSION
index 4bb062d..1b629b7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -79,7 +79,7 @@
 1.13.3 Komaiko                 \e$(B>.Iq;R\e(B
 1.13.4 Terai                   \e$(B;{0f\e(B
 1.13.5 Meih\e-Dò\e-A                     \e$(BL@Jv\e(B
------- Komatsu                 \e$(B>.>>\e(B
+1.13.6 Komatsu                 \e$(B>.>>\e(B
 :      :                       :
 -------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
 -------        Shin-Hikida             \e$(B?7I%ED\e(B
@@ -147,7 +147,7 @@
 1.13.3 Yaizu                   \e$(B>FDE\e(B
 1.13.4 Nishi-Yaizu             \e$(B@>>FDE\e(B
 1.13.5 Fijieda                 \e$(BF#;^\e(B
------- Rokug\e-Dò\e-A                    \e$(BO;9g\e(B
+1.13.6 Rokug\e-Dò\e-A                    \e$(BO;9g\e(B
 ------ Shimada                 \e$(BEgED\e(B
 ------ Kanaya                  \e$(B6bC+\e(B     ; = \e$(BBg0f@nE4F;\e(B
 ------ Kikugawa                \e$(B5F@n\e(B

diff --git a/mime-play.el b/mime-play.el
index 5cf0aac..29545e2 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -644,15 +644,11 @@ It is registered to variable `mime-preview-quitting-method-alist'."
                  (and (file-exists-p file)
                       (delete-file file)
                       ))
-               (save-window-excursion
-                 (setq major-mode 'mime-show-message-mode)
-                 (mime-view-buffer (current-buffer) nil mother)
-                 )
                (let ((pwin (or (get-buffer-window mother)
                                (get-largest-window)))
-                     (pbuf (save-excursion
-                             (set-buffer full-buf)
-                             mime-preview-buffer)))
+                     (pbuf (mime-display-message
+                            (mime-open-entity 'buffer (current-buffer))
+                            nil mother nil 'mime-show-message-mode)))
                  (set-window-buffer pwin pbuf)
                  (select-window pwin)
                  )))))

diff --git a/semi-def.el b/semi-def.el
index bdf9f8f..606567d 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -32,7 +32,7 @@
 
 (require 'widget)
 
-(defconst mime-user-interface-product ["WEMI" (1 13 5) "Fijieda"]
+(defconst mime-user-interface-product ["WEMI" (1 13 6) "Rokugò"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"