From d95286b7e1d6dec873f3b30207a98de1b6bc5882 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 3 Feb 2004 01:02:09 +0000 Subject: [PATCH] Synch to No Gnus 200402030043. --- lisp/ChangeLog | 6 +++++- lisp/mm-bodies.el | 13 +++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e046476..dbe2a66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2004-02-03 Jesper Harder + + * mm-bodies.el (mm-7bit-chars): Don't include \r. + 2004-02-02 Teodor Zlatanov * spam.el (spam-list-of-checks): added spam-use-BBDB-eclusive to @@ -85,7 +89,7 @@ * gnus-group.el (gnus-group-line-format-alist): do. - * gnus.el: (gnus-use-grouplens, gnus-visual): do. + * gnus.el (gnus-use-grouplens, gnus-visual): do. * gnus-gl.el: Remove. diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index 68278b4..6470ddf 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -34,9 +34,16 @@ (require 'rfc2047) (require 'mm-encode) -;; 8bit treatment gets any char except: 0x32 - 0x7f, CR, LF, TAB, BEL, +;; 8bit treatment gets any char except: 0x32 - 0x7f, LF, TAB, BEL, ;; BS, vertical TAB, form feed, and ^_ -(defvar mm-7bit-chars "\x20-\x7f\r\n\t\x7\x8\xb\xc\x1f") +;; +;; Note that CR is *not* included, as that would allow a non-paired CR +;; in the body contrary to RFC 2822: +;; +;; - CR and LF MUST only occur together as CRLF; they MUST NOT +;; appear independently in the body. + +(defvar mm-7bit-chars "\x20-\x7f\n\t\x7\x8\xb\xc\x1f") (defcustom mm-body-charset-encoding-alist '((iso-2022-jp . 7bit) @@ -45,6 +52,8 @@ ;; known to break servers. ;; Note: UTF-16 variants are invalid for text parts [RFC 2781], ;; so this can't happen :-/. + ;; PPS: Yes, it can happen if the user specifies UTF-16 in the MML + ;; markup. - jh. (utf-16 . base64) (utf-16be . base64) (utf-16le . base64)) -- 1.7.10.4