Merge semi-1_10_2.
authormorioka <morioka>
Sat, 31 Oct 1998 15:38:55 +0000 (15:38 +0000)
committermorioka <morioka>
Sat, 31 Oct 1998 15:38:55 +0000 (15:38 +0000)
17 files changed:
ChangeLog
Makefile
NEWS
README.en
README.ja [new file with mode: 0644]
SEMI-ELS
VERSION
mime-edit.el
mime-image.el
mime-partial.el
mime-pgp.el
mime-play.el
mime-text.el [deleted file]
mime-view.el
mime-w3.el
semi-def.el
semi-setup.el

index 1cee95f..1a8fe9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,116 @@
+1998-10-31  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI: Version 1.10.2 (Higashi-Kanazawa) released.
+
+1998-10-29  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * NEWS (Abolish variable `mime-temp-directory'): New subsection.
+
+1998-10-27  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * mime-edit.el (mime-edit-decode-buffer): Limit search bound for
+       "Content-Transfer-Encoding:".
+
+\f
+1998-10-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI: Version 1.10.1 (Morimoto) released.
+
+       * README.ja, README.en (Required environment): Modify for APEL 9.6
+       and FLIM 1.11.2.
+
+1998-10-24  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-play.el, mime-pgp.el, mime-partial.el, mime-image.el,
+       mime-edit.el: Use `temporary-file-directory' instead of
+       `mime-temp-directory'.
+
+\f
+1998-10-23  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * SEMI: Version 1.10.0 (Tsubata) released.
+
+1998-10-22  Yoshiki Hayashi   <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+       * README.ja: New file.
+
+1998-10-22  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el, mime-view.el: Use `(featurep 'xemacs)' instead of
+       `running-xemacs'.
+
+1998-10-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el, SEMI-ELS: Move function `mime-display-text/plain',
+       `mime-display-text/enriched' and `mime-display-text/richtext' from
+       mime-text to mime-view.el; abolish mime-text.el.
+
+       * mime-play.el: Don't Require `mime-text' when compiling.
+
+       * mime-w3.el: Require `mime' instead of `mime-text'.
+
+1998-10-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * semi-setup.el (mime-setup-enable-inline-image): Use `(featurep
+       'xemacs)' instead of `running-xemacs'.
+
+1998-10-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * README.en (Required environment): Modify to require APEL 9.5 and
+       FLIM 1.11.1.
+
+       * mime-edit.el: - Don't require emu.
+                       - Require invisible.
+
+       * semi-def.el: Require poe instead of emu.
+
+1998-10-20  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-decode-buffer): Convert encoding to
+       lower case.
+
+1998-10-19  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-view.el (mime-view-ignored-field-list): Modify each element
+       of initial value to include `:'.
+       (mime-view-visible-field-list): Likewise.
+       (mime-display-entity): Use `mime-insert-header' instead of
+       `mime-insert-decoded-header'.
+
+1998-10-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-edit.el (mime-edit-decode-buffer): Call
+       `mule-caesar-region' for text/x-rot13-47-48 entity.
+
+1998-09-22  Shozo UEHARA      <uehara@eken.phys.nagoya-u.ac.jp>
+
+       * mime-play.el (mime-raw-play-entity): Initialize `max-escore' by
+       0. <cf. [tm-ja:3432]>
+
+1998-10-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * NEWS (Changes in SEMI 1.10): New section.
+
+       * NEWS (Changes in SEMI 1.9): New section.
+
+       * NEWS (User-Agent field): New subsection.
+
+1998-10-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mime-play.el (mime-view-caesar): Use `mime-insert-text-content'
+       instead of `mime-text-insert-decoded-body'.
+
+       * mime-w3.el (mime-preview-text/html): Use
+       `mime-insert-text-content' instead of
+       `mime-text-insert-decoded-body'.
+
+       * mime-text.el: Abolish function `mime-text-insert-decoded-body'.
+       (mime-display-text/plain): Use `mime-insert-text-content' instead
+       of `mime-text-insert-decoded-body'.
+       (mime-display-text/richtext): Likewise.
+       (mime-display-text/enriched): Likewise.
+
+\f
 1998-10-14  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * SEMI: Version 1.9.1 (Kurikara) released.
        `mime-product-name', `mime-product-version' and
        `mime-product-code-name'.
 
-       * semi-def.el (mime-user-interface-product): New variable; abolish
+       * semi-def.el (mime-user-interface-product): New constant; abolish
        `mime-user-interface-version'.
 
 1998-10-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
index 66ecd93..32bebc7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 PACKAGE = semi
-VERSION = 1.9.1
+VERSION = 1.10.2
 
 TAR    = tar
 RM     = /bin/rm -f
diff --git a/NEWS b/NEWS
index febedc3..4d10e0a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,54 @@
 SEMI NEWS --- history of major-changes.
 Copyright (C) 1998 Free Software Foundation, Inc.
 
+* Changes in SEMI 1.10
+
+** Abolish variable `mime-temp-directory'
+
+  FLIM 1.11 and SEMI 1.10 use variable `temporary-file-directory'
+instead of `mime-temp-directory'.  So environment variable
+"MIME_TMP_DIR" and "TM_TMP_DIR" are not effective to specify temporary
+directory of FLIM and SEMI.
+
+
+** Abolish function `mime-text-insert-decoded-body'
+
+  SEMI 1.10 uses function `mime-insert-text-content' of FLIM 1.11 API
+instead of `mime-text-insert-decoded-body'.
+
+  Now `mime-view-caesar' does not run `mime-text-decode-hook'.
+
+
+* Changes in SEMI 1.9
+
+** User option `mime-encoding-list'
+
+  SEMI 1.9 requires FLIM 1.10 API.  In FLIM 1.10 API, variable
+`mime-file-encoding-method-alist' was abolished.  If you want to use
+non-standard Content-Transfer-Encoding to insert a file into sending
+message, please edit new user option `mime-encoding-list' instead of
+`mime-file-encoding-method-alist'.
+
+
+** Constant `mime-user-interface-product'
+
+  Constant `mime-user-interface-version' was renamed to
+`mime-user-interface-product'.  Notice that data format is changed
+too.
+
+  FLIM 1.10 API provides following macros to access a slot of the new
+data format:
+
+     mime-product-name (product)
+
+     mime-product-version (product)
+
+     mime-product-code-name (product)
+
+Please use them to get elements of the constant
+`mime-user-interface-product'.
+
+
 * Changes in SEMI 1.8
 
 ** Don't use "file" command to detect content of entity
@@ -39,6 +87,15 @@ value were ignored.  On the other hand,
 `request-partial-message-method' is required to return structure of
 message at current summary line.  Format of it is mime-entity.
 
+
+** User-Agent field
+
+  MIME-Edit inserts User-Agent field instaed of X-Emacs field if
+`mime-edit-insert-user-agent-field' is not nil.  Contents of
+User-Agent is specified by mime-edit-user-agent-value'.
+
+  X-Emacs field related features were abolished.
+
 \f
 * Changes in SEMI 1.7
 
index a1943c1..a831529 100644 (file)
--- a/README.en
+++ b/README.en
@@ -40,7 +40,7 @@ Required environment
   19.14.  SEMI also does not support Emacs 19.29 to 19.34, XEmacs
   19.15 or XEmacs 20.2 without mule, but SEMI may work with them.
 
-  SEMI requires APEL (9.1 or later) and FLIM (1.10.1 or later)
+  SEMI requires APEL (9.6 or later) and FLIM (1.11.2 or later)
   package.  Please install them before installing it.  APEL package is
   available at:
 
@@ -251,4 +251,4 @@ Other authors
     Artur Pioro <artur@flugor.if.uj.edu.pl>
     Dan Rich <drich@morpheus.corp.sgi.com>
         (contribute to evolve mime-image.el with XEmacs)
-    Katsumi Yamaoka <yamaoka@ga.sony.co.jp>
+    Katsumi Yamaoka <yamaoka@jpl.org>
diff --git a/README.ja b/README.ja
new file mode 100644 (file)
index 0000000..da785cf
--- /dev/null
+++ b/README.ja
@@ -0,0 +1,258 @@
+[SEMI \e$B$N3K%Q%C%1!<%8$N\e(B README (\e$BF|K\8lHG\e(B)]
+
+SEMI \e$B$H$O!)\e(B
+============
+
+  SEMI \e$B$O\e(B GNU Emacs \e$B$K\e(B MIME \e$B5!G=$rDs6!$9$k%i%$%V%i%j!<$G$9!#\e(BMIME  \e$B$O%a%C\e(B
+  \e$B%;!<%8$K\e(B (ASCII) plain text \e$B0J30$NFbMF$d%X%C%@!<$r4^$a$i$l$k$h$&$K$9\e(B
+  \e$B$k$?$a$KDs0F$5$l$F$$$k\e(B internet standard \e$B$G$9!#\e(B
+
+       RFC 2045 : Internet Message Bodies
+       RFC 2046 : Media Types
+       RFC 2047 : Message Header Extensions
+       RFC 2048 : MIME Registration Procedures
+       RFC 2049 : MIME Conformance
+
+  SEMI \e$B$O0J2<$N5!G=$,$"$j$^$9!#\e(B
+
+       - MIME \e$B%a%C%;!<%81\Mw\e(B (mime-view-mode) (RFC 2045 .. 2049)
+       - MIME \e$B%a%C%;!<%8:n@.\e(B (mime-edit-mode) (RFC 2045 .. 2049)
+
+  MIME \e$B%a%C%;!<%81\Mw$H:n@.$O0J2<$N5!G=$bDs6!$7$F$$$^$9\e(B:
+
+       - Content-Disposition \e$B%U%#!<%k%I$K$h$k%U%!%$%kL>$N07$$\e(B (RFC
+       - 1806)
+       - PGP/MIME \e$B0BA4$J\e(B Multipart (RFC 2015)
+       - application/pgp (draft-kazu-pgp-mime-00.txt; obsolete)
+       - text/richtext (RFC 1521; obsolete; \e$B1\Mw$N$_\e(B)
+       - text/enriched (RFC 1896)
+       - mailcap \e$B$K$h$k30ItJ}K!@_Dj\e(B (RFC 1524)
+
+  \e$B$3$N%Q%C%1!<%8$O\e(B MUA \e$B$N$?$a$N\e(B MIME \e$B3HD%$r4^$s$G$$$J$$$3$H$KCm0U$7$F\e(B
+  \e$B$/$@$5$$!#$=$l$i$OJL$N%Q%C%1!<%8$H$7$F%j%j!<%9$5$l$^$9!#\e(B
+
+
+\e$BI,MW$J4D6-\e(B
+==========
+
+  SEMI \e$B$O\e(B mule \e$B5!G=$D$-$N\e(B XEmacs 20.2 \e$B0J9_$H\e(B Emacs 20 \e$B$r%5%]!<%H$7$^$9!#\e(B
+
+  SEMI \e$B$O\e(B Emacs 19.28 \e$B$d\e(B XEmacs 19.14 \e$B0JA0$O%5%]!<%H$7$^$;$s!#\e(BSEMI \e$B$O\e(B
+  Emacs 19.29 \e$B$+$i\e(B Emacs 19.34\e$B!"\e(BXEmacs 19.15 \e$B$+$i\e(B mule \e$B5!G=$N$J$$\e(B
+  XEmacs 20.2 \e$B$^$G$O%5%]!<%H$7$^$;$s$,!"\e(BSEMI \e$B$O$=$l$i$GF0:n$9$k$+$b$7\e(B
+  \e$B$l$^$;$s!#\e(B
+
+  SEMI \e$B$O\e(B APEL (9.6 \e$B0J9_\e(B) \e$B$H\e(B FLIM (1.11.2 \e$B0J9_\e(B) \e$B$rI,MW$H$7$^$9!#\e(BSEMI 
+  \e$B$r%$%s%9%H!<%k$9$kA0$K$^$:$=$l$i$r%$%s%9%H!<%k$7$F$/$@$5$$!#\e(BAPEL \e$B%Q%C\e(B
+  \e$B%1!<%8$O0J2<$N$H$3$m$G<hF@2DG=$G$9\e(B:
+
+       ftp://ftp.jaist.ac.jp/pub/GNU/elisp/apel/
+
+  FLIM \e$B%Q%C%1!<%8$O0J2<$N$H$3$m$G<hF@2DG=$G$9!#\e(B
+
+       ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/
+
+  PGP/MIME \e$B$H\e(B application/pgp \e$B$O\e(B mailcrypt \e$B$+\e(B tiny-pgp \e$B%Q%C%1!<%8$rI,\e(B
+  \e$BMW$H$7$^$9!#\e(B
+
+  \e$B%Q%C%1!<%8\e(B enriched.el \e$B$O\e(B text/enriched \e$B$r:n@.$9$k$?$a$KI,MW$G$9$N$G!"\e(B
+  Emacs 19.28 \e$B0JA0\e(B (\e$B8x<0HG$N\e(B MULE 2.3 \e$B$r4^$`\e(B) \e$B$G$O!"\e(Btext/enriched \e$B$N\e(B
+  WYSIWYG \e$B:n@.$O;HMQ$G$-$^$;$s!#\e(B
+
+\e$B%$%s%9%H!<%k\e(B
+============
+
+(a) \e$BE83+$7$?>l=j$G<B9T\e(B
+
+  \e$BB>$N%G%#%l%/%H%j!<$K%$%s%9%H!<%k$7$?$/$J$$$J$i!"0J2<$N$3$H$@$1$r$d$C\e(B
+  \e$B$F$/$@$5$$\e(B:
+
+       % make
+
+  emacs \e$B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"\e(B
+
+       % make EMACS=xemacs
+
+  `EMACS=...' \e$B$,>JN,$5$l$k$H!"\e(BEmacs=emacs \e$B$,;H$o$l$^$9!#\e(B
+
+(b) make install
+
+  \e$BB>$N%G%#%l%/%H%j!<$K%$%s%9%H!<%k$7$?$$$J$i!"0J2<$N$3$H$r$7$F$/$@$5$$\e(B:
+
+       % make install
+
+  emacs \e$B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"\e(B
+
+       % make install EMACS=xemacs
+
+  `EMACS=...' \e$B$,>JN,$5$l$k$H!"\e(BEmacs=emacs \e$B$,;H$o$l$^$9!#\e(B
+
+  Emacs Lisp \e$B%W%m%0%i%`$H%7%'%k%9%/%j%W%H$N$?$a$N%G%#%l%/%H%j!<LZ$N@\\e(B
+  \e$BF,<-\e(B (prefix) \e$B$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"\e(B
+
+       % make install PREFIX=~/
+
+  `PREFIX=...' \e$B$,>JN,$5$l$k$H!";XDj$5$l$?\e(B emacs \e$B%3%^%s%I$N%G%#%l%/%H%j!<\e(B
+  \e$BLZ$N@\F,<-$,;HMQ$5$l$^$9\e(B (\e$B$*$=$i$/\e(B /usr/local \e$B$G$9\e(B)\e$B!#\e(B
+
+  \e$BNc$($P!"\e(BPREFIX=/usr/local \e$B$H\e(B Emacs 19.34 \e$B$,;XDj$5$l$l$P!"0J2<$N%G%#\e(B
+  \e$B%l%/%H%j!<LZ$,:n@.$5$l$^$9!#\e(B
+
+       /usr/local/share/emacs/20.2/site-lisp/  --- emu
+       /usr/local/share/emacs/site-lisp/apel/  --- APEL
+       /usr/local/share/emacs/site-lisp/flim/   --- FLIM
+       /usr/local/share/emacs/site-lisp/semi/   --- SEMI
+
+  site-lisp \e$B%G%#%l%/%H%j!<$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"\e(B:
+
+    % make install LISPDIR=~/share/emacs/lisp
+
+  `LISPDIR=...' \e$B$,>JN,$5$l$k$H!";XDj$5$l$?\e(B emacs \e$B$N%3%^%s%I$N\e(B
+  site-lisp \e$B%G%#%l%/%H%j!<$,;H$o$l$^$9\e(B (\e$B$*$=$i$/\e(B
+  /usr/local/share/emacs/site-lisp \e$B$+\e(B /usr/local/lib/xemacs/site-lisp)
+  \e$B$G$9!#\e(B
+
+  emu \e$B%b%8%e!<%k\e(B (APEL \e$B%Q%C%1!<%8$KF~$C$F$$$^$9\e(B) \e$B$,I8=`$G$J$$%G%#%l%/\e(B
+  \e$B%H%j!<$K%$%s%9%H!<%k$5$l$F$$$k>l9g$O!"$=$l$i$N$"$k>l=j$r;XDj$9$kI,MW\e(B
+  \e$B$,$"$j$^$9!#Nc$($P!"\e(B:
+
+    % make install VERSION_SPECIFIC_LISPDIR=~/elisp
+
+(c) XEmacs \e$B$N%Q%C%1!<%8$H$7$F%$%s%9%H!<%k$9$k\e(B
+
+  XEmacs \e$B$N%Q%C%1!<%8%G%#%l%/%H%j!<$K%$%s%9%H!<%k$9$k>l9g$O!"0J2<$N$3\e(B
+  \e$B$H$r$7$F$/$@$5$$\e(B:
+
+       % make install-package
+
+  emacs \e$B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"\e(B
+
+       % make install-package XEMACS=xemacs-21
+
+  `XEMACS=...' \e$B$,>JN,$5$l$k$H!"\e(BXEMACS=xemacs \e$B$,;HMQ$5$l$^$9!#\e(B
+
+  \e$B%Q%C%1!<%8$N%G%#%l%/%H%j!<$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P\e(B:
+
+       % make install PACKAGEDIR=~/.xemacs
+
+  `PACKAGEDIR=...' \e$B$,>JN,$5$l$k$H!"B8:_$9$k%Q%C%1!<%8%G%#%l%/%H%j!<$N\e(B
+  \e$B:G=i$N$b$N$,;H$o$l$^$9!#\e(B
+
+  XEmacs \e$B$N%Q%C%1!<%8%7%9%F%`$O\e(B XEmacs 21.0 \e$B$+$=$l0J9_$rMW5a$9$k$3$H$K\e(B
+  \e$BCm0U$7$F$/$@$5$$!#\e(B
+
+(a,b,c)
+
+  \e$BB>$N>JN,2DG=$J@_Dj$r%U%!%$%k\e(B ${archive}/SEMI-CFG \e$B$rJT=8$9$k$3$H$G;X\e(B
+  \e$BDj$G$-$^$9!#\e(B${archive}/README.ja \e$B$H\e(B ${archive}/SEMI/CFG \e$B$N%3%a%s%H$r\e(B
+  \e$BFI$s$G$/$@$5$$!#\e(B
+
+\e$B=i4|2=\e(B
+==============
+
+(a) load-path
+
+  Emacs \e$B$+\e(B Mule \e$B$r;H$C$F$$$k$J$i!"\e(BFLIM \e$B$N%G%#%l%/%H%j!<$r\e(B
+  load-path \e$B$KDI2C$7$F$/$@$5$$!#=i4|@_Dj$G%$%s%9%H!<%k$7$?$J$i!"<!$N$h\e(B
+  \e$B$&$K\e(B subdirs.el \e$B$r=q$/$3$H$,$G$-$^$9!#Nc\e(B:
+
+  --------------------------------------------------------------------
+  (normal-top-level-add-to-load-path
+   '("apel" "flim" "semi"))
+  --------------------------------------------------------------------
+
+  XEmacs \e$B$r;H$C$F$$$k$J$i!"\e(Bload-path \e$B$r@_Dj$9$kI,MW$O$"$j$^$;$s!#\e(B
+
+(b) mime-setup
+
+  \e$B0J2<$N$b$N$r\e(B ~/.emacs \e$B$KF~$l$F$/$@$5$$!#\e(B
+
+       (load "mime-setup")
+
+
+\e$B@bL@J8=q\e(B
+=============
+
+  \e$B=i$a$K!"\e(B${archive}/README.en \e$B$rFI$s$G$/$@$5$$!#\e(B
+
+  RFC 822, 1524, 1806, 1847, 1896, 2015, 2045, 2046, 2047, 2048, 2049
+  \e$B$O\e(B anonymous ftp \e$B$G0J2<$N$H$3$m$+$i<hF@2DG=$G$9!#\e(B
+
+       ftp://ftp.merit.edu/internet/documents/rfc/
+
+
+\e$B%a!<%j%s%0%j%9%H\e(B
+===========
+
+  \e$B%P%0Js9p$d2~A1$NDs0F$r=q$$$?$H$-$O!"@'Hs\e(B tm \e$B%a!<%j%s%0%j%9%H$KAw$C$F\e(B
+  \e$B$/$@$5$$\e(B:
+
+       bug-tm-en@chamonix.jaist.ac.jp  (\e$B1Q8l\e(B)
+       bug-tm-ja@chamonix.jaist.ac.jp  (\e$BF|K\8l\e(B)
+
+  tm ML \e$B$rDL$7$F!"\e(BSEMI\e$B$N%P%0$rJs9p$7$?$j!"\e(BSEMI \e$B$N:G?7$N%j%j!<%9$r<hF@\e(B
+  \e$B$7$?$j!"\e(BSEMI \e$B$N>-Mh$N3HD%$N5DO@$r$7$?$j$9$k$3$H$,$G$-$^$9!#\e(Btm ML \e$B$K\e(B
+  \e$B;22C$9$k$K$O!"6u$NEE;R%a!<%k$r\e(B
+
+       tm-en-help@chamonix.jaist.ac.jp (\e$B1Q8l\e(B)
+       tm-ja-help@chamonix.jaist.ac.jp (\e$BF|K\8l\e(B)
+
+  \e$B$KAw$C$F$/$@$5$$!#\e(B
+
+  morioka@jaist.ac.jp \e$B$N$h$&$J!":n<T$KD>@\%a!<%k$rAw$i$J$$$h$&$KCm0U$7\e(B
+  \e$B$F$/$@$5$$!#$=$l$O!"H/@8$7$?LdBj$OB>$N4D6-$G$b5/$3$C$F$$$k$O$:$@$+$i\e(B
+  \e$B$G$9\e(B (\e$B$b$7$=$&$G$J$1$l$P!"$=$l$O@_Dj$NLdBj$G!"\e(BSEMI \e$B$N%P%0$G$O$"$j$^\e(B
+  \e$B$;$s\e(B)\e$B!#\e(B tm \e$B%a!<%j%s%0%j%9%H$G5DO@$9$Y$-$G$9!#$H$K$+$/!":n<T$X$ND>@\\e(B
+  \e$B$N%a!<%k$OH?1~$,$J$$$+$b$7$l$^$;$s!#%a!<%k$O\e(B tm \e$B%a!<%j%s%0%j%9%H$XAw$C\e(B
+  \e$B$F$/$@$5$$!#\e(B
+
+
+CVS \e$B$K$h$k3+H/\e(B
+=====================
+
+  CVS \e$B$K$h$k3+H/$K;22C$7$?$$$H$-$O!"%"%+%&%s%HL>$H\e(B UNIX \e$BMM<0$G0E9f2=$5\e(B
+  \e$B$l$?%Q%9%o!<%I$r\e(B
+
+       cvs@chamonix.jaist.ac.jp
+
+  \e$B$KAw$C$F$/$@$5$$!#3+H/$K;22C$5$l$k$3$H$r4|BT$7$F$$$^$9!#\e(B
+
+
+\e$B:n<T\e(B
+=======
+
+\e$B:,K\ItJ,$N:n<T\e(B
+
+    MORIOKA Tomohiko <morioka@jaist.ac.jp>
+       (the author of mime-view and various parts of SEMI)
+    UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
+       (the author of mime.el of emacs-mime-tools.  mime.el is the
+       origin of mime-edit.el of SEMI)
+
+\e$BB>$N:n<T\e(B
+
+    Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+       (a major author of signature.el and a lot of codes)
+    MASUTANI Yasuhiro <masutani@me.es.osaka-u.ac.jp>
+       (anonymous ftp codes of mime-play.el)
+    OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+       (a major author of mime-partial.el and signature.el)
+
+    Steinar Bang <sb@metis.no>
+    Steven L. Baur <steve@miranova.com>
+    Kevin Broadey <KevinB@bartley.demon.co.uk>
+    Alastair Burt <burt@dfki.uni-kl.de>
+    Eric Ding <ericding@San-Jose.ate.slb.com>
+    Thierry Emery <Thierry.Emery@aar.alcatel-alsthom.fr>
+    Simon Josefsson <jas@pdc.kth.se>
+    Jens Lautenbacher <jtl@tkm.physik.uni-karlsruhe.de>
+    Carsten Leonhardt <leo@arioch.tng.oche.de>
+    Pekka Marjola <marjola@bilbo.ntc.nokia.com>
+    Hisashi Miyashita <himi@bird.scphys.kyoto-u.ac.jp>
+    Kazuhiro Ohta <ohta@ele.cst.nihon-u.ac.jp>
+    Alexandre Oliva <oliva@dcc.unicamp.br>
+    Fran\e,Ag\e(Bois Pinard <pinard@iro.umontreal.ca>
+    Artur Pioro <artur@flugor.if.uj.edu.pl>
+    Dan Rich <drich@morpheus.corp.sgi.com>
+        (contribute to evolve mime-image.el with XEmacs)
+    Katsumi Yamaoka <yamaoka@jpl.org>
index ff195ea..6ffa7fc 100644 (file)
--- a/SEMI-ELS
+++ b/SEMI-ELS
@@ -6,7 +6,7 @@
 
 (setq semi-modules-to-compile
       '(signature
-       semi-def mime-view mime-text mime-play mime-partial mime-edit
+       semi-def mime-view mime-play mime-partial mime-edit
        semi-setup mail-mime-setup))
 
 (setq semi-modules-not-to-compile nil)
diff --git a/VERSION b/VERSION
index 639bad7..7402b43 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -67,9 +67,9 @@
 1.8.6  Fukuoka                 \e$(BJ!2,\e(B
 1.9.0  Isurugi                 \e$(B@PF0\e(B
 1.9.1  Kurikara                \e$(B6fMx2@Me\e(B
------  Tsubata                 \e$(BDEH(\e(B
------  Morimoto                \e$(B?9K\\e(B
--------        Higashi-Kanazawa        \e$(BEl6bBt\e(B
+1.10.0 Tsubata                 \e$(BDEH(\e(B
+1.10.1 Morimoto                \e$(B?9K\\e(B
+1.10.2 Higashi-Kanazawa        \e$(BEl6bBt\e(B
 -------        Kanazawa                \e$(B6bBt\e(B             ; <=> \e$(BKLN&E4F;\e(B \e$(BKLE46bBt\e(B
 -------        Nishi-Kanazawa          \e$(B@>6bBt\e(B           ; <=> \e$(BKLN&E4F;\e(B \e$(B?7@>6bBt\e(B
 -------        (JR) Nonoichi           \e$(BLn!9;T\e(B
 1.8.5  Higashi-Tagonoura       \e$(BElED;R%N1:\e(B
 1.8.6  Yoshiwara               \e$(B5H86\e(B     ; = \e$(B3YFnE4F;\e(B
 1.9.0  Fuji                    \e$(BIY;N\e(B     ; = JR \e$(B?H1d@~\e(B
------  Fujikawa                \e$(BIY;N@n\e(B
------  Shin-Kambara            \e$(B?73w86\e(B
------  Kambara                 \e$(B3w86\e(B
------  Yui                     \e$(BM3Hf\e(B
------  Okitsu                  \e$(B6=DE\e(B
------  Shimizu                 \e$(B@6?e\e(B
------  Kusanagi                \e$(BApFe\e(B
------  Shizuoka                \e$(B@E2,\e(B
------  Abekawa                 \e$(B0BG\@n\e(B
------  Mochimune               \e$(BMQ=!\e(B
------  Yaizu                   \e$(B>FDE\e(B
------  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
------  Kanaya                  \e$(B6bC+\e(B     ; = \e$(BBg0f@nE4F;\e(B
------  Kikugawa                \e$(B5F@n\e(B
------  Kakegawa                \e$(B3]@n\e(B     ; = \e$(BE7N5IML>8PE4F;\e(B
+1.9.1  Fujikawa                \e$(BIY;N@n\e(B
+1.10.0 Shin-Kambara            \e$(B?73w86\e(B
+1.10.1 Kambara                 \e$(B3w86\e(B
+------ Yui                     \e$(BM3Hf\e(B
+------ Okitsu                  \e$(B6=DE\e(B
+------ Shimizu                 \e$(B@6?e\e(B
+------ Kusanagi                \e$(BApFe\e(B
+------ Shizuoka                \e$(B@E2,\e(B
+------ Abekawa                 \e$(B0BG\@n\e(B
+------ Mochimune               \e$(BMQ=!\e(B
+------ Yaizu                   \e$(B>FDE\e(B
+------ 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
+------ Kanaya                  \e$(B6bC+\e(B     ; = \e$(BBg0f@nE4F;\e(B
+------ Kikugawa                \e$(B5F@n\e(B
+------ Kakegawa                \e$(B3]@n\e(B     ; = \e$(BE7N5IML>8PE4F;\e(B
 :      :                       :
------  Kanayama                \e$(B6b;3\e(B     ; =\e$(B!J\e(BJR \e$(BCf1{K\@~!K\e(B
------  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
+------ Kanayama                \e$(B6b;3\e(B     ; =\e$(B!J\e(BJR \e$(BCf1{K\@~!K\e(B
+------ 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
+------ Gifu                    \e$(B4tIl\e(B     ; = JR \e$(B9b;3K\@~\e(B
 :      :                       :
------  Samegai                 \e$(B@C%v0f\e(B
+------ Samegai                 \e$(B@C%v0f\e(B
 ;;-------------------------------------------------------------------------
 ;;     West Japan Railway      \e$(B@>F|K\N95RE4F;\e(B   http://www.westjr.co.jp/
 ;;-------------------------------------------------------------------------
------  Maibara                 \e$(BJF86\e(B     ; = JR \e$(BKLN&K\@~\e(B
+------ Maibara                 \e$(BJF86\e(B     ; = JR \e$(BKLN&K\@~\e(B
 :      :                       :
------  Kusatsu                 \e$(BApDE\e(B     ; = JR \e$(BApDE@~\e(B
+------ 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-A                     \e$(B5~ET\e(B     ; = JR \e$(BF`NI@~!&;31"K\@~\e(B
+------ Yamashina               \e$(B;32J\e(B     ; = JR \e$(B8P@>@~\e(B
+------ 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-A                     \e$(BBg:e\e(B     ; = JR \e$(BBg:e4D>u@~\e(B <=> JR \e$(BEl@>@~\e(B \e$(BKL?7CO\e(B
+------ \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-A                      \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B
+------ K\e-Dòbe\e-A                      \e$(B?@8M\e(B     ; = JR \e$(B;3M[K\@~\e(B
 
 
 [REMI version names]
index eab91e7..3c38997 100644 (file)
 
 ;;; Code:
 
-(require 'emu)
 (require 'sendmail)
 (require 'mail-utils)
 (require 'mel)
 (require 'mime-view)
 (require 'signature)
 (require 'alist)
+(require 'invisible)
 
 
 ;;; @ version
@@ -764,7 +764,7 @@ Tspecials means any character that matches with it in header must be quoted.")
     )
   "MIME-edit menubar entry.")
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        ;; modified by Pekka Marjola <pema@iki.fi>
        ;;      1995/9/5 (c.f. [tm-en:69])
        (defun mime-edit-define-menu-for-xemacs ()
@@ -962,7 +962,7 @@ User customizable variables (not documented all of them):
       )))
 
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        (add-minor-mode 'mime-edit-mode-flag
                       '((" MIME-Edit "  mime-transfer-level-string))
                       mime-edit-mode-map
@@ -994,7 +994,7 @@ User customizable variables (not documented all of them):
     (force-mode-line-update)
 
     ;; Define menu for XEmacs.
-    (if running-xemacs
+    (if (featurep 'xemacs)
        (mime-edit-define-menu-for-xemacs)
       )
 
@@ -1032,7 +1032,7 @@ just return to previous mode."
          (mime-edit-translate-buffer)))
     ;; Restore previous state.
     (setq mime-edit-mode-flag nil)
-    (if (and running-xemacs
+    (if (and (featurep 'xemacs)
             (featurep 'menubar))
        (delete-menu-item (list mime-edit-menu-title))
       )
@@ -2413,7 +2413,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
   (let* ((mime-edit-draft-file-name
          (or (buffer-file-name)
              (make-temp-name
-              (expand-file-name "mime-draft" mime-temp-directory))))
+              (expand-file-name "mime-draft" temporary-file-directory))))
         (separator mail-header-separator)
         (id (concat "\""
                     (replace-space-with-underline (current-time-string))
@@ -2657,17 +2657,21 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                                          ))))
                                   params "")))
                     encoding
-                    encoded)
+                    encoded
+                    (limit (save-excursion
+                             (if (search-forward "\n\n" nil t)
+                                 (1- (point))))))
                (save-excursion
                  (if (re-search-forward
-                      "Content-Transfer-Encoding:" nil t)
+                      "^Content-Transfer-Encoding:" limit t)
                      (let ((beg (match-beginning 0))
                            (hbeg (match-end 0))
                            (end (std11-field-end)))
                        (setq encoding
-                             (eliminate-top-spaces
-                              (std11-unfold-string
-                               (buffer-substring hbeg end))))
+                             (downcase
+                              (eliminate-top-spaces
+                               (std11-unfold-string
+                                (buffer-substring hbeg end)))))
                        (if (or charset (eq type 'text))
                            (progn
                              (delete-region beg (1+ end))
@@ -2689,6 +2693,10 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                           (match-end 0)
                         (point-min)
                         )))
+                 (if (and (eq type 'text)
+                          (eq stype 'x-rot13-47-48))
+                     (mule-caesar-region he (point-max))
+                   )
                  (if (= (point-min) 1)
                      (progn
                        (goto-char he)
index 1e20ac0..d5e4aa0 100644 (file)
          ((eq (aref gl 0) 'xbm)
           (let ((xbm-file
                  (make-temp-name
-                  (expand-file-name "tm" mime-temp-directory))))
+                  (expand-file-name "tm" temporary-file-directory))))
             (with-temp-buffer
               (insert (aref gl 2))
               (write-region (point-min)(point-max) xbm-file)
index f5378eb..e085eab 100644 (file)
@@ -39,7 +39,8 @@ partial messages using mime-view."
         (subject-buf (eval (cdr (assq 'summary-buffer-exp situation))))
         subject-id
         (root-dir (expand-file-name
-                   (concat "m-prts-" (user-login-name)) mime-temp-directory))
+                   (concat "m-prts-" (user-login-name))
+                   temporary-file-directory))
         (request-partial-message-method
          (cdr (assq 'request-partial-message-method situation)))
         full-file)
index 67fbb6e..0facca0 100644 (file)
@@ -166,7 +166,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                   (1- knum)
                 (1+ knum)))
         (orig-entity (nth onum (mime-entity-children mother)))
-        (basename (expand-file-name "tm" mime-temp-directory))
+        (basename (expand-file-name "tm" temporary-file-directory))
         (orig-file (make-temp-name basename))
         (sig-file (concat orig-file ".sig"))
         )
index 2e921fb..11f904b 100644 (file)
@@ -31,7 +31,6 @@
 (require 'filename)
 
 (eval-when-compile
-  (require 'mime-text)
   (condition-case nil
       (require 'bbdb)
     (error (defvar bbdb-buffer-name nil)))
@@ -229,7 +228,7 @@ specified, play as it.  Default MODE is \"play\"."
        (if (cdr ret)
            (let ((rest ret)
                  (max-score 0)
-                 max-escore
+                 (max-escore 0)
                  max-examples
                  max-situations)
              (while rest
@@ -325,9 +324,9 @@ specified, play as it.  Default MODE is \"play\"."
              (name (mime-entity-safe-filename entity)))
          (setq name
                (if (and name (not (string= name "")))
-                   (expand-file-name name mime-temp-directory)
+                   (expand-file-name name temporary-file-directory)
                  (make-temp-name
-                  (expand-file-name "EMI" mime-temp-directory))
+                  (expand-file-name "EMI" temporary-file-directory))
                  ))
           (mime-write-entity-content entity name)
          (message "External method is starting...")
@@ -544,7 +543,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
   (goto-char (mime-entity-point-min entity))
   (let* ((root-dir
          (expand-file-name
-          (concat "m-prts-" (user-login-name)) mime-temp-directory))
+          (concat "m-prts-" (user-login-name)) temporary-file-directory))
         (id (cdr (assoc "id" cal)))
         (number (cdr (assoc "number" cal)))
         (total (cdr (assoc "total" cal)))
@@ -705,7 +704,7 @@ It is registered to variable `mime-preview-quitting-method-alist'."
       )
     (setq buffer-read-only nil)
     (erase-buffer)
-    (mime-text-insert-decoded-body entity)
+    (mime-insert-text-content entity)
     (mule-caesar-region (point-min) (point-max))
     (set-buffer-modified-p nil)
     (set-buffer mother)
diff --git a/mime-text.el b/mime-text.el
deleted file mode 100644 (file)
index 025172d..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-;;; mime-text.el --- mime-view content filter for text
-
-;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
-
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Keywords: text, MIME, multimedia, mail, news
-
-;; This file is part of SEMI (Suite of Emacs MIME Interfaces).
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Code:
-
-(require 'mime-view)
-
-
-;;; @ code conversion
-;;;
-
-(defun mime-text-insert-decoded-body (entity)
-  "Insert text body of ENTITY in SITUATION.
-It decodes MIME-encoding then code-converts as MIME-charset.
-MIME-encoding is value of field 'encoding of SITUATION.  It must be
-'nil or string.  MIME-charset is value of field \"charset\" of
-SITUATION.  It must be symbol."
-  (let ((str (mime-entity-content entity)))
-    (insert
-     (if (and (mime-entity-cooked-p entity)
-             (member (mime-entity-encoding entity)
-                     '(nil "7bit" "8bit" "binary")))
-        str
-       (decode-mime-charset-string str
-                                  (or (mime-content-type-parameter
-                                       (mime-entity-content-type entity)
-                                       "charset")
-                                      default-mime-charset)
-                                  'CRLF)
-       )))
-  (run-hooks 'mime-text-decode-hook)
-  )
-
-
-;;; @ content filters for mime-text
-;;;
-
-(defun mime-display-text/plain (entity situation)
-  (save-restriction
-    (narrow-to-region (point-max)(point-max))
-    (mime-text-insert-decoded-body entity)
-    (goto-char (point-max))
-    (if (not (eq (char-after (1- (point))) ?\n))
-       (insert "\n")
-      )
-    (mime-add-url-buttons)
-    (run-hooks 'mime-display-text/plain-hook)
-    ))
-
-(defun mime-display-text/richtext (entity situation)
-  (save-restriction
-    (narrow-to-region (point-max)(point-max))
-    (mime-text-insert-decoded-body entity)
-    (let ((beg (point-min)))
-      (remove-text-properties beg (point-max) '(face nil))
-      (richtext-decode beg (point-max))
-      )))
-
-(defun mime-display-text/enriched (entity situation)
-  (save-restriction
-    (narrow-to-region (point-max)(point-max))
-    (mime-text-insert-decoded-body entity)
-    (let ((beg (point-min)))
-      (remove-text-properties beg (point-max) '(face nil))
-      (enriched-decode beg (point-max))
-      )))
-
-
-;;; @ end
-;;;
-
-(provide 'mime-text)
-
-;;; mime-text.el ends here
index f52432a..2804365 100644 (file)
@@ -295,15 +295,15 @@ SYMBOL must be major mode in raw-buffer or t.  t means default.
 Interface of FUNCTION must be (ENTITY SITUATION).")
 
 (defvar mime-view-ignored-field-list
-  '(".*Received" ".*Path" ".*Id" "References"
-    "Replied" "Errors-To"
-    "Lines" "Sender" ".*Host" "Xref"
-    "Content-Type" "Precedence"
-    "Status" "X-VM-.*")
+  '(".*Received:" ".*Path:" ".*Id:" "^References:"
+    "^Replied:" "^Errors-To:"
+    "^Lines:" "^Sender:" ".*Host:" "^Xref:"
+    "^Content-Type:" "^Precedence:"
+    "^Status:" "^X-VM-.*:")
   "All fields that match this list will be hidden in MIME preview buffer.
 Each elements are regexp of field-name.")
 
-(defvar mime-view-visible-field-list '("Dnas.*" "Message-Id")
+(defvar mime-view-visible-field-list '("^Dnas.*:" "^Message-Id:")
   "All fields that match this list will be displayed in MIME preview buffer.
 Each elements are regexp of field-name.")
 
@@ -421,9 +421,38 @@ Each elements are regexp of field-name.")
 ;;; @@@ entity presentation
 ;;;
 
-(autoload 'mime-display-text/plain "mime-text")
-(autoload 'mime-display-text/enriched "mime-text")
-(autoload 'mime-display-text/richtext "mime-text")
+(defun mime-display-text/plain (entity situation)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (mime-insert-text-content entity)
+    (run-hooks 'mime-text-decode-hook)
+    (goto-char (point-max))
+    (if (not (eq (char-after (1- (point))) ?\n))
+       (insert "\n")
+      )
+    (mime-add-url-buttons)
+    (run-hooks 'mime-display-text/plain-hook)
+    ))
+
+(defun mime-display-text/richtext (entity situation)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (mime-insert-text-content entity)
+    (run-hooks 'mime-text-decode-hook)
+    (let ((beg (point-min)))
+      (remove-text-properties beg (point-max) '(face nil))
+      (richtext-decode beg (point-max))
+      )))
+
+(defun mime-display-text/enriched (entity situation)
+  (save-restriction
+    (narrow-to-region (point-max)(point-max))
+    (mime-insert-text-content entity)
+    (run-hooks 'mime-text-decode-hook)
+    (let ((beg (point-min)))
+      (remove-text-properties beg (point-max) '(face nil))
+      (enriched-decode beg (point-max))
+      )))
 
 (defvar mime-view-announcement-for-message/partial
   (if (and (>= emacs-major-version 19) window-system)
@@ -681,9 +710,9 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
       (when header-is-visible
        (if header-presentation-method
            (funcall header-presentation-method entity situation)
-         (mime-insert-decoded-header entity
-                                     mime-view-ignored-field-list
-                                     mime-view-visible-field-list))
+         (mime-insert-header entity
+                             mime-view-ignored-field-list
+                             mime-view-visible-field-list))
        (goto-char (point-max))
        (insert "\n")
        (run-hooks 'mime-display-header-hook)
@@ -731,7 +760,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
     )
   "Menu for MIME Viewer")
 
-(cond (running-xemacs
+(cond ((featurep 'xemacs)
        (defvar mime-view-xemacs-popup-menu
         (cons mime-view-menu-title
               (mapcar (function
@@ -801,7 +830,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
     (define-key mime-view-mode-map
       [backspace] (function mime-preview-scroll-down-entity))
     (if (functionp default)
-       (cond (running-xemacs
+       (cond ((featurep 'xemacs)
               (set-keymap-default-binding mime-view-mode-map default)
               )
              (t
@@ -812,7 +841,7 @@ MEDIA-TYPE must be (TYPE . SUBTYPE), TYPE or t.  t means default."
        (define-key mime-view-mode-map
          mouse-button-2 (function mime-button-dispatcher))
       )
-    (cond (running-xemacs
+    (cond ((featurep 'xemacs)
           (define-key mime-view-mode-map
             mouse-button-3 (function mime-view-xemacs-popup-menu))
           )
index fec612c..a3d3349 100644 (file)
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (require 'w3)
-(require 'mime-text)
+(require 'mime)
 
 (defmacro mime-put-keymap-region (start end keymap)
   `(put-text-property ,start ,end
@@ -51,7 +51,8 @@
     (mime-save-background-color
      (save-restriction
        (narrow-to-region p p)
-       (mime-text-insert-decoded-body entity)
+       (mime-insert-text-content entity)
+       (run-hooks 'mime-text-decode-hook)
        (w3-region p (point-max))
        (mime-put-keymap-region p (point-max) w3-mode-map)
        ))))
index 29c9cb3..6cd2769 100644 (file)
 
 ;;; Code:
 
-(require 'emu)
+(require 'poe)
 
 (eval-when-compile (require 'cl))
 
 (require 'custom)
 
-(defconst mime-user-interface-product ["SEMI" (1 9 1) "Kurikara"]
+(defconst mime-user-interface-product ["SEMI" (1 10 2) "Higashi-Kanazawa"]
   "Product name, version number and code name of MIME-kernel package.")
 
 (autoload 'mule-caesar-region "mule-caesar"
index e7decc8..9137f02 100644 (file)
@@ -44,7 +44,7 @@ it is used as hook to set."
 ;; for image/* and X-Face
 (defvar mime-setup-enable-inline-image
   (and window-system
-       (or running-xemacs
+       (or (featurep 'xemacs)
           (and (featurep 'mule)(module-installed-p 'bitmap))
           ))
   "*If it is non-nil, semi-setup sets up to use mime-image.")