diff options
| author | Jambunathan K <kjambunathan@gmail.com> | 2011-12-24 12:18:45 +0530 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-01-03 09:14:59 +0100 |
| commit | f49108a6548149a793e2adf32b8d7e690b704ca7 (patch) | |
| tree | 02eae620a6aa785acf85be01118ad2963f6878c4 | |
| parent | d75585cc2e22ad64b34534ee6fcacbdbd0b74704 (diff) | |
| download | org-mode-f49108a6548149a793e2adf32b8d7e690b704ca7.tar.gz | |
org-odt.el: Declare vars and functions from htmlfontify
| -rw-r--r-- | lisp/org-odt.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/org-odt.el b/lisp/org-odt.el index d23909a..b6723ca 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -27,10 +27,7 @@ ;;; Code: (eval-when-compile - (require 'cl) - ;; htmlfontify.el was introduce in Emacs 23.2 - (when (>= (string-to-number emacs-version) 23.2) - (require 'htmlfontify))) + (require 'cl)) (require 'org-lparse) (defgroup org-export-odt nil @@ -1195,6 +1192,10 @@ This style is much the same as that of \"OrgFixedWidthBlock\" except that the foreground and background colors are set according to the default face identified by the `htmlfontify'.") +(defvar hfy-optimisations) +(declare-function hfy-face-to-style "htmlfontify" (fn)) +(declare-function hfy-face-or-def-to-name "htmlfontify" (fn)) + (defun org-odt-hfy-face-to-css (fn) "Create custom style for face FN. When FN is the default face, use it's foreground and background @@ -1297,6 +1298,8 @@ value of `org-export-odt-fontify-srcblocks." lines (funcall (or (and org-export-odt-fontify-srcblocks (or (featurep 'htmlfontify) + ;; htmlfontify.el was introduced in Emacs 23.2 + ;; So load it with some caution (require 'htmlfontify nil t)) (fboundp 'htmlfontify-string) 'org-odt-format-source-code-or-example-colored) |