>From e6c824f363bf6959f0eb35e4b8208a14d2cbffcb Mon Sep 17 00:00:00 2001 From: Jay Kamat Date: Sun, 24 Sep 2017 12:11:52 -0400 Subject: [PATCH] org-irc.el: Add proper export functions for irc * lisp/org-irc.el (org-irc-export): Add a new function, org-irc-export, which properly exports irc links to html and markdown * lisp/ox-md.el (org-md-link): Remove workaround to get irc links working properly in ox-md, and use org-irc's export functions instead --- lisp/org-irc.el | 20 +++++++++++++++++++- lisp/ox-md.el | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lisp/org-irc.el b/lisp/org-irc.el index 5889f6d2fe..eee71aef52 100644 --- a/lisp/org-irc.el +++ b/lisp/org-irc.el @@ -71,7 +71,10 @@ ;; Generic functions/config (extend these for other clients) -(org-link-set-parameters "irc" :follow #'org-irc-visit :store #'org-irc-store-link) +(org-link-set-parameters "irc" + :follow #'org-irc-visit + :store #'org-irc-store-link + :export #'org-irc-export) (defun org-irc-visit (link) "Parse LINK and dispatch to the correct function based on the client found." @@ -245,6 +248,21 @@ default." ;; no server match, make new connection (erc-select :server server :port port)))) +(defun org-irc-export (link description format) + "Export an info link. +See `org-link-parameters' for details about LINK, DESCRIPTION and FORMAT." + (let* ((desc (or description link))) + (pcase format + (`html + (format "%s" + link + desc)) + (`md + (format "[%s](irc:%s)" + desc + link)) + (_ nil)))) + (provide 'org-irc) ;; Local variables: diff --git a/lisp/ox-md.el b/lisp/ox-md.el index 5ba52e7faf..146956eedf 100644 --- a/lisp/ox-md.el +++ b/lisp/ox-md.el @@ -449,7 +449,7 @@ a communication channel." (t (let* ((raw-path (org-element-property :path link)) (path (cond - ((member type '("http" "https" "ftp" "mailto" "irc")) + ((member type '("http" "https" "ftp" "mailto")) (concat type ":" raw-path)) ((string= type "file") (org-export-file-uri (funcall link-org-files-as-md raw-path))) -- 2.11.0