(eshell/cp): Autoload it rather than requiring things.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 82de83a0fe56c813e021171ea111a5fc082bb32d..3422ad55ea0808f7ec6e26e712bfcfd8c7c33a75 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-06  Glenn Morris  <rgm@gnu.org>
+
+       * org-publish.el (eshell/cp): Autoload it rather than requiring things.
+
 2008-11-04  Juanma Barranquero  <lekktu@gmail.com>
 
        * org.el (org-columns-modify-value-for-display-function):

diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 2af71d3c0b2e4542afa6919a3cd5a54d3232c4bd..ba55cdda9d9d451ad7f646f7a89dca61556baa20 100644 (file)
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -526,14 +526,11 @@ See `org-publish-org-to' to the list of arguments."
 See `org-publish-org-to' to the list of arguments."
   (org-publish-org-to "html" plist filename pub-dir))
 
+(autoload eshell/cp "em-unix")         ; why the eshell version?
+
 (defun org-publish-attachment (plist filename pub-dir)
   "Publish a file with no transformation of any kind.
 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 'em-unix))
   (unless (file-directory-p pub-dir)
     (make-directory pub-dir t))
   (eshell/cp filename pub-dir))