org-download

commit 9a3b3828d4d56a36419dc57b75249ed1a09205cf
parent 12a201a03ce50f1e161689cf672646a63ee8bd3a
Author: Oleh Krehel <ohwoeowho@gmail.com>
Date:   Sat,  4 Jan 2014 15:12:50 +0100

org-download.el (org-download-image): simplify attachment machinery

Diffstat:
M
org-download.el
 | 
10
+++-------

1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/org-download.el b/org-download.el
@@ -243,19 +243,15 @@ The screenshot tool is determined by `org-download-screenshot-method'."
   (interactive "sUrl: ")
   (let ((filename
          (if (eq org-download-method 'attach)
-             (let (org-download-image-dir
+             (let ((org-download-image-dir (progn (require 'org-attach)
+                                                  (org-attach-dir t)))
                    org-download-heading-lvl)
                (org-download--fullname link))
            (org-download--fullname link))))
     (when (image-type-from-file-name filename)
       (org-download--image link filename)
       (when (eq org-download-method 'attach)
-        (require 'org-attach)
-        (org-attach-attach filename nil 'mv)
-        (let* ((attach-dir (org-attach-dir t)))
-          (setq filename
-                (expand-file-name
-                 (file-name-nondirectory filename) attach-dir))))
+        (org-attach-attach filename nil 'none))
       (if (looking-back "^[ \t]+")
           (delete-region (match-beginning 0) (match-end 0))
         (newline))