summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-04-14 17:42:23 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2010-04-14 17:42:23 +0200
commit310210e8549ef4465bdb91c04261711067ef5cd7 (patch)
tree7dccd3e952cb1b926a888342137010a07d845cd9
parenta74a748d0f206a82b8f67b3d60d6528d9e876feb (diff)
parenta2769bef610bfd02b3acc1f3ad83f018615def0e (diff)
downloadorg-mode-310210e8549ef4465bdb91c04261711067ef5cd7.tar.gz
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r--contrib/lisp/org-mime.el15
1 files changed, 9 insertions, 6 deletions
diff --git a/contrib/lisp/org-mime.el b/contrib/lisp/org-mime.el
index 7891c63..b4882b0 100644
--- a/contrib/lisp/org-mime.el
+++ b/contrib/lisp/org-mime.el
@@ -53,6 +53,8 @@
;; (local-set-key "\C-c\M-o" 'org-mime-org-buffer-htmlize)))
;;; Code:
+(require 'cl)
+
(defcustom org-mime-default-header
"#+OPTIONS: latex:t\n"
"Default header to control html export options, and ensure
@@ -199,12 +201,13 @@ TMP-FILE during export."
(if (string= fmt "org") (length org-mime-default-header) 0)))))
(defun org-mime-apply-html-hook (html)
- (when org-mime-html-hook
- (with-temp-buffer
- (insert html)
- (goto-char (point-min))
- (run-hooks 'org-mime-html-hook)
- (buffer-string))))
+ (if org-mime-html-hook
+ (with-temp-buffer
+ (insert html)
+ (goto-char (point-min))
+ (run-hooks 'org-mime-html-hook)
+ (buffer-string))
+ html))
(defun org-mime-org-buffer-htmlize ()
"Export the current org-mode buffer to HTML using