Fix declarations.

7 files changed, 19 insertions, 7 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 8e0decf5347..8685c02b7a8 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-30  Glenn Morris  <rgm@gnu.org>
+
+	* org-compat.el (w32-focus-frame):
+	* org-exp-blocks.el (R):
+	* org-exp.el (htmlize-buffer):
+	* org-protocol.el (server-edit):
+	* org-table.el (org-format-org-table-html):
+	* org.el (org-indent-mode): Fix declarations.
+
+	* org-colview.el (org-columns-uncompile-format): Avoid assignment to
+	free variable `fun'.
+
 2009-09-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* org-agenda.el (org-agenda-restore-windows-after-quit):
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 2f4112ce354..876844ee7bc 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -36,8 +36,8 @@
 
 (require 'org-macs)
 
-(declare-function find-library-name "find-func"  (library))
-(declare-function w32-focus-frame   "w32-win" (frame))
+(declare-function find-library-name "find-func" (library))
+(declare-function w32-focus-frame "term/w32-win" (frame))
 
 (defconst org-xemacs-p (featurep 'xemacs)) ; not used by org.el itself
 (defconst org-format-transports-properties-p
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 5a55b563790..4dac201a30d 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -85,7 +85,7 @@
 (defvar asciip)
 
 (declare-function comint-send-input "comint" (&optional no-newline artificial))
-(declare-function R "ess" nil)
+(declare-function R "ext:ess" nil)
 
 (defun org-export-blocks-set (var value)
   "Set the value of `org-export-blocks' and install fontification."
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 3e12e6af10e..c03ff19dc20 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -39,7 +39,7 @@
 (declare-function org-agenda-skip "org-agenda" ())
 (declare-function org-infojs-options-inbuffer-template "org-jsinfo" ())
 (declare-function org-export-htmlize-region-for-paste "org-html" (beg end))
-(declare-function htmlize-buffer "htmlize" (&optional buffer))
+(declare-function htmlize-buffer "ext:htmlize" (&optional buffer))
 (autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t)
 (defgroup org-export nil
   "Options for exporting org-listings."
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index b32c1095743..2fa84041d39 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -125,7 +125,7 @@
 		  (&optional refresh))
 (declare-function org-publish-get-project-from-filename "org-publish"
 		  (filename &optional up))
-(declare-function server-edit "server" ())
+(declare-function server-edit "server" (&optional arg))
 
 
 (defgroup org-protocol nil
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index bf7d960a56a..30d662140d9 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -42,7 +42,7 @@
 
 (declare-function org-table-clean-before-export "org-exp"
 		  (lines &optional maybe-quoted))
-(declare-function org-format-org-table-html "org-exp" (lines &optional splice))
+(declare-function org-format-org-table-html "org-html" (lines &optional splice))
 (defvar orgtbl-mode) ; defined below
 (defvar orgtbl-mode-menu) ; defined when orgtbl mode get initialized
 (defvar org-export-html-table-tag) ; defined in org-exp.el
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 588faa21ac2..02edc04d191 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -2935,7 +2935,7 @@ Normal means, no org-mode-specific context."
 (declare-function org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item
 		  "org-agenda" (&optional end))
 (declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ())
-(declare-function org-indent-mode "org-indent" (arg))
+(declare-function org-indent-mode "org-indent" (&optional arg))
 (declare-function parse-time-string "parse-time" (string))
 (declare-function remember "remember" (&optional initial))
 (declare-function remember-buffer-desc "remember" ())