From 1194930cd3985e5a6a56db5d18d4daf30206faab Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 29 Jun 2004 05:09:49 +0000 Subject: [PATCH] Synch to No Gnus 200406290509. --- lisp/ChangeLog | 7 +++++++ lisp/mm-encode.el | 8 +++++++- lisp/mm-util.el | 1 + texi/ChangeLog | 5 +++++ texi/emacs-mime.texi | 10 ++++++++-- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fb62b21..05d7e8d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2004-06-29 Katsumi Yamaoka + + * mm-encode.el (mm-content-transfer-encoding-defaults): Doc fix. + + * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251 + entry. From Ilya N. Golubev . + 2004-06-28 Jesper Harder * nnheader.el (nnheader-max-head-length): Increase to 8192. diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index f0b8aef..e39e72f 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -42,7 +42,13 @@ (".*" base64)) "Alist of regexps that match MIME types and their encodings. If the encoding is `qp-or-base64', then either quoted-printable -or base64 will be used, depending on what is more efficient." +or base64 will be used, depending on what is more efficient. + +Note: It affects body encoding only when a part is a raw forwarded +message (which will be made by `gnus-summary-mail-forward' with the +arg 2 for example) or is neither the text/* type nor the message/* +type. Even though in those cases, you can use the `encoding' MML tag +to specify encoding of non-ASCII MIME parts." :type '(repeat (list (regexp :tag "MIME type") (choice :tag "encoding" (const 7bit) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index a711458..7913ac1 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -232,6 +232,7 @@ system object in XEmacs." (big5 chinese-big5-1 chinese-big5-2) (tibetan tibetan) (thai-tis620 thai-tis620) + (windows-1251 cyrillic-iso8859-5) (iso-2022-7bit ethiopic arabic-1-column arabic-2-column) (iso-2022-jp-2 latin-iso8859-1 greek-iso8859-7 latin-jisx0201 japanese-jisx0208-1978 diff --git a/texi/ChangeLog b/texi/ChangeLog index 7f0ae5f..37dd127 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2004-06-29 Katsumi Yamaoka + + * emacs-mime.texi (Encoding Customization): Add a note to the + mm-content-transfer-encoding-defaults entry. + 2004-06-28 Katsumi Yamaoka * emacs-mime.texi (Encoding Customization): Fix diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 9f2820c..1ce8d69 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -852,8 +852,14 @@ used except, e.g., when other requirements force a safer encoding (digitally signed messages require 7bit encoding). Besides the normal @acronym{MIME} encodings, @code{qp-or-base64} may be used to indicate that for each case the most efficient of quoted-printable and base64 should be -used. You can override this setting on a per-message basis by using -the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}). +used. + +Note that it affects body encoding only when a part is a raw forwarded +message (which will be made by @code{gnus-summary-mail-forward} with the +arg 2 for example) or is neither the @samp{text/*} type nor the +@samp{message/*} type. Even though in those cases, you can override +this setting on a per-message basis by using the @code{encoding} +@acronym{MML} tag (@pxref{MML Definition}). @item mm-use-ultra-safe-encoding @vindex mm-use-ultra-safe-encoding -- 1.7.10.4