From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id YAATLX3XdWVuIgAAauVa8A:P1 (envelope-from ) for ; Sun, 10 Dec 2023 16:21:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YAATLX3XdWVuIgAAauVa8A (envelope-from ) for ; Sun, 10 Dec 2023 16:21:33 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=devnulllabs-io.20230601.gappssmtp.com header.s=20230601 header.b=KzDPmKMF; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1702221693; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=SN5x62v8toA91nyaZekghm6fjU8BM1bfIADH1r5sZbI=; b=SwrRoChByWBDTh5J2RWYn6xv99Rrj2OA6uE4l6fSRpaQqGaV1Vb0JveKClY8dIZ7Bayltg Zv/8+vfFrFU5Af/FvTPFgMAt+yLbUyyezSa2O60IbUXlxAwUmbmmMPQACjOJmwRCvZpt/R RsvRn226Pbk6hNvkfqVMz8CTlcUaSGcy1nuoDAkt37zrCnzHG8kmm1O35asK/1uiVwZ0oa W8+60F9al3pvgYhGxMumaWOJDcomfYLCwXDVzRrTv0j2g/L7+RuJCWGs+CyTzk7OcaOoba oZPYCETpiJsOEpC9dZeU7xnNexA4CWOxf4xak4rIoNA8kaq1xCuIF1Y2nax+Ew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=devnulllabs-io.20230601.gappssmtp.com header.s=20230601 header.b=KzDPmKMF; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702221693; a=rsa-sha256; cv=none; b=XWwB0oshRSEAi2XrrQWmYE2rwjxdyp3ZYXOLPVEioz7gS1uw0Wn2D8rnAfm9vp+URysH2i /na4iq8nB7KSHVXsquDVWk5KR6SFtHYuiuM07Mk2IL3JBefbYHkDLjJs1n3Laic6cQzeqr tOtJ1Qzav294UYJRBPs9srdrLRqjE87srhzi/LZ8E9lg1baK9sLgVKMt2S603bMnCnRXMZ u9YLhm4R7e7PUg+k0hXVAFJzTLPlc8Pd5TayYeo3Cu3JTgTgZ8PnEyWs59OZg49v5GJEW1 RBef/ezIFBlFuNpwQki/KlRQFVx40JKNlmatzuH7gdoFCAvAekobwzVlNP8rZg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 14B0E587B0 for ; Sun, 10 Dec 2023 16:21:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCLbt-0005lX-RO; Sun, 10 Dec 2023 10:20:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBJWD-0005bn-R4 for emacs-orgmode@gnu.org; Thu, 07 Dec 2023 13:54:45 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBJW7-0008O1-Bz for emacs-orgmode@gnu.org; Thu, 07 Dec 2023 13:54:39 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1d2eb06ab11so92165ad.1 for ; Thu, 07 Dec 2023 10:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=devnulllabs-io.20230601.gappssmtp.com; s=20230601; t=1701975270; x=1702580070; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SN5x62v8toA91nyaZekghm6fjU8BM1bfIADH1r5sZbI=; b=KzDPmKMFOvjt7lzZAIPvGJp2mRUpU8N/bAYMld8b2jPMq8gRkigKk9D6bBPHsL9KiP RQs0smQrSZl1KEnV+aBTbgwTAVnurufg/opwQyTfZqDvPYyrQbs3ha+jSElZSTvcv7CV tfdivhAM1zwcwR7f09xTQy+AVvZLUQsgPezcMb80WCYR38xSlV/6IaDYOWuwqaZT/9IW jKU+nYaDBnLvdszXXSyK9pt6YtUB+aI22TyMeemncIDineml9V044sGqDusYmFCjbYZR SQaSvqdx+wufZ0enEEGw16VdOeVfMQE/3xrpCHKWfaLRE+6dlokdqHVMycbHazitzTQM RgIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701975270; x=1702580070; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SN5x62v8toA91nyaZekghm6fjU8BM1bfIADH1r5sZbI=; b=v8V6d5Eo00Itnn94888BzQ3Fkx2sYRaoQBXL1FWIq7c81SJVPbjsfB57vWceKTVtDb 3PeIplyVLNj8hW+hce7AxrG55wxLuxr3T6hbM+GwklD2PpJcNK/GxQhJSxI3jy9tqSaK DtOQlOlymnd9WbSOwtDraQHkHdV84cfR6/ghl1y8JymjE017BMuweFa6jq7YExwt2iIv 7UrSAvjTznroE031b+Jo0cReY4a0br6dZUYDGv1eAp58TMV4XRDdYpCkYqHNjZpMHO6n nEHbYCWDZXt/tkvHEPVdD6zt1e+MFntTXgtvddHd+0tj6Tmu+dxkXme+aIPQjbRCRW6S VziA== X-Gm-Message-State: AOJu0YwyqjRjEdqPSjMA3ZgedJgd7Wsh40Al8+MMg0Gpz905Pq/v6rhV ecpyq5CLkNEJBGHOtVAYop8H6w== X-Google-Smtp-Source: AGHT+IEmtwawPFzQEs5EfARjGleHTeL0FpiyKaBY1ORR8kW9r14gdz0VLx9Yi0iLQmZWWPJvXftBMQ== X-Received: by 2002:a17:903:2309:b0:1d0:c7c6:91a6 with SMTP id d9-20020a170903230900b001d0c7c691a6mr3014634plh.112.1701975270463; Thu, 07 Dec 2023 10:54:30 -0800 (PST) Received: from localhost ([132.178.207.4]) by smtp.gmail.com with ESMTPSA id z4-20020a170902ee0400b001cfc44aac0fsm147601plb.111.2023.12.07.10.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 10:54:29 -0800 (PST) From: Kenny Ballou To: yantar92@gmail.com Cc: emacs-orgmode@gnu.org, nate@manicmind.earth, Kenny Ballou Subject: [PATCH] lisp/org-capture.el: use link ID's for %K Date: Thu, 7 Dec 2023 11:53:26 -0700 Message-ID: <20231207185326.7937-1-kb@devnulllabs.io> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87y2byx8ml.fsf@localhost> References: <87y2byx8ml.fsf@localhost> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=kb@devnulllabs.io; helo=mail-pl1-x62d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 10 Dec 2023 10:20:46 -0500 X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.31 X-Spam-Score: -6.31 X-Migadu-Queue-Id: 14B0E587B0 X-Migadu-Scanner: mx10.migadu.com X-TUID: BBJWm9Ga6FIq * 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 Signed-off-by: Kenny Ballou Link: https://list.orgmode.org/EF459D47-FCA4-4A18-AFC7-3E62159F186C@manicmind.earth/ TINYCHANGE --- etc/ORG-NEWS | 8 ++++++++ lisp/org-capture.el | 14 +++++++++----- 2 files changed, 17 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 +:PROPERTIES: +:ID: 6f1f4f77-2b16-4a4d-8c84-fb7ba5ddf1e5 +:END: + +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..08fe34979 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1675,11 +1675,15 @@ 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 org-id-link-to-org-use-id + (org-link-make-string + (format "id:%s" (org-id-get org-clock-marker)) + 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: 3b719399036f44cbaabf399b3254d6ab3ba462d9 -- 2.41.0