Browse Source

Fix number of arguments for org-export-as-org/docbook

* org-exp.el (org-export-as-org): Remove useless
argument.

* org-docbook.el (org-export-as-docbook-batch)
(org-export-region-as-docbook, org-export-as-docbook-pdf): Fix
the number of arguments.
(org-export-as-docbook): Remove useless argument.

Thanks to George McNinch for reporting this.
Bastien Guerry 12 years ago
parent
commit
6272ff2d18
2 changed files with 7 additions and 13 deletions
  1. 6 11
      lisp/org-docbook.el
  2. 1 2
      lisp/org-exp.el

+ 6 - 11
lisp/org-docbook.el

@@ -274,14 +274,14 @@ For example:
 $ emacs --batch
 $ emacs --batch
         --load=$HOME/lib/emacs/org.el
         --load=$HOME/lib/emacs/org.el
         --visit=MyOrgFile.org --funcall org-export-as-docbook-batch"
         --visit=MyOrgFile.org --funcall org-export-as-docbook-batch"
-  (org-export-as-docbook 'hidden))
+  (org-export-as-docbook))
 
 
 ;;;###autoload
 ;;;###autoload
 (defun org-export-as-docbook-to-buffer ()
 (defun org-export-as-docbook-to-buffer ()
   "Call `org-export-as-docbook' with output to a temporary buffer.
   "Call `org-export-as-docbook' with output to a temporary buffer.
 No file is created."
 No file is created."
   (interactive)
   (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
   (when org-export-show-temporary-export-buffer
     (switch-to-buffer-other-window "*Org DocBook Export*")))
     (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)
     (goto-char end)
     (set-mark (point)) ;; To activate the region
     (set-mark (point)) ;; To activate the region
     (goto-char beg)
     (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 (fboundp 'deactivate-mark) (deactivate-mark))
     (if (and (org-called-interactively-p 'any) (bufferp rtn))
     (if (and (org-called-interactively-p 'any) (bufferp rtn))
 	(switch-to-buffer-other-window rtn)
 	(switch-to-buffer-other-window rtn)
       rtn)))
       rtn)))
 
 
 ;;;###autoload
 ;;;###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."
   "Export as DocBook XML file, and generate PDF file."
   (interactive "P")
   (interactive "P")
   (if (or (not org-export-docbook-xslt-proc-command)
   (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)
 	   (org-combine-plists (org-default-export-plist)
 			       ext-plist
 			       ext-plist
 			       (org-infile-export-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))
 	 (filename (buffer-file-name docbook-buf))
 	 (base (file-name-sans-extension filename))
 	 (base (file-name-sans-extension filename))
 	 (fofile (concat base ".fo"))
 	 (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
 (defvar org-heading-keyword-regexp-format) ; defined in org.el
 
 
 ;;;###autoload
 ;;;###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.
   "Export the current buffer as a DocBook file.
 If there is an active region, export only the region.  When
 If there is an active region, export only the region.  When
 HIDDEN is obsolete and does nothing.  EXT-PLIST is a
 HIDDEN is obsolete and does nothing.  EXT-PLIST is a

+ 1 - 2
lisp/org-exp.el

@@ -3051,8 +3051,7 @@ to the value of `temporary-file-directory'."
       (delete-file tmp-file))))
       (delete-file tmp-file))))
 
 
 ;;;###autoload
 ;;;###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.
   "Make a copy with not-exporting stuff removed.
 The purpose of this function is to provide a way to export the source
 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
 Org file of a webpage in Org format, but with sensitive and/or irrelevant