summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Ecay <aaronecay@gmail.com>2018-05-10 01:04:12 +0100
committerAaron Ecay <aaronecay@gmail.com>2018-05-10 01:04:12 +0100
commit4afb7f747b16ff32086bc3ac937380e774d6e54c (patch)
tree5a1372bece4822b9a10e639c7d6618ebebb8c646
parent4c41e1d03a85f71bd86e31076b1a528031f4dcbe (diff)
downloadorg-mode-4afb7f747b16ff32086bc3ac937380e774d6e54c.tar.gz
Update declare-function calls for functions that have moved.
In cases where functions have moved from org.el into org-macs.el, it is often possible to replace declare-function by (require 'org-macs)
-rw-r--r--lisp/ob-C.el4
-rw-r--r--lisp/ob-J.el2
-rw-r--r--lisp/ob-calc.el2
-rw-r--r--lisp/ob-clojure.el2
-rw-r--r--lisp/ob-core.el7
-rw-r--r--lisp/ob-forth.el2
-rw-r--r--lisp/ob-fortran.el3
-rw-r--r--lisp/ob-gnuplot.el2
-rw-r--r--lisp/ob-haskell.el3
-rw-r--r--lisp/ob-latex.el2
-rw-r--r--lisp/ob-lisp.el2
-rw-r--r--lisp/ob-lua.el3
-rw-r--r--lisp/ob-ocaml.el2
-rw-r--r--lisp/ob-octave.el2
-rw-r--r--lisp/ob-python.el3
-rw-r--r--lisp/ob-ref.el2
-rw-r--r--lisp/ob-ruby.el2
-rw-r--r--lisp/ob-shell.el2
-rw-r--r--lisp/ob-table.el3
-rw-r--r--lisp/ob-tangle.el6
-rw-r--r--lisp/ob-vala.el3
-rw-r--r--lisp/org-compat.el1
-rw-r--r--lisp/org-footnote.el2
-rw-r--r--lisp/org-goto.el4
-rw-r--r--lisp/org-list.el6
-rw-r--r--lisp/org-macs.el5
-rw-r--r--lisp/org-src.el4
27 files changed, 25 insertions, 56 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el
index ff5be34..2347ccf 100644
--- a/lisp/ob-C.el
+++ b/lisp/ob-C.el
@@ -34,11 +34,9 @@
(require 'cc-mode)
(require 'ob)
-
+(require 'org-macs)
(declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
-(declare-function org-remove-indentation "org" (code &optional n))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("C++" . "cpp"))
diff --git a/lisp/ob-J.el b/lisp/ob-J.el
index 8781221..72d4aed 100644
--- a/lisp/ob-J.el
+++ b/lisp/ob-J.el
@@ -31,8 +31,8 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function j-console-ensure-session "ext:j-console" ())
(defcustom org-babel-J-command "jconsole"
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 387cba2..6871af2 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -27,6 +27,7 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(require 'calc)
(require 'calc-trail)
(require 'calc-store)
@@ -34,7 +35,6 @@
(declare-function calc-store-into "calc-store" (&optional var))
(declare-function calc-recall "calc-store" (&optional var))
(declare-function math-evaluate-expr "calc-ext" (x))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-default-header-args:calc nil
"Default arguments for evaluating a calc source block.")
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 93674b5..98bed12 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -41,6 +41,7 @@
;;; Code:
(require 'cl-lib)
(require 'ob)
+(require 'org-macs)
(declare-function cider-current-connection "ext:cider-client" (&optional type))
(declare-function cider-current-ns "ext:cider-client" ())
@@ -49,7 +50,6 @@
(declare-function nrepl-dict-put "ext:nrepl-client" (dict key value))
(declare-function nrepl-request:eval "ext:nrepl-client" (input callback connection &optional ns line column additional-params tooling))
(declare-function nrepl-sync-request:eval "ext:nrepl-client" (input connection &optional ns tooling))
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function slime-eval "ext:slime" (sexp &optional package))
(defvar nrepl-sync-request-timeout)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 7e8c6db..4c82140 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -48,10 +48,8 @@
(declare-function org-babel-ref-resolve "ob-ref" (ref))
(declare-function org-babel-ref-split-args "ob-ref" (arg-string))
(declare-function org-babel-tangle-comment-links "ob-tangle" (&optional info))
-(declare-function org-completing-read "org" (&rest args))
(declare-function org-current-level "org" ())
(declare-function org-cycle "org" (&optional arg))
-(declare-function org-do-remove-indentation "org" (&optional n))
(declare-function org-edit-src-code "org-src" (&optional code edit-buffer-name))
(declare-function org-edit-src-exit "org-src" ())
(declare-function org-element-at-point "org-element" ())
@@ -61,7 +59,6 @@
(declare-function org-element-type "org-element" (element))
(declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
(declare-function org-escape-code-in-region "org-src" (beg end))
-(declare-function org-in-regexp "org" (regexp &optional nlines visually))
(declare-function org-indent-line "org" ())
(declare-function org-list-get-list-end "org-list" (item struct prevs))
(declare-function org-list-prevs-alist "org-list" (struct))
@@ -75,8 +72,6 @@
(declare-function org-next-block "org" (arg &optional backward block-regexp))
(declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
(declare-function org-previous-block "org" (arg &optional block-regexp))
-(declare-function org-remove-indentation "org" (code &optional n))
-(declare-function org-reverse-string "org" (string))
(declare-function org-show-context "org" (&optional key))
(declare-function org-src-coderef-format "org-src" (&optional element))
(declare-function org-src-coderef-regexp "org-src" (fmt &optional label))
@@ -84,9 +79,7 @@
(declare-function org-table-end "org-table" (&optional table-type))
(declare-function org-table-import "org-table" (file arg))
(declare-function org-table-to-lisp "org-table" (&optional txt))
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function org-unescape-code-in-string "org-src" (s))
-(declare-function org-uniquify "org" (list))
(declare-function orgtbl-to-generic "org-table" (table params))
(declare-function orgtbl-to-orgtbl "org-table" (table params))
(declare-function tramp-compat-make-temp-file "tramp-compat" (filename &optional dir-flag))
diff --git a/lisp/ob-forth.el b/lisp/ob-forth.el
index efd5759..5f6202f 100644
--- a/lisp/ob-forth.el
+++ b/lisp/ob-forth.el
@@ -33,9 +33,9 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(declare-function forth-proc "ext:gforth" ())
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-default-header-args:forth '((:session . "yes"))
"Default header arguments for forth code blocks.")
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 49e960f..fd2ec1a 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -28,13 +28,12 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(require 'cc-mode)
(require 'cl-lib)
(declare-function org-entry-get "org"
(pom property &optional inherit literal-nil))
-(declare-function org-remove-indentation "org" (code &optional n))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("fortran" . "F90"))
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index b2f4913..e441707 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -39,9 +39,9 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(declare-function org-time-string-to-time "org" (s))
-(declare-function org-combine-plists "org" (&rest plists))
(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))
diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el
index e607ee0..8fd6199 100644
--- a/lisp/ob-haskell.el
+++ b/lisp/ob-haskell.el
@@ -40,10 +40,9 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(require 'comint)
-(declare-function org-remove-indentation "org" (code &optional n))
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function haskell-mode "ext:haskell-mode" ())
(declare-function run-haskell "ext:inf-haskell" (&optional arg))
(declare-function inferior-haskell-load-file
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 6a963e5..8d03709 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -31,12 +31,12 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(declare-function org-create-formula-image "org" (string tofile options buffer &optional type))
(declare-function org-latex-compile "ox-latex" (texfile &optional snippet))
(declare-function org-latex-guess-inputenc "ox-latex" (header))
(declare-function org-splice-latex-header "org" (tpl def-pkg pkg snippets-p &optional extra))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("latex" . "tex"))
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index b846138..02abd12 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -37,10 +37,10 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(declare-function sly-eval "ext:sly" (sexp &optional package))
(declare-function slime-eval "ext:slime" (sexp &optional package))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("lisp" . "lisp"))
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index 6ae72c7..b68b4e2 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -34,10 +34,9 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(require 'cl-lib)
-(declare-function org-remove-indentation "org" (code &optional n))
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function lua-shell "ext:lua-mode" (&optional argprompt))
(declare-function lua-toggle-shells "ext:lua-mode" (arg))
(declare-function run-lua "ext:lua" (cmd &optional dedicated show))
diff --git a/lisp/ob-ocaml.el b/lisp/ob-ocaml.el
index 90926b5..70e71b7 100644
--- a/lisp/ob-ocaml.el
+++ b/lisp/ob-ocaml.el
@@ -37,11 +37,11 @@
;;; Code:
(require 'ob)
(require 'comint)
+(require 'org-macs)
(declare-function tuareg-run-caml "ext:tuareg" ())
(declare-function tuareg-run-ocaml "ext:tuareg" ())
(declare-function tuareg-interactive-send-input "ext:tuareg" ())
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-tangle-lang-exts)
(add-to-list 'org-babel-tangle-lang-exts '("ocaml" . "ml"))
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index c7339cf..cfc70ec 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -30,10 +30,10 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(declare-function matlab-shell "ext:matlab-mode")
(declare-function matlab-shell-run-region "ext:matlab-mode")
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-default-header-args:matlab '())
(defvar org-babel-default-header-args:octave '())
diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index a44e5a5..64dec8d 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -28,9 +28,8 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
-(declare-function org-remove-indentation "org" )
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function py-shell "ext:python-mode" (&optional argprompt))
(declare-function py-toggle-shells "ext:python-mode" (arg))
(declare-function run-python "ext:python" (&optional cmd dedicated show))
diff --git a/lisp/ob-ref.el b/lisp/ob-ref.el
index 3efa17f..78cf7df 100644
--- a/lisp/ob-ref.el
+++ b/lisp/ob-ref.el
@@ -50,6 +50,7 @@
;;; Code:
(require 'ob-core)
+(require 'org-macs)
(require 'cl-lib)
(declare-function org-babel-lob-get-info "ob-lob" (&optional datum))
@@ -63,7 +64,6 @@
(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
(declare-function org-narrow-to-subtree "org" ())
(declare-function org-show-context "org" (&optional key))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-update-intermediate nil
"Update the in-buffer results of code blocks executed to resolve references.")
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 7686ac4..e2b39ec 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -37,8 +37,8 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function run-ruby "ext:inf-ruby" (&optional command name))
(declare-function xmp "ext:rcodetools" (&optional option))
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el
index c3c6996..f7c6718 100644
--- a/lisp/ob-shell.el
+++ b/lisp/ob-shell.el
@@ -27,6 +27,7 @@
;;; Code:
(require 'ob)
+(require 'org-macs)
(require 'shell)
(require 'cl-lib)
@@ -36,7 +37,6 @@
(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer))
(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)
t)
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function orgtbl-to-generic "org-table" (table params))
(defvar org-babel-default-header-args:shell '())
diff --git a/lisp/ob-table.el b/lisp/ob-table.el
index f6a5c88..b6abdf3 100644
--- a/lisp/ob-table.el
+++ b/lisp/ob-table.el
@@ -54,8 +54,7 @@
;;; Code:
(require 'ob-core)
-
-(declare-function org-trim "org" (s &optional keep-lead))
+(require 'org-macs)
(defun org-babel-table-truncate-at-newline (string)
"Replace newline character with ellipses.
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 48eddb7..105f7bf 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -40,14 +40,12 @@
(declare-function org-element-type "org-element" (element))
(declare-function org-fill-template "org" (template alist))
(declare-function org-heading-components "org" ())
+(declare-function org-id-find "org-id" (id &optional markerp))
(declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
(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-remove-indentation "org" (code &optional n))
-(declare-function org-store-link "org" (arg))
-(declare-function org-trim "org" (s &optional keep-lead))
+(declare-function org-store-link "org" (arg &optional interactive?))
(declare-function outline-previous-heading "outline" ())
-(declare-function org-id-find "org-id" (id &optional markerp))
(defvar org-link-types-re)
diff --git a/lisp/ob-vala.el b/lisp/ob-vala.el
index 96c37e3..bb3ebe9 100644
--- a/lisp/ob-vala.el
+++ b/lisp/ob-vala.el
@@ -39,8 +39,7 @@
;;; Code:
(require 'ob)
-
-(declare-function org-trim "org" (s &optional keep-lead))
+(require 'org-macs)
;; File extension.
(add-to-list 'org-babel-tangle-lang-exts '("vala" . "vala"))
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index d2008db..c68faa9 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -45,7 +45,6 @@
(declare-function org-element-property "org-element" (property element))
(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading))
(declare-function org-get-tags "org" (&optional pos local))
-(declare-function org-invisible-p "org" (&optional pos))
(declare-function org-link-display-format "org" (s))
(declare-function org-link-set-parameters "org" (type &rest rest))
(declare-function org-log-into-drawer "org" ())
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 18d8f84..c460861 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -47,13 +47,11 @@
(declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading))
(declare-function org-fill-paragraph "org" (&optional justify region))
(declare-function org-in-block-p "org" (names))
-(declare-function org-in-regexp "org" (re &optional nlines visually))
(declare-function org-in-verbatim-emphasis "org" ())
(declare-function org-inside-LaTeX-fragment-p "org" ())
(declare-function org-inside-latex-macro-p "org" ())
(declare-function org-mark-ring-push "org" (&optional pos buffer))
(declare-function org-show-context "org" (&optional key))
-(declare-function org-trim "org" (s &optional keep-lead))
(declare-function outline-next-heading "outline")
(defvar electric-indent-mode)
diff --git a/lisp/org-goto.el b/lisp/org-goto.el
index a223f58..1c265cf 100644
--- a/lisp/org-goto.el
+++ b/lisp/org-goto.el
@@ -23,14 +23,12 @@
;;; Code:
(require 'org-macs)
+(require 'org-compat)
(declare-function org-at-heading-p "org" (&optional ignored))
(declare-function org-beginning-of-line "org" (&optional n))
(declare-function org-defkey "org" (keymap key def))
-(declare-function org-fit-window-to-buffer "org" (&optional window max-height min-height shrink-only))
-(declare-function org-invisible-p "org" (&optional pos))
(declare-function org-mark-ring-push "org" (&optional pos buffer))
-(declare-function org-no-popups "org" (&rest body))
(declare-function org-overview "org" ())
(declare-function org-refile-check-position "org" (refile-pointer))
(declare-function org-refile-get-location "org" (&optional prompt default-buffer new-nodes))
diff --git a/lisp/org-list.el b/lisp/org-list.el
index e7b2b58..aa862b9 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -102,7 +102,6 @@
(declare-function org-at-heading-p "org" (&optional invisible-ok))
(declare-function org-back-to-heading "org" (&optional invisible-ok))
(declare-function org-before-first-heading-p "org" ())
-(declare-function org-combine-plists "org" (&rest plists))
(declare-function org-current-level "org" ())
(declare-function org-element-at-point "org-element" ())
(declare-function org-element-context "org-element" (&optional element))
@@ -128,7 +127,6 @@
(declare-function org-fix-tags-on-the-fly "org" ())
(declare-function org-get-todo-state "org" ())
(declare-function org-in-block-p "org" (names))
-(declare-function org-in-regexp "org" (re &optional nlines visually))
(declare-function org-inlinetask-goto-beginning "org-inlinetask" ())
(declare-function org-inlinetask-goto-end "org-inlinetask" ())
(declare-function org-inlinetask-in-task-p "org-inlinetask" ())
@@ -138,16 +136,12 @@
(declare-function org-outline-level "org" ())
(declare-function org-previous-line-empty-p "org" ())
(declare-function org-reduced-level "org" (L))
-(declare-function org-remove-indentation "org" (code &optional n))
(declare-function org-set-tags "org" (tags))
(declare-function org-show-subtree "org" ())
(declare-function org-sort-remove-invisible "org" (S))
(declare-function org-time-string-to-seconds "org" (s))
(declare-function org-timer-hms-to-secs "org-timer" (hms))
(declare-function org-timer-item "org-timer" (&optional arg))
-(declare-function org-trim "org" (s &optional keep-lead))
-(declare-function org-uniquify "org" (list))
-(declare-function org-invisible-p "org" (&optional pos))
(declare-function outline-next-heading "outline" ())
(declare-function outline-previous-heading "outline" ())
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index a148b56..9e0acd1 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -31,8 +31,9 @@
;;; Code:
-(declare-function format-spec "format-spec" (format specification))
-(declare-function org-string-collate-lessp "org-compat" (s1 s2 &rest _))
+(require 'format-spec)
+
+(declare-function org-string-collate-lessp "org-compat" (s1 s2 &optional locale ignore-case))
(defvar org-ts-regexp0)
diff --git a/lisp/org-src.el b/lisp/org-src.el
index cff8a49..e34e5a4 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -37,8 +37,6 @@
(require 'ob-keys)
(require 'ob-comint)
-(declare-function org-base-buffer "org" (buffer))
-(declare-function org-do-remove-indentation "org" (&optional n))
(declare-function org-element-at-point "org-element" ())
(declare-function org-element-class "org-element" (datum &optional parent))
(declare-function org-element-context "org-element" (&optional element))
@@ -48,8 +46,6 @@
(declare-function org-element-type "org-element" (element))
(declare-function org-footnote-goto-definition "org-footnote"
(label &optional location))
-(declare-function org-switch-to-buffer-other-window "org" (&rest args))
-(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-inhibit-startup)