From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id yKQDJh4vd2WKuwAAkFu2QA (envelope-from ) for ; Mon, 11 Dec 2023 16:47:42 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id AMlRIR4vd2UybAEAqHPOHw (envelope-from ) for ; Mon, 11 Dec 2023 16:47:42 +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="rwLmrgW/"; 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=1702309662; 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=dXMc7GMrh6lZa5tka1eH81TupcBRpJkWA3eYztLqNTk=; b=NtdOmYvklrv6eQrfpA1+SMAIoVL1aC2rNDJfIhLos+CNM2N5E87Vi/yN22s410eN2IWs0P sdFw9o+PiAG2EQW/xHUwJzw9fjVPyPyNU+xeDeAnxQ61jsfXO8eW7y+MQptfHISPyqZ4cu Zoizn7UYy8tbyy6K5xcDE/nni0mXOD7cgCRrZjUI/qEl+LGwHN/5FxLdMYH24ff2F14jQx ZnmbrJaV/LQhx0wEZHBo5Rs8CXZJwvpOAdvblUvEquGZ5631j5B/9NQy0oXJe8ZL5CcIRY v7Rqp/UyRl4K3zKP/WAO1U/3jhkP9BUgJbZUx9q4Lfp2IHIO7RDaqcca5jceOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702309662; a=rsa-sha256; cv=none; b=qiENru8eoeLYuqza4BfOAyPYB0BjJu8tnnNKTRH3IrmWWCpdDEauFM9ql3J9i9mllKYBaY FFQQeNVHU/wfal9z1SLbmMZa27SHw2rw/PtCMC3eIk8kTxydCP8heRYWYDtgpQKwH24lLt jRwejhmQA8EdGg9JMwaB4IBMWsh6G5Iia8q97obOMe3FW8FA8yplF4dqjO0AmMl3SCbmNo 3GXjrrn617V980gPUJ9sQ7sTQXYs6aZ1G6rKPhuaE2ncU4T4w+XaX10CTrhifE/uprI16E CtEfcG04kgDyTbhV8u0s7nd+2vImyl3bKviGst71a1pNdMzpc20I537HMuu0eQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=devnulllabs-io.20230601.gappssmtp.com header.s=20230601 header.b="rwLmrgW/"; 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 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 2677E5AAA3 for ; Mon, 11 Dec 2023 16:47:42 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCiUl-00081H-AB; Mon, 11 Dec 2023 10:46:59 -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 1rCiUX-00080C-EB for emacs-orgmode@gnu.org; Mon, 11 Dec 2023 10:46:49 -0500 Received: from mail-oo1-xc29.google.com ([2607:f8b0:4864:20::c29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rCiUV-0000Ty-BZ for emacs-orgmode@gnu.org; Mon, 11 Dec 2023 10:46:45 -0500 Received: by mail-oo1-xc29.google.com with SMTP id 006d021491bc7-590a2a963baso1511262eaf.2 for ; Mon, 11 Dec 2023 07:46:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=devnulllabs-io.20230601.gappssmtp.com; s=20230601; t=1702309597; x=1702914397; 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=dXMc7GMrh6lZa5tka1eH81TupcBRpJkWA3eYztLqNTk=; b=rwLmrgW/9C48dPkH0EQpeKiLsKKnIWDV3ezBajFx7Y3NJh08Hj50FXcW4j2HpY+p/C kzufMqtrfxbXNRtyCJzTM4oB8IdL13R5Rlz6tRHlL56DqEPk/XGqk8DKPeF6c21+roGm GP2lW0Lf4OX1m+ERJhUKt7ytaXIwZ58Oqu0uFHqG3kegF85raLG4vybcgwsvEkEZARLE C8LEDWt9fCipd/+G7zL/2ljkgQlS0kqHBZuPdrWQXGqrH0xuzB83aADOE2cY+RRwQpO/ dytrVP+afAUg5z18ki1KAL0ZkefKoa4NRAoHJ3iL53/JoKklZksux6ioy0cVNO5dkZVS 4r8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702309597; x=1702914397; 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=dXMc7GMrh6lZa5tka1eH81TupcBRpJkWA3eYztLqNTk=; b=K1tUDNQcptKTnfTWKvIaoKKLNy90luGF++lDzIg07SrIsvaLwf9GWAC7BhYCeNXuJT MfY30HvX3/Dfj5d6koofvQIvPmgARX91t7mM5WquA+TTmpjCawMwaPJ1m0YLrJG4OyqG Wl4DDQPqAvDMSG2Zs7hcaB+2A/f1usRSo8zM8djOcsT9P7eFpHxVR3fhl6NixyGy6rvx ioEqZc/K2yh1TcXcqZ8nj7jeiUAH3RbFcx80r2rhKMhEFCMTvaSQJHMH1BpndvA+yT7o h1EUPiF1gfc6OLYPLgOYgXBImh+6XaXe/S+hUL/CYKIx41fN8wxJ1exxWq1y0tFb1bFe QUHA== X-Gm-Message-State: AOJu0Yxl+nxpwgMmCxKx21sPGoQPGM5Q2bKay6K4d894eqvquhsHpulw jyCwgoYESFeXvRnEJVLopEnCd0/XnBMJ8FfvoNGolWOi X-Google-Smtp-Source: AGHT+IEAJLOrB9YD3uPTHTsY7V4yMb4UwPWU2tJtzjcIAt69RgDSFLOdTpvqHGmptfpuE8raKN8Www== X-Received: by 2002:a05:6358:a084:b0:170:5ca3:af41 with SMTP id u4-20020a056358a08400b001705ca3af41mr2888616rwn.1.1702309597183; Mon, 11 Dec 2023 07:46:37 -0800 (PST) Received: from localhost ([132.178.207.20]) by smtp.gmail.com with ESMTPSA id c22-20020a63da16000000b005c67a388836sm6431911pgh.62.2023.12.11.07.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 07:46:36 -0800 (PST) From: Kenny Ballou To: emacs-orgmode@gnu.org Cc: Kenny Ballou , Nathaniel W Griswold Subject: [PATCH] lisp/org-capture.el: use link ID's for %K Date: Mon, 11 Dec 2023 08:46:19 -0700 Message-ID: <20231211154619.23286-1-kb@devnulllabs.io> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87plzeqmgm.fsf@localhost> References: <87plzeqmgm.fsf@localhost> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::c29; envelope-from=kb@devnulllabs.io; helo=mail-oo1-xc29.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_XBL=0.375, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.69 X-Spam-Score: 0.69 X-Migadu-Queue-Id: 2677E5AAA3 X-Migadu-Scanner: mx11.migadu.com X-TUID: SCen5EeqxhVK * org-capture.el (org-capture-fill-template): fill %K values using link value from `org-store-link', which respects `org-id-link-to-use-id'. * 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 | 6 ++++++ lisp/org-capture.el | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 9328f333c..55ab2453c 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -539,6 +539,12 @@ 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 + +The capture template expansion element `%K' creates links using +`org-store-link', which respects the values of +`org-id-link-to-use-id'. + ** New features *** =ob-plantuml.el=: Support tikz file format output diff --git a/lisp/org-capture.el b/lisp/org-capture.el index e482f667f..ee86a3ee0 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1675,11 +1675,9 @@ 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) + (save-excursion + (org-with-point-at org-clock-marker + (substring-no-properties (org-store-link current-prefix-arg nil)))) "")) (v-f (or (org-capture-get :original-file-nondirectory) "")) (v-F (or (org-capture-get :original-file) "")) base-commit: 420ed4e0338d12e26c62d3666ca39e7cff323d05 -- 2.41.0