Apply fixes from downstream Emacs

Patch by Glen Morris

lisp/org-colview-xemacs.el

@@ -1200,7 +1200,7 @@ Don't set this, this is meant for dynamic scoping.")
 
 (defun org-columns-uncompile-format (cfmt)
   "Turn the compiled columns format back into a string representation."
-  (let ((rtn "") e s prop title op op-match width fmt printf)
+  (let ((rtn "") e s prop title op op-match width fmt printf fun)
     (while (setq e (pop cfmt))
       (setq prop (car e)
 	    title (nth 1 e)

lisp/org-colview.el

@@ -1015,7 +1015,7 @@ Don't set this, this is meant for dynamic scoping.")
 
 (defun org-columns-uncompile-format (cfmt)
   "Turn the compiled columns format back into a string representation."
-  (let ((rtn "") e s prop title op op-match width fmt printf)
+  (let ((rtn "") e s prop title op op-match width fmt printf fun)
     (while (setq e (pop cfmt))
       (setq prop (car e)
 	    title (nth 1 e)

lisp/org-compat.el

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

lisp/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."

lisp/org-exp.el

@@ -40,7 +40,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."

lisp/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

lisp/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

lisp/org.el

@@ -2958,7 +2958,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" ())