2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b32f670f91..fbb5d9f35b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * textmodes/org-publish.el (org-publish-attachment): Re-install
+        accidentally deleted change.
+
 2007-10-24  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * term/iris-ansi.el (iris-function-map): Move init into declaration.
diff --git a/lisp/textmodes/org-publish.el b/lisp/textmodes/org-publish.el
index 0eddd402812..26dc409e19c 100644
--- a/lisp/textmodes/org-publish.el
+++ b/lisp/textmodes/org-publish.el
@@ -464,9 +464,10 @@ FILENAME is the filename of the org file to be published."
 PLIST is the property list for the given project.
 FILENAME is the filename of the file to be published."
   ;; make sure eshell/cp code is loaded
-  (require 'eshell)
-  (require 'esh-maint)
-  (require 'em-unix)
+  (eval-and-compile 
+    (require 'eshell)
+    (require 'esh-maint)
+    (require 'em-unix))
   (let ((destination (file-name-as-directory (plist-get plist :publishing-directory))))
     (eshell/cp filename destination)))