Merge branch 'maint'

This commit is contained in:
Bastien 2020-01-26 19:16:18 +01:00
commit f603039884
1 changed files with 2 additions and 2 deletions

View File

@ -492,7 +492,7 @@ METHOD may be `cp', `mv', `ln', `lns' or `url' default taken from
`org-attach-method'." `org-attach-method'."
(interactive (interactive
(list (list
(read-file-name "File to keep as an attachment:" (read-file-name "File to keep as an attachment: "
(or (progn (or (progn
(require 'dired-aux) (require 'dired-aux)
(dired-dwim-target-directory)) (dired-dwim-target-directory))
@ -525,7 +525,7 @@ METHOD may be `cp', `mv', `ln', `lns' or `url' default taken from
org-stored-links))) org-stored-links)))
(if visit-dir (if visit-dir
(dired attach-dir) (dired attach-dir)
(message "File %S is now an attachment." basename))))) (message "File %S is now an attachment" basename)))))
(defun org-attach-attach-cp () (defun org-attach-attach-cp ()
"Attach a file by copying it." "Attach a file by copying it."