diff options
| author | Glenn Morris | 2008-11-06 04:39:33 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-11-06 04:39:33 +0000 |
| commit | 49ace7fb9044799a8ed657295cc01b2e280db2b9 (patch) | |
| tree | db5e39fda7dbc252fe070192ad1023f57fafbe1f | |
| parent | 3876cf5de7fa59f0b99780db58a3e12dac3bf940 (diff) | |
| download | emacs-49ace7fb9044799a8ed657295cc01b2e280db2b9.tar.gz emacs-49ace7fb9044799a8ed657295cc01b2e280db2b9.zip | |
(org-publish-attachment): Use copy-file rather than eshell/cp.
| -rw-r--r-- | lisp/org/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/org/org-publish.el | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 3422ad55ea0..113670c20de 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2008-11-06 Glenn Morris <rgm@gnu.org> | 1 | 2008-11-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * org-publish.el (eshell/cp): Autoload it rather than requiring things. | 3 | * org-publish.el (org-publish-attachment): Use copy-file rather than |
| 4 | eshell/cp. | ||
| 4 | 5 | ||
| 5 | 2008-11-04 Juanma Barranquero <lekktu@gmail.com> | 6 | 2008-11-04 Juanma Barranquero <lekktu@gmail.com> |
| 6 | 7 | ||
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index 2bf0d4283a8..41d72878969 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el | |||
| @@ -526,14 +526,12 @@ See `org-publish-org-to' to the list of arguments." | |||
| 526 | See `org-publish-org-to' to the list of arguments." | 526 | See `org-publish-org-to' to the list of arguments." |
| 527 | (org-publish-org-to "html" plist filename pub-dir)) | 527 | (org-publish-org-to "html" plist filename pub-dir)) |
| 528 | 528 | ||
| 529 | (autoload 'eshell/cp "em-unix") ; why the eshell version? | ||
| 530 | |||
| 531 | (defun org-publish-attachment (plist filename pub-dir) | 529 | (defun org-publish-attachment (plist filename pub-dir) |
| 532 | "Publish a file with no transformation of any kind. | 530 | "Publish a file with no transformation of any kind. |
| 533 | See `org-publish-org-to' to the list of arguments." | 531 | See `org-publish-org-to' to the list of arguments." |
| 534 | (unless (file-directory-p pub-dir) | 532 | (unless (file-directory-p pub-dir) |
| 535 | (make-directory pub-dir t)) | 533 | (make-directory pub-dir t)) |
| 536 | (eshell/cp filename pub-dir)) | 534 | (copy-file filename pub-dir)) |
| 537 | 535 | ||
| 538 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 536 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 539 | ;;; Publishing files, sets of files, and indices | 537 | ;;; Publishing files, sets of files, and indices |