Sync with Org 8.2.8.

[gnu-emacs] / lisp / org / org-attach.el

diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 07307e68f6fda2cfb1a9401f12ca19c94c768c6f..bcf7ba736fd52be0e66a2983b00365f62966b252 100644 (file)
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -208,7 +208,9 @@ the directory and (if necessary) the corresponding ID will be created."
            (save-excursion
              (save-restriction
                (widen)
-               (goto-char org-entry-property-inherited-from)
+               (if (marker-position org-entry-property-inherited-from)
+                   (goto-char org-entry-property-inherited-from)
+                 (org-back-to-heading t))
                (let (org-attach-allow-inheritance)
                  (org-attach-dir create-if-not-exists-p)))))
       (org-attach-check-absolute-path attach-dir)