Mercurial > emacs
changeset 68287:dbc43cabc13b
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 20 Jan 2006 03:44:29 +0000 |
| parents | e5161cb0ad69 |
| children | aaff37b9a54d |
| files | lisp/gnus/ChangeLog lisp/gnus/mm-bodies.el lisp/gnus/mm-decode.el lisp/gnus/mm-uu.el |
| diffstat | 4 files changed, 31 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Jan 20 01:31:01 2006 +0000 +++ b/lisp/gnus/ChangeLog Fri Jan 20 03:44:29 2006 +0000 @@ -5,6 +5,20 @@ Revert 2006-01-08 change because the functions will be used in No Gnus. +2006-01-19 Katsumi Yamaoka <yamaoka@jpl.org> + + * 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 <yamaoka@jpl.org> + + * 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 <yamaoka@jpl.org> * nnrss.el: Update copyright.
--- a/lisp/gnus/mm-bodies.el Fri Jan 20 01:31:01 2006 +0000 +++ b/lisp/gnus/mm-bodies.el Fri Jan 20 03:44:29 2006 +0000 @@ -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 <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> @@ -249,7 +249,8 @@ (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 @@ ;;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
--- a/lisp/gnus/mm-decode.el Fri Jan 20 01:31:01 2006 +0000 +++ b/lisp/gnus/mm-decode.el Fri Jan 20 03:44:29 2006 +0000 @@ -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 <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> @@ -279,7 +279,9 @@ "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 @@ "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)
--- a/lisp/gnus/mm-uu.el Fri Jan 20 01:31:01 2006 +0000 +++ b/lisp/gnus/mm-uu.el Fri Jan 20 03:44:29 2006 +0000 @@ -512,6 +512,7 @@ (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 @@ ((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))))))