summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-08-27 14:35:09 -0600
committerEric Schulte <schulte.eric@gmail.com>2010-08-27 14:45:48 -0600
commite3144785114d12981e0e3429c76b6f8f15c4b00f (patch)
tree39386dc09b46d72ba58f442208778930903de9a6
parent2a400ef016f7d658e7712fd2340aed291c1c61d5 (diff)
downloadorg-mode-e3144785114d12981e0e3429c76b6f8f15c4b00f.tar.gz
Fix some more Org `check-declare' issues.
* ob.el: Require org when compiling. (org-save-outline-visibility): Remove macro declaration. * ob-emacs-lisp.el: Require ob-comint when compiling, for macros. Remove unnecessary/macro declarations. * org-docview.el: Require doc-view when compiling. (doc-view-goto-page): Autoload rather than declaring. (doc-view-current-page): Remove macro declaration. * ob.el (tramp-compat-make-temp-file, org-edit-src-code) (org-entry-get, org-table-import): Fix declarations. (org-match-string-no-properties): Remove declaration. * ob-sh.el (org-babel-comint-in-buffer) (org-babel-comint-wait-for-output, org-babel-comint-buffer-livep) (org-babel-comint-with-output): Remove unnecessary declarations. * ob-R.el (orgtbl-to-tsv): Fix declaration. * org-list.el (org-entry-get): Fix declaration.
-rw-r--r--lisp/ob-R.el2
-rw-r--r--lisp/ob-emacs-lisp.el5
-rw-r--r--lisp/ob.el17
-rw-r--r--lisp/org-docview.el4
-rw-r--r--lisp/org-list.el3
5 files changed, 16 insertions, 15 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 25c220f..3dda4f7 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -33,7 +33,7 @@
(require 'ob-eval)
(eval-when-compile (require 'cl))
-(declare-function orgtbl-to-tsv "ob-table" (table params))
+(declare-function orgtbl-to-tsv "org-table" (table params))
(declare-function R "ext:essd-r" (&optional start-args))
(declare-function inferior-ess-send-input "ext:ess-inf" ())
diff --git a/lisp/ob-emacs-lisp.el b/lisp/ob-emacs-lisp.el
index a93abb4..efa5a67 100644
--- a/lisp/ob-emacs-lisp.el
+++ b/lisp/ob-emacs-lisp.el
@@ -28,15 +28,12 @@
;;; Code:
(require 'ob)
+(eval-when-compile (require 'ob-comint))
(defvar org-babel-default-header-args:emacs-lisp
'((:hlines . "yes") (:colnames . "no"))
"Default arguments for evaluating an emacs-lisp source block.")
-(declare-function org-babel-comint-with-output "ob-comint" (&rest body))
-(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer))
-(declare-function org-babel-comint-wait-for-output "ob-comint" (buffer))
-(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body))
(declare-function orgtbl-to-generic "org-table" (table params))
(defun org-babel-expand-body:emacs-lisp (body params &optional processed-params)
diff --git a/lisp/ob.el b/lisp/ob.el
index cc2e116..2ce069d 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -25,33 +25,36 @@
;;; Commentary:
;; See the online documentation for more information
-;;
+;;
;; http://orgmode.org/worg/org-contrib/babel/
;;; Code:
-(eval-when-compile (require 'cl))
+(eval-when-compile
+ (require 'cl)
+ (require 'org)) ; org-save-outline-visibility macro
(require 'org-macs)
(defvar org-babel-call-process-region-original)
(declare-function show-all "outline" ())
-(declare-function tramp-compat-make-temp-file "tramp" (filename &optional dir-flag))
+(declare-function tramp-compat-make-temp-file "tramp-compat"
+ (filename &optional dir-flag))
(declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
(declare-function tramp-file-name-user "tramp" (vec))
(declare-function tramp-file-name-host "tramp" (vec))
(declare-function org-icompleting-read "org" (&rest args))
-(declare-function org-edit-src-code "org" (context code edit-buffer-name))
+(declare-function org-edit-src-code "org-src"
+ (&optional context code edit-buffer-name))
(declare-function org-open-at-point "org" (&optional in-emacs reference-buffer))
(declare-function org-save-outline-visibility "org" (use-markers &rest body))
(declare-function org-narrow-to-subtree "org" ())
-(declare-function org-entry-get "org" (pom property &optional inherit))
+(declare-function org-entry-get "org" (pom property &optional inherit literal-nil))
(declare-function org-make-options-regexp "org" (kwds &optional extra))
-(declare-function org-match-string-no-properties "org" (num &optional string))
(declare-function org-do-remove-indentation "org" (&optional n))
(declare-function org-show-context "org" (&optional key))
(declare-function org-at-table-p "org" (&optional table-type))
(declare-function org-cycle "org" (&optional arg))
(declare-function org-uniquify "org" (list))
-(declare-function org-table-import "org" (file arg))
+(declare-function org-table-import "org-table" (file arg))
(declare-function org-add-hook "org-compat" (hook function &optional append local))
(declare-function org-table-align "org-table" ())
(declare-function org-table-end "org-table" (&optional table-type))
diff --git a/lisp/org-docview.el b/lisp/org-docview.el
index f1e465e..0e05937 100644
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@@ -45,9 +45,9 @@
(require 'org)
+(eval-when-compile (require 'doc-view)) ; doc-view-current-page macro
-(declare-function doc-view-goto-page "doc-view" (page))
-(declare-function doc-view-current-page "doc-view" (&optional win))
+(autoload 'doc-view-goto-page "doc-view")
(org-add-link-type "docview" 'org-docview-open)
(add-hook 'org-store-link-functions 'org-docview-store-link)
diff --git a/lisp/org-list.el b/lisp/org-list.el
index cdfd2c5..acd6d93 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -51,7 +51,8 @@
(declare-function org-get-indentation "org" (&optional line))
(declare-function org-timer-item "org-timer" (&optional arg))
(declare-function org-combine-plists "org" (&rest plists))
-(declare-function org-entry-get "org" (pom property &optional inherit))
+(declare-function org-entry-get "org"
+ (pom property &optional inherit literal-nil))
(declare-function org-narrow-to-subtree "org" ())
(declare-function org-show-subtree "org" ())