aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-10-24 15:50:28 +0000
committerDan Nicolaescu2007-10-24 15:50:28 +0000
commit5656d1bfaf6aff3a1d0b783460f0b304de0be900 (patch)
tree8f30187cd3c131e968a5e558512349de13ab685b
parentd1886efb125ef22ad2c88c6fa60b722d19884243 (diff)
downloademacs-5656d1bfaf6aff3a1d0b783460f0b304de0be900.tar.gz
emacs-5656d1bfaf6aff3a1d0b783460f0b304de0be900.zip
(org-publish-attachment): Re-install
accidentally deleted change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/textmodes/org-publish.el7
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 @@
12007-10-24 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * textmodes/org-publish.el (org-publish-attachment): Re-install
4 accidentally deleted change.
5
12007-10-24 Stefan Monnier <monnier@iro.umontreal.ca> 62007-10-24 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * term/iris-ansi.el (iris-function-map): Move init into declaration. 8 * 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."
464PLIST is the property list for the given project. 464PLIST is the property list for the given project.
465FILENAME is the filename of the file to be published." 465FILENAME is the filename of the file to be published."
466 ;; make sure eshell/cp code is loaded 466 ;; make sure eshell/cp code is loaded
467 (require 'eshell) 467 (eval-and-compile
468 (require 'esh-maint) 468 (require 'eshell)
469 (require 'em-unix) 469 (require 'esh-maint)
470 (require 'em-unix))
470 (let ((destination (file-name-as-directory (plist-get plist :publishing-directory)))) 471 (let ((destination (file-name-as-directory (plist-get plist :publishing-directory))))
471 (eshell/cp filename destination))) 472 (eshell/cp filename destination)))
472 473