From 7dd95734506a87c84bd714f23fa5e66b2a6ec90a Mon Sep 17 00:00:00 2001 From: Robert Klein Date: Wed, 19 Sep 2012 08:07:36 +0200 Subject: [PATCH 1/3] org-e-publish.el (org-e-publish-org-to-html): Fix typo * org-e-publish.el (org-e-publish-org-to-html): Fix typo. TINYCHANGE --- contrib/lisp/org-e-publish.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/lisp/org-e-publish.el b/contrib/lisp/org-e-publish.el index c4c0f178c..894ee076a 100644 --- a/contrib/lisp/org-e-publish.el +++ b/contrib/lisp/org-e-publish.el @@ -600,7 +600,7 @@ is the property list for the given project. PUB-DIR is the publishing directory. Return output file name." - (org-e-publish-org-to 'e-html filename "html" plist pub-dir)) + (org-e-publish-org-to 'e-html filename ".html" plist pub-dir)) ;; TODO: Not implemented yet. ;; (defun org-e-publish-org-to-org (plist filename pub-dir) From 09ad83efe95e5e040656d1645f61606f6aa6213f Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 19 Sep 2012 09:22:12 +0200 Subject: [PATCH 2/3] org-freemind.el (org-freemind-write-node): Convert links in nodes * org-freemind.el (org-freemind-write-node): Convert links in nodes. Thanks to Bill Day for reporting this. --- lisp/org-freemind.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el index b13d48713..a76730c1e 100644 --- a/lisp/org-freemind.el +++ b/lisp/org-freemind.el @@ -559,6 +559,8 @@ DRAWERS-REGEXP are converted to freemind notes." (add-to-list 'this-icons "full-7")) )))) (setq this-m2 (org-trim this-m2)) + (when (string-match org-bracket-link-regexp this-m2) + (setq this-m2 (concat (match-string 3 this-m2) " (link)"))) (setq this-m2-escaped (org-freemind-escape-str-from-org this-m2)) (let ((node-notes (org-freemind-org-text-to-freemind-subnode/note this-m2-escaped From 7babf1f1a011dc5d40a99d8ef495a7ada656fae7 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 19 Sep 2012 10:46:14 +0200 Subject: [PATCH 3/3] org-freemind.el (org-freemind-write-node): Enhance links conversion in nodes * org-freemind.el (org-freemind-write-node): Enhance links conversion in nodes. Thanks to Bill Day for requesting this. --- lisp/org-freemind.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/org-freemind.el b/lisp/org-freemind.el index a76730c1e..a05cb554d 100644 --- a/lisp/org-freemind.el +++ b/lisp/org-freemind.el @@ -527,6 +527,7 @@ DRAWERS-REGEXP are converted to freemind notes." next-has-some-visible-child) (let* (this-icons this-bg-color + this-m2-link this-m2-escaped this-rich-node this-rich-note @@ -559,8 +560,10 @@ DRAWERS-REGEXP are converted to freemind notes." (add-to-list 'this-icons "full-7")) )))) (setq this-m2 (org-trim this-m2)) - (when (string-match org-bracket-link-regexp this-m2) - (setq this-m2 (concat (match-string 3 this-m2) " (link)"))) + (when (string-match org-bracket-link-analytic-regexp this-m2) + (setq this-m2-link (concat "link=\"" (match-string 1 this-m2) + (match-string 3 this-m2) "\" ") + this-m2 (replace-match "\\5" nil nil this-m2 0))) (setq this-m2-escaped (org-freemind-escape-str-from-org this-m2)) (let ((node-notes (org-freemind-org-text-to-freemind-subnode/note this-m2-escaped @@ -570,7 +573,8 @@ DRAWERS-REGEXP are converted to freemind notes." (setq this-rich-node (nth 0 node-notes)) (setq this-rich-note (nth 1 node-notes))) (with-current-buffer mm-buffer - (insert " next-level current-level) (unless (or this-children-visible