emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: David Florness <david@florness.com>
To: emacs-orgmode@gnu.org
Cc: Stefan Monnier <monnier@iro.umontreal.ca>
Subject: [PATCH v2] org-contacts.el: Only use org-id-store-link if org-id is loaded
Date: Mon, 04 Jan 2021 22:09:10 -0500	[thread overview]
Message-ID: <87eej0dqqx.fsf@florness.com> (raw)
In-Reply-To: <874kjxpqht.fsf@florness.com>

[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]

Fixes bug introduced in 6b83c6e4e that made org-contacts-anniversaries
error if org-id was not loaded.
---
v1 -> v2: Stefan Monnier made a good suggestion to use bound-and-true-p
instead here: https://lists.gnu.org/r/emacs-devel/2021-01/msg00257.html

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 v3 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..3df1b52dd 100644
--- a/contrib/lisp/org-contacts.el
+++ b/contrib/lisp/org-contacts.el
@@ -1166,7 +1166,7 @@ are effectively trimmed).  If nil, all zero-length substrings 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-files)))
-    (if org-id-link-to-org-use-id
+    (if (bound-and-true-p 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
-- 
2.30.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

  parent reply	other threads:[~2021-01-05  3:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-03 23:09 [PATCH] " David Florness
2021-01-04  3:44 ` miles christopher
2021-01-04  4:15   ` David Florness
2021-01-04 17:33     ` miles christopher
2021-01-04 18:13       ` David Florness
2021-01-04 18:21         ` David Florness
2021-01-05  3:09 ` David Florness [this message]
2021-01-05  3:56   ` [PATCH v2] " Kyle Meyer
2021-01-05  4:20     ` [PATCH] org-contacts.el: Use `bound-and-true-p' to check (unbound) var David Florness
2021-01-05  5:06       ` Kyle Meyer
2021-01-05 11:33       ` miles christopher
2021-04-25  3:41         ` Timothy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eej0dqqx.fsf@florness.com \
    --to=david@florness.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).