emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Max Nikulin <manikulin@gmail.com>
To: 68687@debbugs.gnu.org
Cc: emacs-orgmode@gnu.org
Subject: bug#68687: [PATCH] Use text/org media type
Date: Wed, 24 Jan 2024 21:43:55 +0700	[thread overview]
Message-ID: <49fa47c0-522a-46d7-ba0d-6e688aa26a8e@gmail.com> (raw)
In-Reply-To: <8734uqpvgn.fsf@tec.tecosaur.net>

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

Hi,

I suggest to make the media type used for Org mode files consistent with 
the one used by XDG https://gitlab.freedesktop.org/xdg/shared-mime-info
Currently Emacs has text/x-org, however "x-" prefix is not recommended 
by IANA any more, see https://www.rfc-editor.org/rfc/rfc6648 
"Deprecating the "X-" Prefix and Similar Constructs in Application 
Protocols"

Ideally somebody should file a request to IANA to register the text/org 
media type.
https://www.iana.org/assignments/media-types/media-types.xhtml
However I have no idea concerning a conflict due to the .org file name 
suffix. It was used in the past by early versions of Lotus Organizer. 
https://www.iana.org/assignments/media-types/application/vnd.lotus-organizer

I am unsure if gnus-related code should be committed to some other 
repository at first. I am not a gnus user, so I do not mind if an 
alternative change will be committed.

See also
emacs-orgmode: Org mode MIME type. Sun, 21 Jan 2024 20:56:15 +0700.
https://list.orgmode.org/6d94fff4-4d30-4121-bfd1-f267cb5b637c@gmail.com

[-- Attachment #2: 0001-Use-text-org-media-type.patch --]
[-- Type: text/x-patch, Size: 2508 bytes --]

From 8b71393625f11590e99896808bbd04ed83f7917e Mon Sep 17 00:00:00 2001
From: Max Nikulin <manikulin@gmail.com>
Date: Wed, 24 Jan 2024 21:16:28 +0700
Subject: [PATCH] Use text/org media type

Avoid "x-" prefix deprecated by rfc6648 for Org mode media type.
* lisp/net/mailcap.el (mailcap-mime-extensions):
* lisp/gnus/mm-uu.el (mm-uu-org-src-code-block-extract): Replace
text/x-org by text/org.
* lisp/gnus/mm-decode.el (mm-inline-media-tests): Allow text/org in
addition to text/x-org.

Make media type defined for Org mode consistent with
<https://gitlab.freedesktop.org/xdg/shared-mime-info>

See emacs-orgmode: Org mode MIME type. Sun, 21 Jan 2024 20:56:15 +0700.
https://list.orgmode.org/6d94fff4-4d30-4121-bfd1-f267cb5b637c@gmail.com
---
 lisp/gnus/mm-decode.el | 1 +
 lisp/gnus/mm-uu.el     | 2 +-
 lisp/net/mailcap.el    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f91755e967b..cae737e5a3e 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -246,6 +246,7 @@ (defcustom mm-inline-media-tests
     ("text/x-sh" mm-display-shell-script-inline identity)
     ("application/javascript" mm-display-javascript-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
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 3c7e3cbdf1a..b10da0c143a 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -394,7 +394,7 @@ (defun mm-uu-emacs-sources-extract ()
 
 (defun mm-uu-org-src-code-block-extract ()
   (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
-		  '("text/x-org" (charset . gnus-decoded))))
+		  '("text/org" (charset . gnus-decoded))))
 
 (defvar gnus-newsgroup-name)
 
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 5ff75deb4e6..900099433c4 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -989,7 +989,8 @@ (defvar mailcap-mime-extensions
     (".jpe"   . "image/jpeg")
     (".jpeg"  . "image/jpeg")
     (".webp"  . "image/webp")
-    (".org"   . "text/x-org"))
+    ;; May be overridden by application/vnd.lotus-organizer in /etc/mime.types.
+    (".org"   . "text/org"))
   "An alist of file extensions and corresponding MIME content-types.
 This exists for you to customize the information in Lisp.  It is
 merged with values from mailcap files by `mailcap-parse-mimetypes'.")
-- 
2.39.2


  parent reply	other threads:[~2024-01-24 14:45 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-21 13:56 Org mode MIME type Max Nikulin
2024-01-21 15:11 ` Timothy
2024-01-22 16:21   ` Max Nikulin
2024-01-24 14:43   ` Max Nikulin [this message]
2024-01-25 23:10     ` bug#68687: [PATCH] Use text/org media type Stefan Kangas
2024-01-25 23:43       ` Ihor Radchenko
2024-01-26  7:40         ` Eli Zaretskii
2024-01-26 14:00           ` Ihor Radchenko
2024-01-30 19:39         ` Stefan Kangas
2024-01-30 20:34           ` Ihor Radchenko
2024-01-26  7:23       ` Eli Zaretskii
2024-01-31 16:30         ` Max Nikulin
2024-01-27  3:38       ` Richard Stallman
2024-01-28 16:35         ` Max Nikulin
2024-01-28 16:47           ` Eli Zaretskii
2024-01-30  3:56             ` Richard Stallman
2024-01-30 12:13               ` Ihor Radchenko
2024-01-30 17:12                 ` Org mode code evaluation (was: bug#68687: [PATCH] Use text/org media type) Mike Kupfer
2024-01-30 17:51                   ` Ihor Radchenko
2024-02-02  3:38                     ` bug#68687: " Richard Stallman
2024-02-02  4:58                       ` bug#68687: Org mode code evaluation Max Nikulin
2024-02-02 16:10                       ` bug#68687: Org mode code evaluation (was: bug#68687: [PATCH] Use text/org media type) Ihor Radchenko
2024-01-31 16:18                 ` bug#68687: [PATCH] Use text/org media type Max Nikulin
2024-01-31 16:32                   ` Ihor Radchenko
2024-02-02  3:40                 ` Richard Stallman
2024-02-02  7:15                   ` Eli Zaretskii
2024-01-30 12:52               ` Eli Zaretskii
2024-01-31 20:00     ` Stefan Kangas
2024-02-01 10:40       ` Max Nikulin
2024-02-02  7:09         ` Stefan Kangas
2024-02-02 16:28           ` bug#68687: [PATCH v2] " Max Nikulin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49fa47c0-522a-46d7-ba0d-6e688aa26a8e@gmail.com \
    --to=manikulin@gmail.com \
    --cc=68687@debbugs.gnu.org \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).