Merge from origin/emacs-25

[gnu-emacs] / lisp / org / ob-gnuplot.el

diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 0dcb1ba6175950ab57d168e2d0e80fa9d29f6903..abf45af852398b21e1c798468e9f230b0319306e 100644 (file)
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -41,9 +41,10 @@
 (require 'ob)
 (eval-when-compile (require 'cl))
 
-(declare-function org-time-string-to-time "org" (s))
+(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))
+(declare-function orgtbl-to-generic "org-table"
+                  (table params &optional backend))
 (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" ())