Sync up with SEMI 1.12.1 and release.

diff --git a/ChangeLog b/ChangeLog
index 13289ae..96acc3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-01-21  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * WEMI: Version 1.12.1 (Kusanagi) released.
+
+1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-play.el (mime-detect-content): Use `mime-entity-content'
+       not to refer to buffer directly.
+
 1999-01-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mime-view.el: Must require `emu'.

diff --git a/Makefile b/Makefile
index f79fc06..bc8d146 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 PACKAGE = wemi
 API    = 1.12
-RELEASE = 0
+RELEASE = 1
 
 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/GNU/elisp/semi/wemi
 
 
 elc:
@@ -61,7 +61,8 @@ 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)/" > ftp
+       sed "s/VERSION/$(VERSION)/" < ftp.in | sed "s/API/$(API)/" \
+               | sed "s/PACKAGE/$(PACKAGE)/" > ftp
 
 release:
        -$(RM) $(ARC_DIR)/$(PACKAGE)-$(VERSION).tar.gz

diff --git a/VERSION b/VERSION
index 12069ca..e103fee 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -72,7 +72,8 @@
 1.10.2 Higashi-Kanazawa        \e$(BEl6bBt\e(B
 1.11.0 Kanazawa                \e$(B6bBt\e(B             ; <=> \e$(BKLN&E4F;\e(B \e$(BKLE46bBt\e(B
 1.12.0 Nishi-Kanazawa          \e$(B@>6bBt\e(B           ; <=> \e$(BKLN&E4F;\e(B \e$(B?7@>6bBt\e(B
-1.12.1 [JR] Nonoichi           \e$(BLn!9;T\e(B
+1.12.1 [JR] Nonoichi           [JR] \e$(BLn!9;T\e(B
+------ Matt\e-Dò\e-A                     \e$(B>>G$\e(B
 :      :                       :
 -------        Tsuruga                 \e$(BFX2l\e(B             ; = JR \e$(B>.IM@~\e(B
 -------        Shin-Hikida             \e$(B?7I%ED\e(B

diff --git a/mime-play.el b/mime-play.el
index bf2b19b..65949f3 100644 (file)
--- a/mime-play.el
+++ b/mime-play.el
@@ -1,6 +1,6 @@
 ;;; mime-play.el --- Playback processing module for mime-view.el
 
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998,1999 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Created: 1995/9/26 (separated from tm-view.el)
@@ -472,16 +472,7 @@ SUBTYPE is symbol to indicate subtype of media-type.")
 
 (defun mime-detect-content (entity situation)
   (let (type subtype)
-    (let ((mdata (save-excursion
-                  ;;(set-buffer (mime-entity-buffer entity))
-                  (let* ((start (mime-entity-body-start entity))
-                         (end (progn
-                                (goto-char start)
-                                (end-of-line)
-                                (point))))
-                    (mime-decode-string (buffer-substring start end)
-                                        (mime-entity-encoding entity))
-                    )))
+    (let ((mdata (mime-entity-content entity))
          (rest mime-magic-type-alist))
       (while (not (let ((cell (car rest)))
                    (if cell