[Emacs-diffs] emacs/lisp/org ChangeLog org-compat.el org-exp-...

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/09/30 02:33:08

Modified files:
        lisp/org       : ChangeLog org-compat.el org-exp-blocks.el 
                         org-exp.el org-protocol.el org-table.el org.el 

Log message:
        Fix declarations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/ChangeLog?cvsroot=emacs&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-compat.el?cvsroot=emacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-exp-blocks.el?cvsroot=emacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-exp.el?cvsroot=emacs&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-protocol.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org-table.el?cvsroot=emacs&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/org/org.el?cvsroot=emacs&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- ChangeLog   29 Sep 2009 02:19:06 -0000      1.87
+++ ChangeLog   30 Sep 2009 02:33:07 -0000      1.88
@@ -1,3 +1,15 @@
+2009-09-30  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * org-agenda.el (org-agenda-restore-windows-after-quit):

Index: org-compat.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-compat.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- org-compat.el       2 Sep 2009 12:59:54 -0000       1.25
+++ org-compat.el       30 Sep 2009 02:33:07 -0000      1.26
@@ -37,7 +37,7 @@
 (require 'org-macs)
 
 (declare-function find-library-name "find-func"  (library))
-(declare-function w32-focus-frame   "w32-win" (frame))
+(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

Index: org-exp-blocks.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-exp-blocks.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- org-exp-blocks.el   17 Sep 2009 23:49:15 -0000      1.4
+++ org-exp-blocks.el   30 Sep 2009 02:33:07 -0000      1.5
@@ -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."

Index: org-exp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-exp.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- org-exp.el  2 Sep 2009 12:59:54 -0000       1.32
+++ org-exp.el  30 Sep 2009 02:33:07 -0000      1.33
@@ -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."

Index: org-protocol.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-protocol.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- org-protocol.el     17 Sep 2009 23:49:15 -0000      1.6
+++ org-protocol.el     30 Sep 2009 02:33:07 -0000      1.7
@@ -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

Index: org-table.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org-table.el,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- org-table.el        23 Sep 2009 23:55:27 -0000      1.31
+++ org-table.el        30 Sep 2009 02:33:07 -0000      1.32
@@ -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

Index: org.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/org/org.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- org.el      23 Sep 2009 23:55:27 -0000      1.52
+++ org.el      30 Sep 2009 02:33:08 -0000      1.53
@@ -2935,7 +2935,7 @@
 (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" ())