mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 13:10:42 +00:00
Merge branches 'master' and 'master' of orgmode.org:org-mode
This commit is contained in:
commit
2deac0b072
|
@ -1226,7 +1226,7 @@ value of `org-export-odt-fontify-srcblocks."
|
||||||
lines (funcall
|
lines (funcall
|
||||||
(or (and org-export-odt-fontify-srcblocks
|
(or (and org-export-odt-fontify-srcblocks
|
||||||
(or (featurep 'htmlfontify)
|
(or (featurep 'htmlfontify)
|
||||||
(require 'htmlfontify))
|
(require 'htmlfontify nil t))
|
||||||
(fboundp 'htmlfontify-string)
|
(fboundp 'htmlfontify-string)
|
||||||
'org-odt-format-source-code-or-example-colored)
|
'org-odt-format-source-code-or-example-colored)
|
||||||
'org-odt-format-source-code-or-example-plain)
|
'org-odt-format-source-code-or-example-plain)
|
||||||
|
|
Loading…
Reference in a new issue