From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id TlgTN1MxAV9qaAAA0tVLHw (envelope-from ) for ; Sun, 05 Jul 2020 01:48:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IPyrMlMxAV+2BwAAB5/wlQ (envelope-from ) for ; Sun, 05 Jul 2020 01:48:03 +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 428DE9403EE for ; Sun, 5 Jul 2020 01:48:03 +0000 (UTC) Received: from localhost ([::1]:58350 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrtlB-0001VN-IB for larch@yhetil.org; Sat, 04 Jul 2020 21:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrtkq-0001V3-FF for emacs-orgmode@gnu.org; Sat, 04 Jul 2020 21:47:40 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:35360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrtko-00049E-Si for emacs-orgmode@gnu.org; Sat, 04 Jul 2020 21:47:40 -0400 Received: by mail-pl1-x641.google.com with SMTP id x9so317340plr.2 for ; Sat, 04 Jul 2020 18:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:sender:date:from:to:subject:in-reply-to:references :user-agent:reply-to:mime-version:content-transfer-encoding; bh=lxtAaAIAUDVgn8Oo78ThXE584mU5C9UdjkTgsDlYhkk=; b=YwTdy8BRyDj0k/7lHseDkd2xbSg8Yo277CKA/m0DLW1HbyKRhAVXMm1D55eIDYjX4/ 5RVGAqsPknFE7a6wW4zHnlV9HdpXRFwIOiwCI0tD+WeNmxt3hR7m4EsYYFf+jLNRHIDc n2F+YcnxygFNdN5wdsC/OhIghS0eTLd6kBEIPqq4cwQ4mHZc1bj3mPns5fboz3/3JI1b ScgQwmhaIDvT/4TOqZCnkoQMY+BHyF3gbybyw0QiYO1g8jqZ/Y5o6/GnIOvenN2vTtnR U0g6u2jb0WV8S+Z3nidNUJGnKdbT68h2YyRky/tah4gUMpTiZQwIZD257Oo6ie8tElRS unAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:sender:date:from:to:subject :in-reply-to:references:user-agent:reply-to:mime-version :content-transfer-encoding; bh=lxtAaAIAUDVgn8Oo78ThXE584mU5C9UdjkTgsDlYhkk=; b=hDmIwbd2Knvf9ll5DPqyhqKwo7rf2BrnNA/VilOuCj2R6yEzp2jMY3e3f/rdsvJkIe HFcQUU5y0QEe+Z0lpPCXLVbJaVzduKHGeC/+MPHQCF//v7wwwRXJgv9jNJQleJoRwfNS h8pYDiEA2dwXmoRRxDDYSMXqQwFYv/qpu+Rwzi1AkYsRzTuiFgQj656X8gY/qAA0YFtF HWKcGFSASl9o2KEaiEUeJMc154jlamrzbqMIqw1BxK0K5EAbuKaA07bCshyy8UpKkrgD CPYEOJILq5QJSr2TQYm19ooKTgcGiqDqBTxo0aR6qhsMjm9XjZPp7cGsarmDtX1C7Bo+ RXeg== X-Gm-Message-State: AOAM533EKfVDnqM4EPv55lDmayus9A5TEpCo2xA+7oiY4bf4TBMHFdNo n3eLSZ38skmbQMXpx2Tm9kLNOWhz X-Google-Smtp-Source: ABdhPJxj84LLpxLVk9DjS/YXrq61HvBqPl3yDV3jRWCutSnl4dxnskX4SyIrPZsyI8lhonMCA9vvrA== X-Received: by 2002:a17:90a:266f:: with SMTP id l102mr44407108pje.144.1593913657155; Sat, 04 Jul 2020 18:47:37 -0700 (PDT) Received: from michel.e6h.org (50-0-83-149.dsl.static.fusionbroadband.com. [50.0.83.149]) by smtp.gmail.com with ESMTPSA id o10sm5117564pjs.27.2020.07.04.18.47.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Jul 2020 18:47:36 -0700 (PDT) Message-ID: <5f013138.1c69fb81.ef94e.be10@mx.google.com> Date: Sat, 04 Jul 2020 18:47:35 -0700 From: Erik Hetzner To: emacs-orgmode@gnu.org Subject: Re: [PATCH] org-id: Fix behavior when `org-id-extra-values' is a symbol In-Reply-To: <5f00d93d.1c69fb81.1a947.7c71@mx.google.com> References: <5f00d93d.1c69fb81.1a947.7c71@mx.google.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/27.0.91 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: multipart/mixed; boundary="Multipart_Sat_Jul__4_18:47:35_2020-1" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::641; envelope-from=ehetzner@gmail.com; helo=mail-pl1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, MISSING_MIME_HB_SEP=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: , Reply-To: Erik Hetzner Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=gmail.com header.s=20161025 header.b=YwTdy8BR; dmarc=none; 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-Spam-Score: 2.49 X-TUID: azcM0wj6NW3O --Multipart_Sat_Jul__4_18:47:35_2020-1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sat, 04 Jul 2020 12:32:11 -0700, Erik Hetzner wrote: >=20 > * lisp/org-id.el (org-id-update-id-locations): When > `org-id-extra-values' is a symbol, it should be evaluated as a > variable. > > [=E2=80=A6] Sorry, got the variable name wrong in the description. That should be `org-id-extra-files'. See attached, fixed, patch. --Multipart_Sat_Jul__4_18:47:35_2020-1 Content-Type: text/plain; type=patch; name="0001-org-id-Fix-behavior-when-org-id-extra-files-is-a-sym.patch"; charset=US-ASCII Content-Disposition: attachment; filename="0001-org-id-Fix-behavior-when-org-id-extra-files-is-a-sym.patch" Content-Transfer-Encoding: 8bit >From a87a4b567f2cc86a2eb502fd40238f463ca83daa Mon Sep 17 00:00:00 2001 From: Erik Hetzner Date: Sat, 4 Jul 2020 12:12:00 -0700 Subject: [PATCH] org-id: Fix behavior when `org-id-extra-files' is a symbol * lisp/org-id.el (org-id-update-id-locations): When `org-id-extra-files' is a symbol, it should be evaluated as a variable. In 37a5020bb, `org-id-update-id-locations' was rewritten, and the functionality to allow the variable `org-id-extra-files' to be a symbol that references another variable was removed. This changes restores that functionality. --- lisp/org-id.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/org-id.el b/lisp/org-id.el index 9456b0629..387d8268b 100644 --- a/lisp/org-id.el +++ b/lisp/org-id.el @@ -495,7 +495,9 @@ When FILES is given, scan also these files." ;; Agenda files and all associated archives. (org-agenda-files t org-id-search-archives) ;; Explicit extra files. - (unless (symbolp org-id-extra-files) org-id-extra-files) + (if (symbolp org-id-extra-files) + (symbol-value org-id-extra-files) + org-id-extra-files) ;; All files known to have IDs. org-id-files ;; Additional files from function call. -- 2.27.0 --Multipart_Sat_Jul__4_18:47:35_2020-1--