[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] lisp/org-capture.el: use link ID's for %K

From: Kenny Ballou
Subject: Re: [PATCH] lisp/org-capture.el: use link ID's for %K
Date: Sat, 09 Dec 2023 15:53:02 -0700
User-agent: mu4e 1.10.8; emacs 30.0.50

On 2023-12-08 19:01 GMT, Ihor Radchenko wrote:
> Kenny Ballou <kb@devnulllabs.io> writes:
>> I'm currently struggling through modifying it to work with
>> `org-store-link'.  Something, save-excursion -> org-clock-goto ->
>> org-store-link -> org-insert-link is what I'm trying for now, but that's
>> not quite working.  I'll come back to this in a few hours.
> The last step is unnecessary. You may just examine `org-stored-links'
> (documented in the docstring of `org-store-link') or
> `org-store-link-plist' (undocumented, but containing more info and also
> used by `org-capture-fill-template').

I ended up using `org-store-link-plist'.  For some reason that I don't
understand, the `save-excursion' -> `org-store-link' was not updating
`org-stored-links'.  Similarly, I had to use `save-window-excursion' or
the `org-clock-goto' would really break things.

If there's a better approach for getting the link, I'm all ears.

>From e618508cdfbf899b93d5081aeec3eda18d5bd306 Mon Sep 17 00:00:00 2001
From: Kenny Ballou <kb@devnulllabs.io>
Date: Thu, 7 Dec 2023 10:29:46 -0700
Subject: [PATCH] lisp/org-capture.el: use link ID's for %K

* org-capture.el (org-capture-fill-template): fill %K values using org
ID's if `org-id-link-to-org-use-id' is non-nil.
* doc/ORG-NEWS: (Template variable expansion %K) Document new behavior.

Reported-by: Nathaniel W Griswold <nate@manicmind.earth>
Signed-off-by: Kenny Ballou <kb@devnulllabs.io>

 etc/ORG-NEWS        |  8 ++++++++
 lisp/org-capture.el | 16 +++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 59c45b2aa..924ce43cc 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -539,6 +539,14 @@ Currently implemented options are:
   tasks this technically violates the iCalendar spec, but some
   iCalendar programs support this usage.
+*** Capture template expansion now supports ID links
+:ID:       6f1f4f77-2b16-4a4d-8c84-fb7ba5ddf1e5
+The capture template expansion element `%K' now creates links using
+the `ID' property of the currently clocked task if
+`org-id-link-to-use-org-id' is non-nil.
 ** New features
 *** =ob-plantuml.el=: Support tikz file format output
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index e482f667f..5bb65de53 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1675,11 +1675,17 @@ Expansion occurs in a temporary Org mode buffer."
                  (org-no-properties org-clock-heading)
         (v-K (if (marker-buffer org-clock-marker)
-                 (org-link-make-string
-                  (format "%s::*%s"
-                          (buffer-file-name (marker-buffer org-clock-marker))
-                          v-k)
-                  v-k)
+                  (if (and (org-clock-is-active) org-id-link-to-org-use-id)
+                      (save-window-excursion
+                        (org-clock-goto)
+                        (org-store-link nil)
+                        (let ((link (plist-get org-store-link-plist :link)))
+                          (org-link-make-string link v-k)))
+                   (org-link-make-string
+                    (format "%s::*%s"
+                            (buffer-file-name (marker-buffer org-clock-marker))
+                            v-k)
+                    v-k))
         (v-f (or (org-capture-get :original-file-nondirectory) ""))
         (v-F (or (org-capture-get :original-file) ""))

base-commit: 282c0fb6d1d2e6289a5b535a7ee9888f845b760b


reply via email to

[Prev in Thread] Current Thread [Next in Thread]