From: morioka Date: Sat, 31 Oct 1998 15:38:55 +0000 (+0000) Subject: Merge semi-1_10_2. X-Git-Tag: gnus-oomori-199812161505~5 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc0a722ec13e11cd7aa00db6929cb2505d1c9556;p=elisp%2Fsemi.git Merge semi-1_10_2. --- diff --git a/ChangeLog b/ChangeLog index 1cee95f..1a8fe9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,116 @@ +1998-10-31 MORIOKA Tomohiko + + * SEMI: Version 1.10.2 (Higashi-Kanazawa) released. + +1998-10-29 MORIOKA Tomohiko + + * NEWS (Abolish variable `mime-temp-directory'): New subsection. + +1998-10-27 Katsumi Yamaoka + + * mime-edit.el (mime-edit-decode-buffer): Limit search bound for + "Content-Transfer-Encoding:". + + +1998-10-26 MORIOKA Tomohiko + + * 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 + + * mime-play.el, mime-pgp.el, mime-partial.el, mime-image.el, + mime-edit.el: Use `temporary-file-directory' instead of + `mime-temp-directory'. + + +1998-10-23 MORIOKA Tomohiko + + * SEMI: Version 1.10.0 (Tsubata) released. + +1998-10-22 Yoshiki Hayashi + + * README.ja: New file. + +1998-10-22 MORIOKA Tomohiko + + * mime-edit.el, mime-view.el: Use `(featurep 'xemacs)' instead of + `running-xemacs'. + +1998-10-21 MORIOKA Tomohiko + + * 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 + + * semi-setup.el (mime-setup-enable-inline-image): Use `(featurep + 'xemacs)' instead of `running-xemacs'. + +1998-10-20 MORIOKA Tomohiko + + * 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 + + * mime-edit.el (mime-edit-decode-buffer): Convert encoding to + lower case. + +1998-10-19 MORIOKA Tomohiko + + * 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 + + * mime-edit.el (mime-edit-decode-buffer): Call + `mule-caesar-region' for text/x-rot13-47-48 entity. + +1998-09-22 Shozo UEHARA + + * mime-play.el (mime-raw-play-entity): Initialize `max-escore' by + 0. + +1998-10-16 MORIOKA Tomohiko + + * 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 + + * 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. + + 1998-10-14 MORIOKA Tomohiko * SEMI: Version 1.9.1 (Kurikara) released. @@ -71,7 +184,7 @@ `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 diff --git a/Makefile b/Makefile index 66ecd93..32bebc7 100644 --- 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 --- 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. + * Changes in SEMI 1.7 diff --git a/README.en b/README.en index a1943c1..a831529 100644 --- 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 Dan Rich (contribute to evolve mime-image.el with XEmacs) - Katsumi Yamaoka + Katsumi Yamaoka diff --git a/README.ja b/README.ja new file mode 100644 index 0000000..da785cf --- /dev/null +++ b/README.ja @@ -0,0 +1,258 @@ +[SEMI $B$N3K%Q%C%1!<%8$N(B README ($BF|K\8lHG(B)] + +SEMI $B$H$O!)(B +============ + + SEMI $B$O(B GNU Emacs $B$K(B MIME $B5!G=$rDs6!$9$k%i%$%V%i%j!<$G$9!#(BMIME $B$O%a%C(B + $B%;!<%8$K(B (ASCII) plain text $B0J30$NFbMF$d%X%C%@!<$r4^$a$i$l$k$h$&$K$9(B + $B$k$?$a$KDs0F$5$l$F$$$k(B internet standard $B$G$9!#(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 $B$O0J2<$N5!G=$,$"$j$^$9!#(B + + - MIME $B%a%C%;!<%81\Mw(B (mime-view-mode) (RFC 2045 .. 2049) + - MIME $B%a%C%;!<%8:n@.(B (mime-edit-mode) (RFC 2045 .. 2049) + + MIME $B%a%C%;!<%81\Mw$H:n@.$O0J2<$N5!G=$bDs6!$7$F$$$^$9(B: + + - Content-Disposition $B%U%#!<%k%I$K$h$k%U%!%$%kL>$N07$$(B (RFC + - 1806) + - PGP/MIME $B0BA4$J(B Multipart (RFC 2015) + - application/pgp (draft-kazu-pgp-mime-00.txt; obsolete) + - text/richtext (RFC 1521; obsolete; $B1\Mw$N$_(B) + - text/enriched (RFC 1896) + - mailcap $B$K$h$k30ItJ}K!@_Dj(B (RFC 1524) + + $B$3$N%Q%C%1!<%8$O(B MUA $B$N$?$a$N(B MIME $B3HD%$r4^$s$G$$$J$$$3$H$KCm0U$7$F(B + $B$/$@$5$$!#$=$l$i$OJL$N%Q%C%1!<%8$H$7$F%j%j!<%9$5$l$^$9!#(B + + +$BI,MW$J4D6-(B +========== + + SEMI $B$O(B mule $B5!G=$D$-$N(B XEmacs 20.2 $B0J9_$H(B Emacs 20 $B$r%5%]!<%H$7$^$9!#(B + + SEMI $B$O(B Emacs 19.28 $B$d(B XEmacs 19.14 $B0JA0$O%5%]!<%H$7$^$;$s!#(BSEMI $B$O(B + Emacs 19.29 $B$+$i(B Emacs 19.34$B!"(BXEmacs 19.15 $B$+$i(B mule $B5!G=$N$J$$(B + XEmacs 20.2 $B$^$G$O%5%]!<%H$7$^$;$s$,!"(BSEMI $B$O$=$l$i$GF0:n$9$k$+$b$7(B + $B$l$^$;$s!#(B + + SEMI $B$O(B APEL (9.6 $B0J9_(B) $B$H(B FLIM (1.11.2 $B0J9_(B) $B$rI,MW$H$7$^$9!#(BSEMI + $B$r%$%s%9%H!<%k$9$kA0$K$^$:$=$l$i$r%$%s%9%H!<%k$7$F$/$@$5$$!#(BAPEL $B%Q%C(B + $B%1!<%8$O0J2<$N$H$3$m$Gl=j$G$N%G%#%l%/%H%j!<$K%$%s%9%H!<%k$7$?$/$J$$$J$i!"0J2<$N$3$H$@$1$r$d$C(B + $B$F$/$@$5$$(B: + + % make + + emacs $B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"(B + + % make EMACS=xemacs + + `EMACS=...' $B$,>JN,$5$l$k$H!"(BEmacs=emacs $B$,;H$o$l$^$9!#(B + +(b) make install + + $BB>$N%G%#%l%/%H%j!<$K%$%s%9%H!<%k$7$?$$$J$i!"0J2<$N$3$H$r$7$F$/$@$5$$(B: + + % make install + + emacs $B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"(B + + % make install EMACS=xemacs + + `EMACS=...' $B$,>JN,$5$l$k$H!"(BEmacs=emacs $B$,;H$o$l$^$9!#(B + + Emacs Lisp $B%W%m%0%i%`$H%7%'%k%9%/%j%W%H$N$?$a$N%G%#%l%/%H%j!JN,$5$l$k$H!";XDj$5$l$?(B emacs $B%3%^%s%I$N%G%#%l%/%H%j!<(B + $BLZ$N@\F,<-$,;HMQ$5$l$^$9(B ($B$*$=$i$/(B /usr/local $B$G$9(B)$B!#(B + + $BNc$($P!"(BPREFIX=/usr/local $B$H(B Emacs 19.34 $B$,;XDj$5$l$l$P!"0J2<$N%G%#(B + $B%l%/%H%j!JN,$5$l$k$H!";XDj$5$l$?(B emacs $B$N%3%^%s%I$N(B + site-lisp $B%G%#%l%/%H%j!<$,;H$o$l$^$9(B ($B$*$=$i$/(B + /usr/local/share/emacs/site-lisp $B$+(B /usr/local/lib/xemacs/site-lisp) + $B$G$9!#(B + + emu $B%b%8%e!<%k(B (APEL $B%Q%C%1!<%8$KF~$C$F$$$^$9(B) $B$,I8=`$G$J$$%G%#%l%/(B + $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(B + $B$,$"$j$^$9!#Nc$($P!"(B: + + % make install VERSION_SPECIFIC_LISPDIR=~/elisp + +(c) XEmacs $B$N%Q%C%1!<%8$H$7$F%$%s%9%H!<%k$9$k(B + + XEmacs $B$N%Q%C%1!<%8%G%#%l%/%H%j!<$K%$%s%9%H!<%k$9$k>l9g$O!"0J2<$N$3(B + $B$H$r$7$F$/$@$5$$(B: + + % make install-package + + emacs $B$N%3%^%s%IL>$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P!"(B + + % make install-package XEMACS=xemacs-21 + + `XEMACS=...' $B$,>JN,$5$l$k$H!"(BXEMACS=xemacs $B$,;HMQ$5$l$^$9!#(B + + $B%Q%C%1!<%8$N%G%#%l%/%H%j!<$r;XDj$9$k$3$H$,$G$-$^$9!#Nc$($P(B: + + % make install PACKAGEDIR=~/.xemacs + + `PACKAGEDIR=...' $B$,>JN,$5$l$k$H!"B8:_$9$k%Q%C%1!<%8%G%#%l%/%H%j!<$N(B + $B:G=i$N$b$N$,;H$o$l$^$9!#(B + + XEmacs $B$N%Q%C%1!<%8%7%9%F%`$O(B XEmacs 21.0 $B$+$=$l0J9_$rMW5a$9$k$3$H$K(B + $BCm0U$7$F$/$@$5$$!#(B + +(a,b,c) + + $BB>$N>JN,2DG=$J@_Dj$r%U%!%$%k(B ${archive}/SEMI-CFG $B$rJT=8$9$k$3$H$G;X(B + $BDj$G$-$^$9!#(B${archive}/README.ja $B$H(B ${archive}/SEMI/CFG $B$N%3%a%s%H$r(B + $BFI$s$G$/$@$5$$!#(B + +$B=i4|2=(B +============== + +(a) load-path + + Emacs $B$+(B Mule $B$r;H$C$F$$$k$J$i!"(BFLIM $B$N%G%#%l%/%H%j!<$r(B + load-path $B$KDI2C$7$F$/$@$5$$!#=i4|@_Dj$G%$%s%9%H!<%k$7$?$J$i!"-Mh$N3HD%$N5DO@$r$7$?$j$9$k$3$H$,$G$-$^$9!#(Btm ML $B$K(B + $B;22C$9$k$K$O!"6u$NEE;R%a!<%k$r(B + + tm-en-help@chamonix.jaist.ac.jp ($B1Q8l(B) + tm-ja-help@chamonix.jaist.ac.jp ($BF|K\8l(B) + + $B$KAw$C$F$/$@$5$$!#(B + + morioka@jaist.ac.jp $B$N$h$&$J!":n@\%a!<%k$rAw$i$J$$$h$&$KCm0U$7(B + $B$F$/$@$5$$!#$=$l$O!"H/@8$7$?LdBj$OB>$N4D6-$G$b5/$3$C$F$$$k$O$:$@$+$i(B + $B$G$9(B ($B$b$7$=$&$G$J$1$l$P!"$=$l$O@_Dj$NLdBj$G!"(BSEMI $B$N%P%0$G$O$"$j$^(B + $B$;$s(B)$B!#(B tm $B%a!<%j%s%0%j%9%H$G5DO@$9$Y$-$G$9!#$H$K$+$/!":n@\(B + $B$N%a!<%k$OH?1~$,$J$$$+$b$7$l$^$;$s!#%a!<%k$O(B tm $B%a!<%j%s%0%j%9%H$XAw$C(B + $B$F$/$@$5$$!#(B + + +CVS $B$K$h$k3+H/(B +===================== + + CVS $B$K$h$k3+H/$K;22C$7$?$$$H$-$O!"%"%+%&%s%HL>$H(B UNIX $BMM<0$G0E9f2=$5(B + $B$l$?%Q%9%o!<%I$r(B + + cvs@chamonix.jaist.ac.jp + + $B$KAw$C$F$/$@$5$$!#3+H/$K;22C$5$l$k$3$H$r4|BT$7$F$$$^$9!#(B + + +$B:n + (the author of mime-view and various parts of SEMI) + UMEDA Masanobu + (the author of mime.el of emacs-mime-tools. mime.el is the + origin of mime-edit.el of SEMI) + +$BB>$N:n + (a major author of signature.el and a lot of codes) + MASUTANI Yasuhiro + (anonymous ftp codes of mime-play.el) + OKABE Yasuo + (a major author of mime-partial.el and signature.el) + + Steinar Bang + Steven L. Baur + Kevin Broadey + Alastair Burt + Eric Ding + Thierry Emery + Simon Josefsson + Jens Lautenbacher + Carsten Leonhardt + Pekka Marjola + Hisashi Miyashita + Kazuhiro Ohta + Alexandre Oliva + Fran,Ag(Bois Pinard + Artur Pioro + Dan Rich + (contribute to evolve mime-image.el with XEmacs) + Katsumi Yamaoka diff --git a/SEMI-ELS b/SEMI-ELS index ff195ea..6ffa7fc 100644 --- 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 --- a/VERSION +++ b/VERSION @@ -67,9 +67,9 @@ 1.8.6 Fukuoka $(BJ!2,(B 1.9.0 Isurugi $(B@PF0(B 1.9.1 Kurikara $(B6fMx2@Me(B ------ Tsubata $(BDEH((B ------ Morimoto $(B?9K\(B -------- Higashi-Kanazawa $(BEl6bBt(B +1.10.0 Tsubata $(BDEH((B +1.10.1 Morimoto $(B?9K\(B +1.10.2 Higashi-Kanazawa $(BEl6bBt(B ------- Kanazawa $(B6bBt(B ; <=> $(BKLN&E4F;(B $(BKLE46bBt(B ------- Nishi-Kanazawa $(B@>6bBt(B ; <=> $(BKLN&E4F;(B $(B?7@>6bBt(B ------- (JR) Nonoichi $(BLn!9;T(B @@ -127,47 +127,47 @@ 1.8.5 Higashi-Tagonoura $(BElED;R%N1:(B 1.8.6 Yoshiwara $(B5H86(B ; = $(B3YFnE4F;(B 1.9.0 Fuji $(BIY;N(B ; = JR $(B?H1d@~(B ------ Fujikawa $(BIY;N@n(B ------ Shin-Kambara $(B?73w86(B ------ Kambara $(B3w86(B ------ Yui $(BM3Hf(B ------ Okitsu $(B6=DE(B ------ Shimizu $(B@6?e(B ------ Kusanagi $(BApFe(B ------ Shizuoka $(B@E2,(B ------ Abekawa $(B0BG\@n(B ------ Mochimune $(BMQ=!(B ------ Yaizu $(B>FDE(B ------ Nishi-Yaizu $(B@>>FDE(B ------ Fijieda $(BF#;^(B ------ Rokug-Dò-A $(BO;9g(B ------ Shimada $(BEgED(B ------ Kanaya $(B6bC+(B ; = $(BBg0f@nE4F;(B ------ Kikugawa $(B5F@n(B ------ Kakegawa $(B3]@n(B ; = $(BE7N5IML>8PE4F;(B +1.9.1 Fujikawa $(BIY;N@n(B +1.10.0 Shin-Kambara $(B?73w86(B +1.10.1 Kambara $(B3w86(B +------ Yui $(BM3Hf(B +------ Okitsu $(B6=DE(B +------ Shimizu $(B@6?e(B +------ Kusanagi $(BApFe(B +------ Shizuoka $(B@E2,(B +------ Abekawa $(B0BG\@n(B +------ Mochimune $(BMQ=!(B +------ Yaizu $(B>FDE(B +------ Nishi-Yaizu $(B@>>FDE(B +------ Fijieda $(BF#;^(B +------ Rokug-Dò-A $(BO;9g(B +------ Shimada $(BEgED(B +------ Kanaya $(B6bC+(B ; = $(BBg0f@nE4F;(B +------ Kikugawa $(B5F@n(B +------ Kakegawa $(B3]@n(B ; = $(BE7N5IML>8PE4F;(B : : : ------ Kanayama $(B6b;3(B ; =$(B!J(BJR $(BCf1{K\@~!K(B ------ Ot-Dòbashi-A $(BHxF,66(B ------ Nagoya $(BL>8E20(B ; = JR $(B4X@>K\@~!J!&Cf1{K\@~!K(B +------ Kanayama $(B6b;3(B ; =$(B!J(BJR $(BCf1{K\@~!K(B +------ Ot-Dòbashi-A $(BHxF,66(B +------ Nagoya $(BL>8E20(B ; = JR $(B4X@>K\@~!J!&Cf1{K\@~!K(B : : : ------ Gifu $(B4tIl(B ; = JR $(B9b;3K\@~(B +------ Gifu $(B4tIl(B ; = JR $(B9b;3K\@~(B : : : ------ Samegai $(B@C%v0f(B +------ Samegai $(B@C%v0f(B ;;------------------------------------------------------------------------- ;; West Japan Railway $(B@>F|K\N95RE4F;(B http://www.westjr.co.jp/ ;;------------------------------------------------------------------------- ------ Maibara $(BJF86(B ; = JR $(BKLN&K\@~(B +------ Maibara $(BJF86(B ; = JR $(BKLN&K\@~(B : : : ------ Kusatsu $(BApDE(B ; = JR $(BApDE@~(B +------ Kusatsu $(BApDE(B ; = JR $(BApDE@~(B : : : ------ Yamashina $(B;32J(B ; = JR $(B8P@>@~(B ------ Ky-Dòto-A $(B5~ET(B ; = JR $(BF`NI@~!&;31"K\@~(B +------ Yamashina $(B;32J(B ; = JR $(B8P@>@~(B +------ Ky-Dòto-A $(B5~ET(B ; = JR $(BF`NI@~!&;31"K\@~(B ; <=> $(B6aE4(B $(B5~ET@~!"5~ET;T8rDL6I(B $(B1(4]@~(B : : : ------ -DÒsaka-A $(BBg:e(B ; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B +------ -DÒsaka-A $(BBg:e(B ; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B ; <=> $(BBg:e;T8rDL6I!":e?@!":e5^(B $(BG_ED(B : : : ------ K-Dòbe-A $(B?@8M(B ; = JR $(B;3M[K\@~(B +------ K-Dòbe-A $(B?@8M(B ; = JR $(B;3M[K\@~(B [REMI version names] diff --git a/mime-edit.el b/mime-edit.el index eab91e7..3c38997 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -107,13 +107,13 @@ ;;; 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 ;; 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) diff --git a/mime-image.el b/mime-image.el index 1e20ac0..d5e4aa0 100644 --- a/mime-image.el +++ b/mime-image.el @@ -146,7 +146,7 @@ ((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) diff --git a/mime-partial.el b/mime-partial.el index f5378eb..e085eab 100644 --- a/mime-partial.el +++ b/mime-partial.el @@ -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) diff --git a/mime-pgp.el b/mime-pgp.el index 67fbb6e..0facca0 100644 --- a/mime-pgp.el +++ b/mime-pgp.el @@ -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")) ) diff --git a/mime-play.el b/mime-play.el index 2e921fb..11f904b 100644 --- a/mime-play.el +++ b/mime-play.el @@ -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 index 025172d..0000000 --- a/mime-text.el +++ /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 -;; 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 diff --git a/mime-view.el b/mime-view.el index f52432a..2804365 100644 --- a/mime-view.el +++ b/mime-view.el @@ -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)) ) diff --git a/mime-w3.el b/mime-w3.el index fec612c..a3d3349 100644 --- a/mime-w3.el +++ b/mime-w3.el @@ -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) )))) diff --git a/semi-def.el b/semi-def.el index 29c9cb3..6cd2769 100644 --- a/semi-def.el +++ b/semi-def.el @@ -24,13 +24,13 @@ ;;; 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" diff --git a/semi-setup.el b/semi-setup.el index e7decc8..9137f02 100644 --- a/semi-setup.el +++ b/semi-setup.el @@ -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.")