WEMI 1.8.5: Sync up with SEMI 1.8.5.

diff --git a/ChangeLog b/ChangeLog
index e65982c..7efe51a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1998-09-01  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * WEMI: Version 1.8.5 (Higashi-Tagonoura) released.
+
+1998-08-31  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * README.en (Required environment): Modify APEL and FLIM version.
+
+       * mime-ui-en.sgml (Introduction): Translate.
+
+1998-08-31  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el (mime-view-type-subtype-score-alist): Fix
+       mismatched.
+
 1998-08-10  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mime-text.el (mime-text-insert-decoded-body): Specify line break
@@ -54,7 +69,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.3 (Ecch~-Nakagawa) released.
+       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa) released.\e-A
 
        * mime-play.el (mime-delq-null-situation): Add new optional
        argument `ignored-value'.
@@ -83,7 +98,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.2 (N~machi) released.
+       * REMI: Version 1.8.2 (N\e-Dòmachi) released.\e-A
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -204,7 +219,7 @@
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.0 (Ecch~-Kokubu) released.
+       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu) released.\e-A
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2279,7 +2294,7 @@
 \f
 1998-03-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae)\e-A was released.
+       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae) was released.\e-A
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2391,7 +2406,7 @@
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
+       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae) was released.\e-A
 
        * SEMI-ELS: Remove mime-tar.el.
 
@@ -2528,7 +2543,7 @@
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
+       * SEMI: Version 0.116 (D\e-Dòhòji) was released.\e-A
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 

diff --git a/Makefile b/Makefile
index 4a4d4c6..4ded509 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 PACKAGE = wemi
-VERSION = 1.8.4
+VERSION = 1.8.5
 
 SHELL  = /bin/sh
 MAKE   = make

diff --git a/README.en b/README.en
index 557daee..4c12700 100644 (file)
--- a/README.en
+++ b/README.en
@@ -44,9 +44,9 @@ Required environment
   19.14.  WEMI also does not support Emacs 19.29 to 19.34, XEmacs
   19.15 or XEmacs 20.2 without mule, but WEMI may work with them.
 
-  SEMI requires APEL (8.7 or later) and FLIM (1.8.0 or later) package.
-  Please install them before installing it.  APEL package is available
-  at:
+  SEMI requires APEL (8.17 or later) and FLIM (1.9.1 or later)
+  package.  Please install them before installing it.  APEL package is
+  available at:
 
        ftp://ftp.jaist.ac.jp/pub/GNU/elisp/apel/
 

diff --git a/mime-ui-en.sgml b/mime-ui-en.sgml
index f064b00..6f1b876 100644 (file)
--- a/mime-ui-en.sgml
+++ b/mime-ui-en.sgml
@@ -21,16 +21,14 @@ This file documents SEMI, a MIME user interface for GNU Emacs.
 SEMI is a package for GNU Emacs to provide features related with MIME
 user interface.
 <p>
-SEMI \e$B$,Ds6!$9$k\e(B MIME user interface \e$B$O\e(B MIME-View \e$B$H\e(B MIME-Edit \e$B$+$i$J$j$^\e(B
-\e$B$9!#\e(B
+SEMI provides two user interfaces: MIME-View and MIME-Edit.
 <p> 
-MIME-View \e$B$O\e(B MIME \e$B$d\e(B STD 11 \e$B$*$h$S!XCO0h2=$5$l$?\e(B RFC 822\e$B!Y\e(Bmessage \e$B$rI=<(\e(B
-\e$B$7$?$j!"A`:n$7$?$j$9$k$?$a$N\e(B user interface \e$B$NCf3K$G$9!#\e(B
+MIME-View is a kernel of user interface to display or operate MIME
+messages, STD 11 messages or ``localized RFC 822'' messages.
 <p>
-MIME-Edit \e$B$O\e(B MIME message \e$B$r@8@.$9$k$?$a$N\e(B user interface \e$B$G$9!#\e(B
+MIME-Edit is a user interface to compose MIME messages.
 <p>
-\e$B3F\e(B MUA \e$B$G$3$l$i$N5!G=$rMxMQ$9$k$3$H$K$h$j!"9bEY$J\e(B MIME \e$B5!G=$rMxMQ$9$k$3\e(B
-\e$B$H$,$G$-$^$9!#\e(B
+Each MUA can use powerful MIME features to combine these features.
 
 
 <h1> MIME message viewing

diff --git a/mime-ui-en.texi b/mime-ui-en.texi
index 20db91d..9946c5f 100644 (file)
--- a/mime-ui-en.texi
+++ b/mime-ui-en.texi
@@ -30,17 +30,15 @@ This file documents SEMI, a MIME user interface for GNU Emacs.
 SEMI is a package for GNU Emacs to provide features related with MIME
 user interface.@refill
 
-SEMI \e$B$,Ds6!$9$k\e(B MIME user interface \e$B$O\e(B MIME-View \e$B$H\e(B MIME-Edit \e$B$+$i$J$j$^\e(B
-\e$B$9!#\e(B@refill
+SEMI provides two user interfaces: MIME-View and MIME-Edit.@refill
 
  
-MIME-View \e$B$O\e(B MIME \e$B$d\e(B STD 11 \e$B$*$h$S!XCO0h2=$5$l$?\e(B RFC 822\e$B!Y\e(Bmessage \e$B$rI=<(\e(B
-\e$B$7$?$j!"A`:n$7$?$j$9$k$?$a$N\e(B user interface \e$B$NCf3K$G$9!#\e(B@refill
+MIME-View is a kernel of user interface to display or operate MIME
+messages, STD 11 messages or ``localized RFC 822'' messages.@refill
 
-MIME-Edit \e$B$O\e(B MIME message \e$B$r@8@.$9$k$?$a$N\e(B user interface \e$B$G$9!#\e(B@refill
+MIME-Edit is a user interface to compose MIME messages.@refill
 
-\e$B3F\e(B MUA \e$B$G$3$l$i$N5!G=$rMxMQ$9$k$3$H$K$h$j!"9bEY$J\e(B MIME \e$B5!G=$rMxMQ$9$k$3\e(B
-\e$B$H$,$G$-$^$9!#\e(B
+Each MUA can use powerful MIME features to combine these features.
 
 
 @node MIME-View, MIME-Edit, Introduction, Top

diff --git a/mime-view.el b/mime-view.el
index e11e2dd..3d09f91 100644 (file)
--- a/mime-view.el
+++ b/mime-view.el
@@ -467,10 +467,11 @@ Please press `v' key in this buffer."
 MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
   :group 'mime-view
   :type '(repeat (cons (choice :tag "Media-Type"
-                              (item :tag "Type/Subtype"
-                                    (cons symbol symbol))
-                              (item :tag "Type" symbol)
-                              (item :tag "Default" t))
+                              (cons :tag "Type/Subtype"
+                                    (symbol :tag "Primary-type")
+                                    (symbol :tag "Subtype"))
+                              (symbol :tag "Type")
+                              (const :tag "Default" t))
                       integer)))
 
 (defun mime-display-multipart/alternative (entity situation)