From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id cEJUF4xW8l+wFAAA0tVLHw (envelope-from ) for ; Sun, 03 Jan 2021 23:43:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id q3cME4xW8l9PdAAAbx9fmQ (envelope-from ) for ; Sun, 03 Jan 2021 23:43:08 +0000 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 890FD9403A4 for ; Sun, 3 Jan 2021 23:43:07 +0000 (UTC) Received: from localhost ([::1]:51752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwD1e-000783-4X for larch@yhetil.org; Sun, 03 Jan 2021 18:43:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwCV4-0004OE-M0 for emacs-orgmode@gnu.org; Sun, 03 Jan 2021 18:09:27 -0500 Received: from florness.com ([50.116.27.230]:42794) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwCV3-0002SZ-0o for emacs-orgmode@gnu.org; Sun, 03 Jan 2021 18:09:26 -0500 Received: by florness.com (Postfix, from userid 103) id 880876D8BA; Sun, 3 Jan 2021 16:09:22 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=florness.com; s=mail; t=1609715362; bh=KeBmG/V43RPgFGijjywxRDPdJPGcYWPnZi9XFwTvwdg=; h=From:To:Subject:Date; b=1EQhVd3c/U9alJK625IMk16YZeF84TbUxbUWxfpXFhpjVpiw24OAo00WshyJWdpuT c8DJn4hSKrqsM7OYOqwEY5u1Zn9qlU3xyLkcCdxNlpx76/sA3ykHms9fjfhzBvPyXH pUw3G3ElUqS77GGW6th0qgYBZBYachIQ3YUQgg6A= Received: from [127.0.0.1] (localhost [127.0.0.1]) by florness.com (Postfix) with ESMTPSA id 683D56D8BA for ; Sun, 3 Jan 2021 23:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=florness.com; s=mail; t=1609715359; bh=KeBmG/V43RPgFGijjywxRDPdJPGcYWPnZi9XFwTvwdg=; h=From:To:Subject:Date; b=zV24NozjG8e07+6Ihq/boQmwE/fKWIFf+YQrXx8Y5FPzemPytugOjKTmPK4UiBtKb 9VHcHbpHX/OIvnwi2IiKLJzSr87Zn3tHye2S62/Xupyv6RVdc15+gMXy2EW1Tia0Jh +V9SjstokYaWMRO/SUvnt1WCoG3c7gUazO8EH8Q4= From: David Florness To: emacs-orgmode@gnu.org Subject: [PATCH] org-contacts.el: Only use org-id-store-link if org-id is loaded Date: Sun, 03 Jan 2021 18:09:18 -0500 Message-ID: <874kjxpqht.fsf@florness.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Received-SPF: pass client-ip=50.116.27.230; envelope-from=david@florness.com; helo=florness.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 03 Jan 2021 18:42:40 -0500 X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.13 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=florness.com header.s=mail header.b=1EQhVd3c; dkim=pass header.d=florness.com header.s=mail header.b=zV24Nozj; dmarc=pass (policy=quarantine) header.from=florness.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 890FD9403A4 X-Spam-Score: -1.13 X-Migadu-Scanner: scn1.migadu.com X-TUID: XFNeKLsIPGCC --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Fixes bug introduced in 6b83c6e4e that made org-contacts-anniversaries error if org-id was not loaded. =2D-- Alternatively, we could autoload org-id-link-to-org-use-id. If you all would prefer this, let me know and I can send a v2 patch. 6b83c6e4e was found using git-blame. contrib/lisp/org-contacts.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/lisp/org-contacts.el b/contrib/lisp/org-contacts.el index 82881ecd0..7ad425519 100644 =2D-- a/contrib/lisp/org-contacts.el +++ b/contrib/lisp/org-contacts.el @@ -1166,7 +1166,7 @@ are effectively trimmed). If nil, all zero-length su= bstrings are retained." "Store the contact in `org-contacts-files' with a link." (when (and (eq major-mode 'org-mode) (member (buffer-file-name) (mapcar 'expand-file-name org-contacts-fi= les))) =2D (if org-id-link-to-org-use-id + (if (and (featurep 'org-id) org-id-link-to-org-use-id) (org-id-store-link) (let ((headline-str (substring-no-properties (org-get-heading t t t = t)))) (org-store-link-props =2D-=20 2.30.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFHBAEBCAAxFiEEwHk86n9BB8P+iE+GBgV2tzUrjeMFAl/yTp4THGRhdmlkQGZs b3JuZXNzLmNvbQAKCRAGBXa3NSuN4zS7CACuMY9Fy4RlFXZx16IuVHE/4rJa/vus VeyLqIZrqBLtHtXEVgYafCJ5NoFrYvEfOwPDdOjYHLcnMUgzA5q9ioFIMEnaTltm 9H6Qxde/Er2AJEzBfwRvyM1cecLQoFSepEwxezQOmrdCglkcoInJvSlWa+35S1V7 orAjfxUbm5vhdgtLSkem8t8vOuTUPSIqzspQLdaFQLJfsDhfCN1sPfUoYcjlwb6W xvTSN5xnQVMPbbej79hsH3AEvhlofccOk0/2zKE+N1W6djjOZM9isN/n0wV8UWm7 otC1dnnmpZy8e2GMTayxh0oPrmaDg39f56d5cAfIM/xZ/7oNl9+fY16M =pv2f -----END PGP SIGNATURE----- --=-=-=--