summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-01 23:32:44 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-01 23:32:44 (GMT)
commita5842680712ed626d47b049f1809f67e98c1de31 (patch)
tree2443d1ecbe06f73b1407991fec80843a82be6ba1
parentfb8ba17e69e1dfa8d06553bb5122abf849a6faf2 (diff)
parent6272ff2d18c6ce973159830c136b8f5f015c45c8 (diff)
downloadorg-mode-a5842680712ed626d47b049f1809f67e98c1de31.zip
org-mode-a5842680712ed626d47b049f1809f67e98c1de31.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-docbook.el17
-rw-r--r--lisp/org-exp.el3
2 files changed, 7 insertions, 13 deletions
diff --git a/lisp/org-docbook.el b/lisp/org-docbook.el
index 78d383f..1d75370 100644
--- a/lisp/org-docbook.el
+++ b/lisp/org-docbook.el
@@ -274,14 +274,14 @@ For example:
$ emacs --batch
--load=$HOME/lib/emacs/org.el
--visit=MyOrgFile.org --funcall org-export-as-docbook-batch"
- (org-export-as-docbook 'hidden))
+ (org-export-as-docbook))
;;;###autoload
(defun org-export-as-docbook-to-buffer ()
"Call `org-export-as-docbook' with output to a temporary buffer.
No file is created."
(interactive)
- (org-export-as-docbook nil nil "*Org DocBook Export*")
+ (org-export-as-docbook nil "*Org DocBook Export*")
(when org-export-show-temporary-export-buffer
(switch-to-buffer-other-window "*Org DocBook Export*")))
@@ -334,17 +334,14 @@ in a window. A non-interactive call will only return the buffer."
(goto-char end)
(set-mark (point)) ;; To activate the region
(goto-char beg)
- (setq rtn (org-export-as-docbook
- nil nil
- buffer body-only))
+ (setq rtn (org-export-as-docbook nil buffer body-only))
(if (fboundp 'deactivate-mark) (deactivate-mark))
(if (and (org-called-interactively-p 'any) (bufferp rtn))
(switch-to-buffer-other-window rtn)
rtn)))
;;;###autoload
-(defun org-export-as-docbook-pdf (&optional hidden ext-plist
- to-buffer body-only pub-dir)
+(defun org-export-as-docbook-pdf (&optional ext-plist to-buffer body-only pub-dir)
"Export as DocBook XML file, and generate PDF file."
(interactive "P")
(if (or (not org-export-docbook-xslt-proc-command)
@@ -360,8 +357,7 @@ in a window. A non-interactive call will only return the buffer."
(org-combine-plists (org-default-export-plist)
ext-plist
(org-infile-export-plist))))
- (docbook-buf (org-export-as-docbook hidden ext-plist
- to-buffer body-only pub-dir))
+ (docbook-buf (org-export-as-docbook ext-plist to-buffer body-only pub-dir))
(filename (buffer-file-name docbook-buf))
(base (file-name-sans-extension filename))
(fofile (concat base ".fo"))
@@ -398,8 +394,7 @@ in a window. A non-interactive call will only return the buffer."
(defvar org-heading-keyword-regexp-format) ; defined in org.el
;;;###autoload
-(defun org-export-as-docbook (&optional hidden ext-plist
- to-buffer body-only pub-dir)
+(defun org-export-as-docbook (&optional ext-plist to-buffer body-only pub-dir)
"Export the current buffer as a DocBook file.
If there is an active region, export only the region. When
HIDDEN is obsolete and does nothing. EXT-PLIST is a
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 1e43ed8..40f90c2 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -3057,8 +3057,7 @@ to the value of `temporary-file-directory'."
(delete-file tmp-file))))
;;;###autoload
-(defun org-export-as-org (arg &optional hidden ext-plist
- to-buffer body-only pub-dir)
+(defun org-export-as-org (arg &optional ext-plist to-buffer body-only pub-dir)
"Make a copy with not-exporting stuff removed.
The purpose of this function is to provide a way to export the source
Org file of a webpage in Org format, but with sensitive and/or irrelevant