From e499bc94d642380257a49eeaf8049f9a8039a9a7 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 20 Jan 2006 03:44:29 +0000 Subject: [PATCH] Revision: emacs@sv.gnu.org/emacs--devo--0--patch-5 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (base, patch 1-3) - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187 - Update from CVS - Merge from emacs--devo--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187) - Update from CVS --- lisp/gnus/ChangeLog | 14 ++++++++++++++ lisp/gnus/mm-bodies.el | 8 ++++---- lisp/gnus/mm-decode.el | 10 +++++++--- lisp/gnus/mm-uu.el | 8 ++++++-- 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7ad94aee8f0..fb99c71c9c8 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -5,6 +5,20 @@ Revert 2006-01-08 change because the functions will be used in No Gnus. +2006-01-19 Katsumi Yamaoka + + * mm-bodies.el (mm-decode-body): Don't decode decoded body. + + * mm-uu.el (mm-uu-dissect-text-parts): Dissect dissected parts. + +2006-01-17 Katsumi Yamaoka + + * mm-decode.el (mm-inlined-types): Add application/pgp. + (mm-automatic-display): Ditto. + + * mm-uu.el (mm-uu-dissect-text-parts): Recognize application/pgp + part as text. + 2006-01-16 Katsumi Yamaoka * nnrss.el: Update copyright. diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 8b47989e563..c58eb6bd41d 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -1,7 +1,7 @@ ;;; mm-bodies.el --- Functions for decoding MIME things ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -249,7 +249,8 @@ decoding. If it is nil, default to `mail-parse-charset'." (save-excursion (when encoding (mm-decode-content-transfer-encoding encoding type)) - (when (featurep 'mule) ; Fixme: Wrong test for unibyte session. + (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session. + (not (eq charset 'gnus-decoded))) (let ((coding-system (mm-charset-to-coding-system charset))) (if (and (not coding-system) (listp mail-parse-ignored-charsets) @@ -262,8 +263,7 @@ decoding. If it is nil, default to `mail-parse-charset'." ;;in XEmacs (mm-multibyte-p) (or (not (eq coding-system 'ascii)) - (setq coding-system mail-parse-charset)) - (not (eq coding-system 'gnus-decoded))) + (setq coding-system mail-parse-charset))) (mm-decode-coding-region (point-min) (point-max) coding-system)) (setq buffer-file-coding-system diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 5b55af4d756..b275807c051 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1,7 +1,7 @@ ;;; mm-decode.el --- Functions for decoding MIME things ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -279,7 +279,9 @@ before the external MIME handler is invoked." "application/x-emacs-lisp" "application/pgp-signature" "application/x-pkcs7-signature" "application/pkcs7-signature" "application/x-pkcs7-mime" - "application/pkcs7-mime") + "application/pkcs7-mime" + ;; Mutt still uses this even though it has already been withdrawn. + "application/pgp") "List of media types that are to be displayed inline. See also `mm-inline-media-tests', which says how to display a media type inline." @@ -302,7 +304,9 @@ when selecting a different article." "application/emacs-lisp" "application/x-emacs-lisp" "application/x-pkcs7-signature" "application/pkcs7-signature" "application/x-pkcs7-mime" - "application/pkcs7-mime") + "application/pkcs7-mime" + ;; Mutt still uses this even though it has already been withdrawn. + "application/pgp") "A list of MIME types to be displayed automatically." :type '(repeat regexp) :group 'mime-display) diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index 312c3dd8542..2bebede4bfc 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -512,6 +512,7 @@ value of `mm-uu-text-plain-type'." (defun mm-uu-dissect-text-parts (handle) "Dissect text parts and put uu handles into HANDLE." (let ((buffer (mm-handle-buffer handle)) + (case-fold-search t) type children) (cond ((stringp buffer) (dolist (elem (cdr handle)) @@ -519,13 +520,16 @@ value of `mm-uu-text-plain-type'." ((bufferp buffer) (when (and (setq type (mm-handle-media-type handle)) (stringp type) - (string-match "\\`text/" type) + ;; Mutt still uses application/pgp even though + ;; it has already been withdrawn. + (string-match "\\`text/\\|\\`application/pgp\\'" type) (with-current-buffer buffer (setq children (mm-uu-dissect t (mm-handle-type handle))))) (kill-buffer buffer) (setcar handle (car children)) - (setcdr handle (cdr children)))) + (setcdr handle (cdr children)) + (mm-uu-dissect-text-parts handle))) (t (dolist (elem handle) (mm-uu-dissect-text-parts elem)))))) -- 2.39.2