From: Glenn Morris <rgm@gnu.org>
Date: Wed, 18 Aug 2010 02:44:25 +0000 (-0700)
Subject: Fix some more Org `check-declare' issues.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~48^2~261
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eeb4145e4c212f0323a0b39c34ae6695cae6ff1b;p=emacs.git

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.
---

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 9ebd951608e..5b650492442 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-18  Glenn Morris  <rgm@gnu.org>
+
+	* 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.
+
 2010-08-17  Glenn Morris  <rgm@gnu.org>
 
 	* ob.el (tramp-compat-make-temp-file, org-edit-src-code)
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 92c3f36e2ed..2ec729f7dcd 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/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/org/ob.el b/lisp/org/ob.el
index 4aee07f26ab..4ae3e4f662c 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -29,7 +29,9 @@
 ;;   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)
@@ -40,10 +42,9 @@
 (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-src" 
+(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 literal-nil))
 (declare-function org-make-options-regexp "org" (kwds &optional extra))
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index cac13e6ddfc..0ef5df0fda6 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/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)