summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-05-15 12:24:59 -0400
committerKyle Meyer <kyle@kyleam.com>2016-05-15 18:59:19 -0400
commit1c9bb0dba852431783d697eb27ce9540cbd9d8f8 (patch)
treedaca3709d80b7d70dcdccf9ee29d11fc71991f62
parent1f046ea4b12725cc0696a21b28fa8b1be7e978a4 (diff)
downloadorg-mode-1c9bb0dba852431783d697eb27ce9540cbd9d8f8.tar.gz
Fix up last backport
* lisp/org.el (org-export-backend-options): Add back removed declare-function call. * lisp/ob-awk.el (orgtbl-to-generic): * lisp/ob-core.el (orgtbl-to-generic): * lisp/ob-gnuplot.el (orgtbl-to-generic): Remove BACKEND argument from declare-function calls. The last backport added this argument to match orgtbl-to-generic's signature in Emacs's version of Org, but the BACKEND argument to orgtbl-to-generic was later removed in 9209aa3 (org-table: Use "ox.el" internally for radio tables, 2014-08-24).
-rw-r--r--lisp/ob-awk.el3
-rw-r--r--lisp/ob-core.el3
-rw-r--r--lisp/ob-gnuplot.el3
-rw-r--r--lisp/org.el1
4 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 3af8081..021dd78 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -36,8 +36,7 @@
(eval-when-compile (require 'cl))
(declare-function org-babel-ref-resolve "ob-ref" (ref))
-(declare-function orgtbl-to-generic "org-table"
- (table params &optional backend))
+(declare-function orgtbl-to-generic "org-table" (table params))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("awk" . "awk"))
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 8627497..2617c13 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -77,8 +77,7 @@
(hook function &optional append local))
(declare-function org-table-align "org-table" ())
(declare-function org-table-end "org-table" (&optional table-type))
-(declare-function orgtbl-to-generic "org-table"
- (table params &optional backend))
+(declare-function orgtbl-to-generic "org-table" (table params))
(declare-function orgtbl-to-orgtbl "org-table" (table params))
(declare-function org-babel-tangle-comment-links "ob-tangle" (&optional info))
(declare-function org-babel-lob-get-info "ob-lob" nil)
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index 16418d6..a4a0d25 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -43,8 +43,7 @@
(declare-function org-time-string-to-time "org" (s &optional buffer pos))
(declare-function org-combine-plists "org" (&rest plists))
-(declare-function orgtbl-to-generic "org-table"
- (table params &optional backend))
+(declare-function orgtbl-to-generic "org-table" (table params))
(declare-function gnuplot-mode "ext:gnuplot-mode" ())
(declare-function gnuplot-send-string-to-gnuplot "ext:gnuplot-mode" (str txt))
(declare-function gnuplot-send-buffer-to-gnuplot "ext:gnuplot-mode" ())
diff --git a/lisp/org.el b/lisp/org.el
index 2afce70..c1d25fa 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12320,6 +12320,7 @@ This function can be used in a hook."
;;;; Completion
+(declare-function org-export-backend-options "ox" (cl-x) t)
(defun org-get-export-keywords ()
"Return a list of all currently understood export keywords.
Export keywords include options, block names, attributes and