From 47571446b97c2be589f19c000ee93e1bc7a9d377 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 7 May 2020 15:59:26 -0400 Subject: [PATCH] Use org-download-dnd instead of inhouse dnd handler Possibly fixes #3056 --- modules/lang/org/autoload/contrib-dragndrop.el | 12 ------------ modules/lang/org/contrib/dragndrop.el | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 modules/lang/org/autoload/contrib-dragndrop.el diff --git a/modules/lang/org/autoload/contrib-dragndrop.el b/modules/lang/org/autoload/contrib-dragndrop.el deleted file mode 100644 index 618790cee..000000000 --- a/modules/lang/org/autoload/contrib-dragndrop.el +++ /dev/null @@ -1,12 +0,0 @@ -;;; lang/org/autoload/contrib-dragndrop.el -*- lexical-binding: t; -*- -;;;###if (featurep! +dragndrop) - -;;;###autoload -(defun +org-dragndrop-download-dnd-fn (uri action) - "Handle file links and base64 data uris." - (if (eq major-mode 'org-mode) - (+org/attach-file-and-insert-link uri) - (let ((dnd-protocol-alist - (rassq-delete-all '+org-dragndrop-download-dnd-fn - (copy-alist dnd-protocol-alist)))) - (dnd-handle-one-url nil action uri)))) diff --git a/modules/lang/org/contrib/dragndrop.el b/modules/lang/org/contrib/dragndrop.el index 8d7b54699..7b932ede1 100644 --- a/modules/lang/org/contrib/dragndrop.el +++ b/modules/lang/org/contrib/dragndrop.el @@ -10,7 +10,7 @@ :init ;; HACK We add these manually so that org-download is truly lazy-loaded (pushnew! dnd-protocol-alist - '("^\\(?:https?\\|ftp\\|file\\|nfs\\):" . +org-dragndrop-download-dnd-fn) + '("^\\(?:https?\\|ftp\\|file\\|nfs\\):" . org-download-dnd) '("^data:" . org-download-dnd-base64)) (advice-add #'org-download-enable :override #'ignore)