Merge upstream Org (from commit acbbe2)

[bpt/emacs.git] / lisp / org / org-html.el

diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 79b0286..a6ca2d2 100644 (file)
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -210,6 +210,7 @@ not be modified.  Use the variables `org-export-html-style' to add
 your own style information."
   :group 'org-export-html
   :type 'boolean)
+
 ;;;###autoload
 (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
 
@@ -2380,7 +2381,6 @@ the settings define in the org-... variables."
                            (plist-get htmlize-buffer-places 'content-end)))
       (kill-buffer htmlbuf))))
 
-;;;###autoload
 (defun org-export-htmlize-generate-css ()
   "Create the CSS for all font definitions in the current Emacs session.
 Use this to create face definitions in your CSS style file that can then
@@ -2749,4 +2749,8 @@ the alist of previous items."
 
 (provide 'org-html)
 
+;; Local variables:
+;; generated-autoload-file: "org-loaddefs.el"
+;; End:
+
 ;;; org-html.el ends here