From a49ac98f3f697d4dda416d08a71bd38273193fbf Mon Sep 17 00:00:00 2001 From: Marco Wahl Date: Wed, 15 Nov 2017 12:21:18 +0100 Subject: [PATCH] org-attach: Refactor. Replace self made with available function. * lisp/org-attach.el (org-attach-dired-marked-files-or-file-at-cursor-in-dired) (org-attach-dired-marked-files-in-dired): Removed. Use `dired-get-marked-files' instead. --- lisp/org-attach.el | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 8973dde48..87093679c 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -599,27 +599,12 @@ METHOD may be `cp', `mv', `ln', `lns' or `url' default taken from (setq method (or method org-attach-method)) (mapc (lambda (file) (org-attach-attach file nil method)) files)) -(defun org-attach-dired-marked-files-in-dired () - "Return list of marked files in dired." - (cl-assert (eq 'dired-mode major-mode)) - (delq nil - (mapcar - (lambda (f) (if (file-directory-p f) nil f)) ;; don't attach directories - (nreverse (dired-map-over-marks (dired-get-filename) nil))))) - -(defun org-attach-dired-marked-files-or-file-at-cursor-in-dired () - "Return list of marked files in dired or file at cursor as one -element list. Else return nil." - (cl-assert (eq 'dired-mode major-mode)) - (or (org-attach-dired-marked-files-in-dired) - (list (dired-get-filename 'no-dir t)))) - (defun org-attach-dired-attach-to-next-best-subtree (files) "Attach FILES marked or current file in dired to subtree in other window. Precondition: Point must be in a dired buffer. Idea taken from `gnus-dired-attach'." (interactive - (list (org-attach-dired-marked-files-or-file-at-cursor-in-dired))) + (list (dired-get-marked-files))) (unless (eq major-mode 'dired-mode) (user-error "This command must be triggered in a dired buffer.")) (let ((start-win (selected-window)) -- 2.11.4.GIT