From 141a649e04c1bdd18a015c094f11ae3d4f61d099 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 18 Apr 2020 12:51:00 -0400 Subject: [PATCH] Revert afca8f14a Fix #2932 --- modules/lang/org/autoload/contrib-dragndrop.el | 10 ---------- modules/lang/org/contrib/dragndrop.el | 3 ++- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/lang/org/autoload/contrib-dragndrop.el b/modules/lang/org/autoload/contrib-dragndrop.el index 1adc86278..618790cee 100644 --- a/modules/lang/org/autoload/contrib-dragndrop.el +++ b/modules/lang/org/autoload/contrib-dragndrop.el @@ -10,13 +10,3 @@ (rassq-delete-all '+org-dragndrop-download-dnd-fn (copy-alist dnd-protocol-alist)))) (dnd-handle-one-url nil action uri)))) - -;;;###autoload -(defun +org-dragndrop-image-fn (protocol link _description) - "Return the image associated with the current attachment." - (let ((file (expand-file-name link org-attach-id-dir))) - (when (and (file-exists-p file) (image-type-from-file-name file)) - (with-temp-buffer - (insert-file-contents file) - (goto-char (point-min)) - (buffer-substring-no-properties (point) (point-max)))))) diff --git a/modules/lang/org/contrib/dragndrop.el b/modules/lang/org/contrib/dragndrop.el index e845332aa..84e2671e1 100644 --- a/modules/lang/org/contrib/dragndrop.el +++ b/modules/lang/org/contrib/dragndrop.el @@ -17,7 +17,8 @@ (after! org ;; A shorter link to attachments (+org-def-link "download" org-attach-id-dir) - (org-link-set-parameters "download" :image-data-fun #'+org-dragndrop-image-fn)) + (setf (alist-get "download" org-link-abbrev-alist nil nil #'equal) + (abbreviate-file-name org-attach-id-dir))) :config (setq org-download-image-dir org-attach-id-dir org-download-link-format "[[download:%s]]\n"