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 sLBWEWDZAF+dRgAA0tVLHw (envelope-from ) for ; Sat, 04 Jul 2020 19:32:48 +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 mAQ4DWDZAF+fFgAAB5/wlQ (envelope-from ) for ; Sat, 04 Jul 2020 19:32:48 +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 805CD940656 for ; Sat, 4 Jul 2020 19:32:47 +0000 (UTC) Received: from localhost ([::1]:45542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrnu0-00085P-UI for larch@yhetil.org; Sat, 04 Jul 2020 15:32:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrntZ-00083q-D2 for emacs-orgmode@gnu.org; Sat, 04 Jul 2020 15:32:17 -0400 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:47067) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrntX-0006DH-MR for emacs-orgmode@gnu.org; Sat, 04 Jul 2020 15:32:17 -0400 Received: by mail-pl1-x630.google.com with SMTP id j7so446358plk.13 for ; Sat, 04 Jul 2020 12:32:15 -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:user-agent:reply-to :mime-version; bh=8eNgU8TPdIORvNq5d3zx1Dsp2PMS01I8aOLR9n15fts=; b=IThRt8xH482H2wvoLoZGgEQCgmSM0PaDDCEcj+eYD6lppCMfAVSJ3E6ruLeXAAO3rz YeSVUaFtmx5ZaEZtnxTbXIFpamN7gOkdRhRuTIENvlERXWn+2R6eHSF4o00PBqYKzoyF x3BtpYPw0pveHmPEZDgoTxUNV+OIAEZVX/chpK1kHyN48PAZj8E2dAFUHf4BUOxX/H66 HG2jiKkBe6iFBOb7kgpu7nVzqCVin09MTMOdjAbD4Ve4czYWg1bYsSYzisH2p1o4m9Yd ocCeCT6xximBl/Hg9ob5JOjWHmvLvtkqJJrhbvcLsK0lahFL5pyd1Km/C/G+3XxUxgsf eEpg== 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 :user-agent:reply-to:mime-version; bh=8eNgU8TPdIORvNq5d3zx1Dsp2PMS01I8aOLR9n15fts=; b=JlVqR576XK+EzrSk4MLfaIdGdrN9LwuDf+5RotDOdRVO56sDHFxU0kkof/wKn7p8XA bFa7KhVi7OUpFTIEL/roxinPiRE3BdHTiSTt2h+q7haA+B8OBaGSFH2lKN61/0J5pGeI u0IYp4Ui/7GR7x3A2J9oYD+55W6wPLUN+pnapcUrSKOTfuoi5Ocl5k42lctvEt9pHWib J/Z3k3ByDK1GNtdo70rtVd2+pPrArw52TurYU7zk8G8UATu5Ee44sT6sxxUB2XED2RTb NE6HyqzFtqLmjJgieRMmJQSEQbT8xZHHo3TVvSeOMMCT1Ar+nTRqmIQVurZu6fXyZOo0 Maog== X-Gm-Message-State: AOAM532XV8yG9g4vcP9QvLoUJUX4+ZvYXvT6CuJ/K3+7yCZlq+OXU8CM +LdV+oNf2ydvei82+w3Z+ZH/J7b1 X-Google-Smtp-Source: ABdhPJwNY7fMdCEpax+ijhdHi0dgHrflnO6c6kxjQVeXWU8UJaQw4mbcIkOP+TpJNTHjV2kMbGDz3w== X-Received: by 2002:a17:90b:1292:: with SMTP id fw18mr34325477pjb.3.1593891133822; Sat, 04 Jul 2020 12:32:13 -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 o23sm15928377pfd.126.2020.07.04.12.32.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Jul 2020 12:32:13 -0700 (PDT) Message-ID: <5f00d93d.1c69fb81.1a947.7c71@mx.google.com> Date: Sat, 04 Jul 2020 12:32:11 -0700 From: Erik Hetzner To: emacs-orgmode@gnu.org Subject: [PATCH] org-id: Fix behavior when `org-id-extra-values' is a symbol 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: text/plain; charset=US-ASCII Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=ehetzner@gmail.com; helo=mail-pl1-x630.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, 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 (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=IThRt8xH; 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: -0.01 X-TUID: wSkcSAsjfbHB * lisp/org-id.el (org-id-update-id-locations): When `org-id-extra-values' 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-values' to be a symbol that references another variable was removed. This change 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