summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-02-03 12:05:49 -0500
committerKyle Meyer <kyle@kyleam.com>2019-02-03 12:05:49 -0500
commit2d88cfbc082deb1df706eb6661632e64ed2aed86 (patch)
tree6694b97d23a1ad9b36b55e8bd46cdf5da008e292
parentf05c00de28dd531efb594511e974d6a097c80f88 (diff)
parentc6d37c6ebda8a97bac8161a19a9cd94cd78c7673 (diff)
downloadorg-mode-2d88cfbc082deb1df706eb6661632e64ed2aed86.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org-manual.org2
-rw-r--r--lisp/org-attach.el1
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org
index e65e6ea..25d3156 100644
--- a/doc/org-manual.org
+++ b/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
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index d16782e..63b3840 100644
--- a/lisp/org-attach.el
+++ b/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.