diff options
Diffstat (limited to 'lisp/org/org-html.el')
| -rw-r--r-- | lisp/org/org-html.el | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el index 91df2ebcc4e..493d8a28afb 100644 --- a/lisp/org/org-html.el +++ b/lisp/org/org-html.el | |||
| @@ -328,7 +328,7 @@ You can also customize this for each buffer, using something like | |||
| 328 | * @licstart The following is the entire license notice for the | 328 | * @licstart The following is the entire license notice for the |
| 329 | * JavaScript code in %PATH. | 329 | * JavaScript code in %PATH. |
| 330 | * | 330 | * |
| 331 | * Copyright (C) 2012 MathJax | 331 | * Copyright (C) 2012-2013 MathJax |
| 332 | * | 332 | * |
| 333 | * Licensed under the Apache License, Version 2.0 (the \"License\"); | 333 | * Licensed under the Apache License, Version 2.0 (the \"License\"); |
| 334 | * you may not use this file except in compliance with the License. | 334 | * you may not use this file except in compliance with the License. |
| @@ -793,7 +793,7 @@ If there is an active region, export only the region. | |||
| 793 | The prefix ARG specifies how many levels of the outline should become | 793 | The prefix ARG specifies how many levels of the outline should become |
| 794 | headlines. The default is 3. Lower levels will become bulleted lists." | 794 | headlines. The default is 3. Lower levels will become bulleted lists." |
| 795 | (interactive "P") | 795 | (interactive "P") |
| 796 | (org-export-as-html arg 'hidden) | 796 | (org-export-as-html arg) |
| 797 | (org-open-file buffer-file-name) | 797 | (org-open-file buffer-file-name) |
| 798 | (when org-export-kill-product-buffer-when-displayed | 798 | (when org-export-kill-product-buffer-when-displayed |
| 799 | (kill-buffer (current-buffer)))) | 799 | (kill-buffer (current-buffer)))) |
| @@ -806,14 +806,14 @@ emacs --batch | |||
| 806 | --load=$HOME/lib/emacs/org.el | 806 | --load=$HOME/lib/emacs/org.el |
| 807 | --eval \"(setq org-export-headline-levels 2)\" | 807 | --eval \"(setq org-export-headline-levels 2)\" |
| 808 | --visit=MyFile --funcall org-export-as-html-batch" | 808 | --visit=MyFile --funcall org-export-as-html-batch" |
| 809 | (org-export-as-html org-export-headline-levels 'hidden)) | 809 | (org-export-as-html org-export-headline-levels)) |
| 810 | 810 | ||
| 811 | ;;;###autoload | 811 | ;;;###autoload |
| 812 | (defun org-export-as-html-to-buffer (arg) | 812 | (defun org-export-as-html-to-buffer (arg) |
| 813 | "Call `org-export-as-html` with output to a temporary buffer. | 813 | "Call `org-export-as-html` with output to a temporary buffer. |
| 814 | No file is created. The prefix ARG is passed through to `org-export-as-html'." | 814 | No file is created. The prefix ARG is passed through to `org-export-as-html'." |
| 815 | (interactive "P") | 815 | (interactive "P") |
| 816 | (org-export-as-html arg nil nil "*Org HTML Export*") | 816 | (org-export-as-html arg nil "*Org HTML Export*") |
| 817 | (when org-export-show-temporary-export-buffer | 817 | (when org-export-show-temporary-export-buffer |
| 818 | (switch-to-buffer-other-window "*Org HTML Export*"))) | 818 | (switch-to-buffer-other-window "*Org HTML Export*"))) |
| 819 | 819 | ||
| @@ -865,9 +865,7 @@ in a window. A non-interactive call will only return the buffer." | |||
| 865 | (goto-char end) | 865 | (goto-char end) |
| 866 | (set-mark (point)) ;; to activate the region | 866 | (set-mark (point)) ;; to activate the region |
| 867 | (goto-char beg) | 867 | (goto-char beg) |
| 868 | (setq rtn (org-export-as-html | 868 | (setq rtn (org-export-as-html nil ext-plist buffer body-only)) |
| 869 | nil nil ext-plist | ||
| 870 | buffer body-only)) | ||
| 871 | (if (fboundp 'deactivate-mark) (deactivate-mark)) | 869 | (if (fboundp 'deactivate-mark) (deactivate-mark)) |
| 872 | (if (and (org-called-interactively-p 'any) (bufferp rtn)) | 870 | (if (and (org-called-interactively-p 'any) (bufferp rtn)) |
| 873 | (switch-to-buffer-other-window rtn) | 871 | (switch-to-buffer-other-window rtn) |
| @@ -1171,14 +1169,12 @@ OPT-PLIST is the export options list." | |||
| 1171 | (defvar org-heading-keyword-regexp-format) ; defined in org.el | 1169 | (defvar org-heading-keyword-regexp-format) ; defined in org.el |
| 1172 | 1170 | ||
| 1173 | ;;;###autoload | 1171 | ;;;###autoload |
| 1174 | (defun org-export-as-html (arg &optional hidden ext-plist | 1172 | (defun org-export-as-html (arg &optional ext-plist to-buffer body-only pub-dir) |
| 1175 | to-buffer body-only pub-dir) | ||
| 1176 | "Export the outline as a pretty HTML file. | 1173 | "Export the outline as a pretty HTML file. |
| 1177 | If there is an active region, export only the region. The prefix | 1174 | If there is an active region, export only the region. The prefix |
| 1178 | ARG specifies how many levels of the outline should become | 1175 | ARG specifies how many levels of the outline should become |
| 1179 | headlines. The default is 3. Lower levels will become bulleted | 1176 | headlines. The default is 3. Lower levels will become bulleted |
| 1180 | lists. HIDDEN is obsolete and does nothing. | 1177 | lists. EXT-PLIST is a property list with external parameters overriding |
| 1181 | EXT-PLIST is a property list with external parameters overriding | ||
| 1182 | org-mode's default settings, but still inferior to file-local | 1178 | org-mode's default settings, but still inferior to file-local |
| 1183 | settings. When TO-BUFFER is non-nil, create a buffer with that | 1179 | settings. When TO-BUFFER is non-nil, create a buffer with that |
| 1184 | name and export to that buffer. If TO-BUFFER is the symbol | 1180 | name and export to that buffer. If TO-BUFFER is the symbol |