summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-05-15 17:42:47 -0400
committerKyle Meyer <kyle@kyleam.com>2016-05-15 18:59:20 -0400
commit19cf68da90d0afd74a4c38106eae5c135e146364 (patch)
tree6974b4b5d1e0a45644e17add86caec0adc66e368
parente712f178229140043d72509ba3e68b5a43f4ea80 (diff)
downloadorg-mode-19cf68da90d0afd74a4c38106eae5c135e146364.tar.gz
Fix remaining declare-function issues
* lisp/ob-shell.el (org-babel-comint-in-buffer): (org-babel-comint-with-output): * lisp/org-table.el (org-export-create-backend): * lisp/org.el (org-babel-do-in-edit-buffer): Indicate that FN is not a defun. * lisp/ob-tangle.el (org-string-nw-p): * lisp/org-table.el (org-export-create-backend): (org-export-data-with-backend): (org-export-filter-apply-functions): (org-export-first-sibling-p): (org-export-get-backend): (org-export-get-environment): (org-export-install-filters): (org-export-table-has-special-column-p): (org-export-table-row-is-special-p): Correct source file name. * lisp/ob-R.el (ess-wait-for-process): * lisp/org-clock.el (calendar-iso-to-absolute): * lisp/org-list.el (org-previous-line-empty-p): * lisp/org-pcomplete.el (org-entry-properties): * lisp/org-table.el (org-export-data-with-backend): (org-export-get-environment): * lisp/org.el (org-element-interpret-data): Correct argument list.
-rw-r--r--lisp/ob-R.el2
-rw-r--r--lisp/ob-shell.el6
-rw-r--r--lisp/ob-tangle.el2
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/org-pcomplete.el2
-rw-r--r--lisp/org-table.el20
-rw-r--r--lisp/org.el4
7 files changed, 21 insertions, 17 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 4b37c18..af77eb8 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -36,7 +36,7 @@
(declare-function ess-make-buffer-current "ext:ess-inf" ())
(declare-function ess-eval-buffer "ext:ess-inf" (vis))
(declare-function ess-wait-for-process "ext:ess-inf"
- (proc &optional sec-prompt wait force-redisplay))
+ (&optional proc sec-prompt wait force-redisplay))
(declare-function org-number-sequence "org-compat" (from &optional to inc))
(declare-function org-remove-if-not "org" (predicate seq))
(declare-function org-every "org" (pred seq))
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index 527e6f5..aa65824 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -30,10 +30,12 @@
(require 'shell)
(eval-when-compile (require 'cl))
-(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body))
+(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body)
+ t)
(declare-function org-babel-comint-wait-for-output "ob-comint" (buffer))
(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer))
-(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body))
+(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)
+ t)
(declare-function orgtbl-to-generic "org-table" (table params))
(defvar org-babel-default-header-args:shell '())
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 7714971..e5bc28e 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -42,7 +42,7 @@
(declare-function org-link-escape "org" (text &optional table merge))
(declare-function org-open-link-from-string "org" (s &optional arg reference-buffer))
(declare-function org-store-link "org" (arg))
-(declare-function org-string-nw-p "org" (s))
+(declare-function org-string-nw-p "org-macs" (s))
(declare-function outline-previous-heading "outline" ())
(defvar org-link-types-re)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 52e8795..66be797 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -32,7 +32,7 @@
(require 'cl))
(require 'org)
-(declare-function calendar-iso-to-absolute "cal-iso" (&optional date))
+(declare-function calendar-iso-to-absolute "cal-iso" (date))
(declare-function notifications-notify "notifications" (&rest params))
(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
(declare-function org-element-property "org-element" (property element))
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index d0c2064..91afcb8 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -41,7 +41,7 @@
(declare-function org-get-tags "org" ())
(declare-function org-buffer-property-keys "org"
(&optional include-specials include-defaults include-columns))
-(declare-function org-entry-properties "org" (&optional pom which specific))
+(declare-function org-entry-properties "org" (&optional pom which))
;;;; Customization variables
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 0d0e216..4fef299 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -52,15 +52,17 @@
(declare-function org-element-property "org-element" (property element))
(declare-function org-element-type "org-element" (element))
-(declare-function org-export-create-backend "org-export" (&rest rest))
-(declare-function org-export-data-with-backend "org-export" (arg1 arg2 arg3))
-(declare-function org-export-filter-apply-functions "org-export" (&optional filters value info))
-(declare-function org-export-first-sibling-p "org-export" (blob info))
-(declare-function org-export-get-backend "org-export" (name))
-(declare-function org-export-get-environment "org-export" (&optional arg1 arg2 arg3))
-(declare-function org-export-install-filters "org-export" (info))
-(declare-function org-export-table-has-special-column-p "org-export" (table))
-(declare-function org-export-table-row-is-special-p "org-export" (table-row info))
+(declare-function org-export-create-backend "ox" (&rest rest) t)
+(declare-function org-export-data-with-backend "ox" (data backend info))
+(declare-function org-export-filter-apply-functions "ox"
+ (filters value info))
+(declare-function org-export-first-sibling-p "ox" (blob info))
+(declare-function org-export-get-backend "ox" (name))
+(declare-function org-export-get-environment "ox"
+ (&optional backend subtreep ext-plist))
+(declare-function org-export-install-filters "ox" (info))
+(declare-function org-export-table-has-special-column-p "ox" (table))
+(declare-function org-export-table-row-is-special-p "ox" (table-row info))
(declare-function calc-eval "calc" (str &optional separator &rest args))
diff --git a/lisp/org.el b/lisp/org.el
index c1d25fa..e4edcf4 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -126,7 +126,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
(declare-function org-agenda-list "org-agenda"
(&optional arg start-day span with-hour))
(declare-function org-agenda-redo "org-agenda" (&optional all))
-(declare-function org-babel-do-in-edit-buffer "ob-core" (&rest body))
+(declare-function org-babel-do-in-edit-buffer "ob-core" (&rest body) t)
(declare-function org-babel-tangle-file "ob-tangle" (file &optional target-file lang))
(declare-function org-beamer-mode "ox-beamer" (&optional prefix) t)
(declare-function org-clock-get-last-clock-out-time "org-clock" ())
@@ -144,7 +144,7 @@ Stars are put in group 1 and the trimmed body in group 2.")
(declare-function org-element-contents "org-element" (element))
(declare-function org-element-context "org-element" (&optional element))
(declare-function org-element-copy "org-element" (datum))
-(declare-function org-element-interpret-data "org-element" (data &optional parent))
+(declare-function org-element-interpret-data "org-element" (data))
(declare-function org-element-lineage "org-element" (blob &optional types with-self))
(declare-function org-element-nested-p "org-element" (elem-a elem-b))
(declare-function org-element-parse-buffer "org-element" (&optional granularity visible-only))