[Emacs-diffs] /srv/bzr/emacs/trunk r101115: Fix some more Org `check-declare' issues.

[Glenn Morris]

------------------------------------------------------------
revno: 101115
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-08-17 19:44:25 -0700
message:
  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.
modified:
  lisp/org/ChangeLog
  lisp/org/ob-emacs-lisp.el
  lisp/org/ob.el
  lisp/org/org-docview.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2010-08-17 07:29:26 +0000
+++ b/lisp/org/ChangeLog        2010-08-18 02:44:25 +0000
@@ -1,3 +1,13 @@
+2010-08-18  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ob.el (tramp-compat-make-temp-file, org-edit-src-code)

=== modified file 'lisp/org/ob-emacs-lisp.el'
--- a/lisp/org/ob-emacs-lisp.el 2010-07-19 09:47:27 +0000
+++ b/lisp/org/ob-emacs-lisp.el 2010-08-18 02:44:25 +0000
@@ -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)

=== modified file 'lisp/org/ob.el'
--- a/lisp/org/ob.el    2010-08-17 07:29:26 +0000
+++ b/lisp/org/ob.el    2010-08-18 02:44:25 +0000
@@ -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))

=== modified file 'lisp/org/org-docview.el'
--- a/lisp/org/org-docview.el   2010-07-19 09:47:27 +0000
+++ b/lisp/org/org-docview.el   2010-08-18 02:44:25 +0000
@@ -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)