From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mCDZIjjed2XkCAAAkFu2QA (envelope-from ) for ; Tue, 12 Dec 2023 05:14:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id 2FfzHTjed2UABwEA62LTzQ (envelope-from ) for ; Tue, 12 Dec 2023 05:14:48 +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=ptfBtqlV; 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=1702354488; 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=fmfXEso/OcpR2swr94wrmXqzEsStApwNZHZQ9dAshXk=; b=cHVpFdLpCtL2mxJDMmCy2g/KZfzfIU5FswIZQp4GRENobcEuWgcbK8MDsk0/SmDuaIBnoF 6xUcceHi3ABDLJ8UEOiGASAItEoGldt1icWIHYLRDcizo8zxtaz2y9eKQ572u7s0b0l9ya EL8NnIgwo7FuYnNe/5KOtZ6OKFSed/aCxCbXiMaM11rsdJgS9GGWl8cTYBdUdKcG8NwGZ6 9UeNNouKr97Lvn+nDYBHYOcYZ0II745uYEcr+Ro6JxMG8DrIc1Kz6SvCBV+jipboP2iBnx WHNMk8CnCpdH9d4z6b1HCLznS4MzlwH7YrlETZGT91xYS2KTvOExQrhituj8qA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1702354488; a=rsa-sha256; cv=none; b=ItVYRB2E1EIBL0o3N4aWSYX2pzPcIdHfxFhwsaaeajDTCe6B664F8/6vnutvExKEtJ3I9e eIXG0VsXmRjI/BdT8+xrLFH1Td92zcJhXbxA5sRPe5Ea+k6Em+WrCw1c4yKP3VN42UpFun T5zXK1BaEpgUymr8hp5Y4Gb1cnMFPzZJE6BHeGFKGMchfQCkTZ4/fR8C6n4klTZmpDHqI5 bNg+5Lu3dZxV9xxavCHSm3bznChhXG/6YoMl7j3dXK5sbN16PDjt2ab89xFzkN9RTbDGaO Lcc5xVC02ei0mrqbXcp4BugMv1nGSFhA4I+lkENfS09wnOKoVOM1edxKdNWZCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=devnulllabs-io.20230601.gappssmtp.com header.s=20230601 header.b=ptfBtqlV; 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 13E303A763 for ; Tue, 12 Dec 2023 05:14:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCu9J-0006RF-RL; Mon, 11 Dec 2023 23:13:37 -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 1rCu9I-0006Qg-8d for emacs-orgmode@gnu.org; Mon, 11 Dec 2023 23:13:36 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rCu9G-0006y7-Fb for emacs-orgmode@gnu.org; Mon, 11 Dec 2023 23:13:36 -0500 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-286f8ee27aeso5434505a91.3 for ; Mon, 11 Dec 2023 20:13:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=devnulllabs-io.20230601.gappssmtp.com; s=20230601; t=1702354413; x=1702959213; 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=fmfXEso/OcpR2swr94wrmXqzEsStApwNZHZQ9dAshXk=; b=ptfBtqlVmQoJSIyPAceHU8pnHd6QZK9Mr/PmwXFDsKtAjP0lp1e8WuxbX8GSLT44AL B9qC5bX8h4pwN5qcGQzVZ8noGlxNKm9XVNcoZfZTNQ3O8VIl+SIizPeQgtlZVBrvP9+2 Gm4k0pwuYMfVwYxdEFz+Z5mImNd3A9x+CSoujp++ja3YwEthlfFLq9gBFusrfPc6xgyV 6Fw4m80d12uRKOjpnhRAwOWv0bxxJ6A/jB2Kb2NYQ1Al9SxJ2bEUIos1JpdVsKsdnzoe HCw/UlOdbUDW9n0P5qyv85bZ2nrHC1pshdDAGcPhu7jMjpu2Lw7kEDjIsFhFgIIK9RQ3 UuSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702354413; x=1702959213; 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=fmfXEso/OcpR2swr94wrmXqzEsStApwNZHZQ9dAshXk=; b=Vp3RwNPs2iWfFeWL4t0m+y2z4G8RIwP26cUovoRXK0Lui8BIVdhbQT4IFc4BTawNIK 1O5xAREvg5GaAJvfRgZNcMjk0Cv1e0QqYpcTWcZWa2Rm4vkUXBeVBZoIaT5k7Ech+mw8 Ot/zBZYT/s1olSVIfRZJKySdWIUaIL7pN5I+UZBS+3uVR6ZQ48AqFaGuFugazKWuJac9 D7NuUsEyy+Ua4qP0BNl5lEHYBtZXggUULygujPzvVRCG7mmzIPq18ABSvGySS5qdTnWc FyEUOtUl7S6aQJgTItQnNrmoVRdmekvI2idGTpnGkxFVCdocpkI1zDf7Yw8Vijm/j1CB vqHA== X-Gm-Message-State: AOJu0YwzPioHDyCMH8ls5r54OQ5HpwL7kel0i3bSZohD7AdVBCVxRgAP 7OR8BXLc2n7a7mxq6oIY4TYFHA== X-Google-Smtp-Source: AGHT+IFIuPVeUxIISEOqAHjOOccpTcmo2R0XU4OXWQFiDviQkHhM0oncTlzN7geNFPOCRCNLGZ6c0Q== X-Received: by 2002:a17:90b:90a:b0:28a:c07e:1074 with SMTP id bo10-20020a17090b090a00b0028ac07e1074mr240479pjb.77.1702354412834; Mon, 11 Dec 2023 20:13:32 -0800 (PST) Received: from localhost (67-60-133-188.cpe.sparklight.net. [67.60.133.188]) by smtp.gmail.com with ESMTPSA id k9-20020a170902c40900b001bc676df6a9sm7480772plk.132.2023.12.11.20.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 20:13:32 -0800 (PST) From: Kenny Ballou To: yantar92@posteo.net Cc: emacs-orgmode@gnu.org, yantar92@gmail.com, Kenny Ballou , Nathaniel W Griswold Subject: [PATCH] lisp/org-capture.el: use `org-store-link' for %K values Date: Mon, 11 Dec 2023 21:13:05 -0700 Message-ID: <20231212041305.26537-1-kb@devnulllabs.io> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87o7ew8m6f.fsf@devnulllabs.io> References: <87o7ew8m6f.fsf@devnulllabs.io> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=kb@devnulllabs.io; helo=mail-pj1-x1031.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-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.61 X-Spam-Score: -0.61 X-Migadu-Queue-Id: 13E303A763 X-Migadu-Scanner: mx11.migadu.com X-TUID: GQ8vZU47CC69 * 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 | 5 +++++ lisp/org-capture.el | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 9328f333c..9858df045 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -539,6 +539,11 @@ 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..73ea9d1df 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1675,11 +1675,8 @@ 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) + (org-with-point-at org-clock-marker + (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