Merge branch 'maint'

doc/org-manual.org

@@ -7710,7 +7710,7 @@ a)}}} attach files in Dired buffers.
           (lambda ()
             (define-key dired-mode-map
               (kbd "C-c C-x a")
-              #'org-attach-dired-to-subtree))))
+              #'org-attach-dired-to-subtree)))
 #+end_src
 
 The following code shows how to bind the previous command with

lisp/org-attach.el

@@ -605,6 +605,7 @@ This function is called by `org-archive-hook'.  The option
 ;;  (lambda ()
 ;;    (define-key dired-mode-map (kbd "C-c C-x a") #'org-attach-dired-to-subtree))))
 
+;;;###autoload
 (defun org-attach-dired-to-subtree (files)
   "Attach FILES marked or current file in dired to subtree in other window.
 Takes the method given in `org-attach-method' for the attach action.