summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2011-01-23 11:21:04 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-01-23 11:21:04 +0000
commit3f6804070085b85cc94b54d632a07f04f6bbf572 (patch)
treee69a1133f18d5dfcdab7e847fe9524830cd6098d
parent45eb2a5d4609e89fae1723979f26a56b5fba8fa1 (diff)
downloademacs-3f6804070085b85cc94b54d632a07f04f6bbf572.tar.gz
mm-decode.el (mm-inline-media-tests): Change text/org to text/x-org.
mm-uu.el (mm-uu-org-src-code-block-extract): Change text/org to text/x-org.
-rw-r--r--lisp/gnus/ChangeLog7
-rw-r--r--lisp/gnus/mm-decode.el4
-rw-r--r--lisp/gnus/mm-uu.el2
3 files changed, 10 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ecbe52efd6d..8bd8732ade4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-23 Julien Danjou <julien@danjou.info>
+
+ * mm-decode.el (mm-inline-media-tests): Change text/org to text/x-org.
+
+ * mm-uu.el (mm-uu-org-src-code-block-extract): Change text/org to
+ text/x-org.
+
2011-01-22 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-summary-move-article): Protect against backends
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index ea65dd6fc92..2ae9c596119 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -241,7 +241,7 @@ before the external MIME handler is invoked."
("application/x-sh" mm-display-shell-script-inline identity)
("text/x-sh" mm-display-shell-script-inline identity)
("text/dns" mm-display-dns-inline identity)
- ("text/org" mm-display-org-inline identity)
+ ("text/x-org" mm-display-org-inline identity)
("text/html"
mm-inline-text-html
(lambda (handle)
@@ -318,7 +318,7 @@ when selecting a different article."
"application/pkcs7-mime"
;; Mutt still uses this even though it has already been withdrawn.
"application/pgp\\'"
- "text/org")
+ "text/x-org")
"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 69661225bd4..200fa1573d8 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -393,7 +393,7 @@ apply the face `mm-uu-extract'."
(defun mm-uu-org-src-code-block-extract ()
(mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
- '("text/org")))
+ '("text/x-org")))
(defvar gnus-newsgroup-name)