mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 11:10:42 +00:00
Code Releases Activity

Merge branches 'master' and 'master' of orgmode.org:org-mode

Browse source
This commit is contained in:
Bastien Guerry 2011-12-12 17:14:25 +01:00
parent 701830d5a2 48b8d633c4
commit 2deac0b072
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/org-odt.el
View file

@ -1226,7 +1226,7 @@ value of `org-export-odt-fontify-srcblocks."
lines (funcall
(or (and org-export-odt-fontify-srcblocks
(or (featurep 'htmlfontify)
(require 'htmlfontify))
(require 'htmlfontify nil t))
(fboundp 'htmlfontify-string)
'org-odt-format-source-code-or-example-colored)
'org-odt-format-source-code-or-example-plain)