Implement changes from downstream Emacs.

These are changes that where made in the Emacs CVS.
The change in org-publish is not final, it is still being
discussed - however, the current change should make it possible
to compile and run the code with the latest CVS version of Emacs.

lisp/org-list.el

@@ -38,8 +38,8 @@
 
 (declare-function org-invisible-p "org" ())
 (declare-function org-on-heading-p "org" (&optional invisible-ok))
-(declare-function outline-next-heading "org" ())
-(declare-function outline-back-to-heading "org" (&optional invisible-ok))
+(declare-function outline-next-heading "outline" ())
+(declare-function outline-back-to-heading "outline" (&optional invisible-ok))
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
 (declare-function org-back-over-empty-lines "org" ())
 (declare-function org-skip-whitespace "org" ())

lisp/org-publish.el

@@ -537,7 +537,7 @@ See `org-publish-org-to' to the list of arguments."
   ;; make sure eshell/cp code is loaded
   (eval-and-compile
     (require 'eshell)
-    (require 'esh-maint)
+;    (require 'esh-maint)
     (require 'em-unix))
   (unless (file-directory-p pub-dir)
     (make-directory pub-dir t))

lisp/org-table.el

@@ -379,7 +379,7 @@ nil      When nil, the command tries to be smart and figure out the
          separator in the following way:
          - when each line contains a TAB, assume TAB-separated material
          - when each line contains a comme, assume CSV material
-         - else, assume one or more SPACE charcters as separator."
+         - else, assume one or more SPACE characters as separator."
   (interactive "rP")
   (let* ((beg (min beg0 end0))
 	 (end (max beg0 end0))

lisp/org.el

@@ -1970,7 +1970,7 @@ ellipses string, only part of the ellipses string will be shown."
 (defcustom org-columns-modify-value-for-display-function nil
   "Function that modifies values for display in column view.
 For example, it can be used to cut out a certain part from a time stamp.
-The function must take 2 argments:
+The function must take 2 arguments:
 
 column-title    The tite of the column (*not* the property name)
 value           The value that should be modified.