diff options
| author | Miles Bader <miles@gnu.org> | 2006-01-20 03:44:29 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-01-20 03:44:29 +0000 |
| commit | e499bc94d642380257a49eeaf8049f9a8039a9a7 (patch) | |
| tree | 5d89d95f94467187fae465a99cbff56c73c75dde /lisp/gnus/mm-decode.el | |
| parent | d322eb9b19ddba8ef604dd9d3e096be16a70fafe (diff) | |
| download | emacs-e499bc94d642380257a49eeaf8049f9a8039a9a7.tar.gz | |
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
Diffstat (limited to 'lisp/gnus/mm-decode.el')
| -rw-r--r-- | lisp/gnus/mm-decode.el | 10 |
1 files changed, 7 insertions, 3 deletions
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 <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> @@ -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) |