From 893ebf04faa65a0b521d5e6a82f97d4389473be0 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 17 Jan 2006 10:53:13 +0000 Subject: [PATCH] Synch to No Gnus 200601171052. --- lisp/ChangeLog | 8 ++++++++ lisp/mm-decode.el | 10 +++++++--- lisp/mm-uu.el | 5 ++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a123fd0..6da7b7f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,13 @@ 2006-01-16 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. (nnrss-opml-import): Query whether to subscribe to each entry. diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 68a44d1..96352a2 100644 --- a/lisp/mm-decode.el +++ b/lisp/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/mm-uu.el b/lisp/mm-uu.el index f91e377..f106923 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -621,13 +621,16 @@ 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) (mapc 'mm-uu-dissect-text-parts (cdr handle))) ((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))))) -- 1.7.10.4