Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-07-14 10:40:47 +02:00
commit e59718e9c3
1 changed files with 3 additions and 2 deletions

View File

@ -1611,9 +1611,10 @@ The template may still contain \"%?\" for cursor positioning."
""))
(v-K (if (marker-buffer org-clock-marker)
(org-make-link-string
(format "%s::%s"
(format "%s::*%s"
(buffer-file-name (marker-buffer org-clock-marker))
(org-no-properties org-clock-heading)))
v-k)
v-k)
""))
(v-f (or (org-capture-get :original-file-nondirectory) ""))
(v-F (or (org-capture-get :original-file) ""))