Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-04-22 10:42:10 +02:00
commit f588f6d884
1 changed files with 1 additions and 0 deletions

View File

@ -454,6 +454,7 @@ export back-end currently used."
(not org-html-use-infojs)
(and (eq org-html-use-infojs 'when-configured)
(or (not (plist-get exp-plist :infojs-opt))
(string= "" (plist-get exp-plist :infojs-opt))
(string-match "\\<view:nil\\>"
(plist-get exp-plist :infojs-opt)))))
(let* ((template org-html-infojs-template)