ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-19 10:51:30 +02:00
parent 18069f578d 7babf1f1a0
commit 5940b7aa65
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/lisp/org-e-publish.el
View File

@ -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)

8
lisp/org-freemind.el
View File

@ -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,6 +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-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
@ -568,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 "<node text=\"" this-m2-escaped "\"")
(insert "<node " (if this-m2-link this-m2-link "")
"text=\"" this-m2-escaped "\"")
(org-freemind-get-node-style this-m2)
(when (> next-level current-level)
(unless (or this-children-visible