From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2IBbD5pBqGJZvQAAbAwnHQ (envelope-from ) for ; Tue, 14 Jun 2022 10:06:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OAkZD5pBqGJZNwEAauVa8A (envelope-from ) for ; Tue, 14 Jun 2022 10:06:50 +0200 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 226D03EF03 for ; Tue, 14 Jun 2022 10:06:48 +0200 (CEST) Received: from localhost ([::1]:57314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o11ZT-0007Kz-4i for larch@yhetil.org; Tue, 14 Jun 2022 04:06:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o11Ui-0007K4-3R for emacs-orgmode@gnu.org; Tue, 14 Jun 2022 04:01:48 -0400 Received: from mail-oln040092068075.outbound.protection.outlook.com ([40.92.68.75]:37001 helo=EUR02-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o11Ub-00012M-7B for emacs-orgmode@gnu.org; Tue, 14 Jun 2022 04:01:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z7jmvjqC2cIJnNDiwc/f+7ITJb+JU0AUi+5aRoFH+HSJFcuaOi4eancv1ZRfhkZztOmj8eJhB0WDEVr1cXtlWHYFyvHi74UzeBwJllmk1NJe1qDLGcwMFpU59KUhft7g4KUDRD0OwoBJlki5gwpmdI0Kfld0BdXgIXok/ce+l/uRZKBDJ25XHHbFUYPo+sVpuFu5xZ7jdKBckmf1g1IWiYLTosTeL4cxSJWnEuq4+HquVQ6yte6Og+JO+pv/cP2ujjzDeQ/08R7u38omKELKFpTy8Rv0kY/91DI4F+/AYG1lLCxtfeHehZpAznuZotZjcr0zw/SLvR4J4p/odkdIVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UkV7w6mDBsoBKjSnD9Q2r1Q8uHiZ5sPIfY2EisJecuM=; b=FihT3WYsNVLF3CDzkB9z7FA9QGyc/ub/62cj/mZWy8kbUuFpFAB43XPcHTygdadxwoYQotaNMfp4YMWzQObv2i5cgCENHmhjJjdENhihJ040DDD821oAnP8CwUA7pAGrjBepft7dK0a/dkZfI4ss/y9cJ8AZclHXZkdTQUzZX7BEdETwmvNX2+gttg4lcHn8YdhaNRZrjkGVYmt9cqSLKMszotIqDp9kMARBl+3q9vIZ173XT27+hbAJqFB1Y1RXMjA9lGe2CM3F9t6bPmPUQONBB4FPfcQXTNigORsUHZBhI5GrP/VEj1meKEVh7tXi2XejOoSII/+xG58rP6B8NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UkV7w6mDBsoBKjSnD9Q2r1Q8uHiZ5sPIfY2EisJecuM=; b=ZmNXtU6YepDQVHat7Sn5UfIyFP+2JeTkM13L+S4ssc+/H2sIzwSTzzy9FMlRFVwxkhlfD6XGszCBm8mNreFK77jX10KJ4ZvNKU5szpd4H8sTxtkb3Y6yndREhmM5hISWcckDG3LoHISKwWOdcOZSFc6HqURfeWTOV2rPL21gYE4mmx8ZBGjCxh5IGTHKMmyZ78h/RDlJWAWX6Sx2y32USL8Jr98iuyghNA4vTsOA7cRzr6RigYGq+NWANBCPZTEb0J6QrZjh/ED3tmaX8RYCjJuiGHvfyjZ6nsdkCIXTgmGBIB4bAhWXSxyDKErhW5FHFDBZacwLTRMa79P1BHEq+w== Received: from DB6PR0601MB2087.eurprd06.prod.outlook.com (2603:10a6:4:4f::26) by AM6PR06MB4647.eurprd06.prod.outlook.com (2603:10a6:20b:64::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.20; Tue, 14 Jun 2022 08:01:37 +0000 Received: from DB6PR0601MB2087.eurprd06.prod.outlook.com ([fe80::cdbe:e542:a1b6:1a2]) by DB6PR0601MB2087.eurprd06.prod.outlook.com ([fe80::cdbe:e542:a1b6:1a2%2]) with mapi id 15.20.5332.022; Tue, 14 Jun 2022 08:01:37 +0000 References: <877d5nba1s.fsf@localhost> <87v8t3q4de.fsf@localhost> User-agent: mu4e 1.6.10; emacs 27.2 From: Ignacio Casso To: Ihor Radchenko Cc: emacs-orgmode@gnu.org, Max Nikulin , Tim Cross Subject: Re: [BUG] org-capture autoload bug? [9.5.2 (9.5.2-gfbff08 @ /home/ignacio/.emacs.d/elpa/org-9.5.2/)] Date: Tue, 14 Jun 2022 09:49:51 +0200 In-reply-to: <87v8t3q4de.fsf@localhost> Message-ID: Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [tLwEVna4e5ttOntBXMO8/rPQ5J2SLci3] X-ClientProxiedBy: PR3PR09CA0025.eurprd09.prod.outlook.com (2603:10a6:102:b7::30) To DB6PR0601MB2087.eurprd06.prod.outlook.com (2603:10a6:4:4f::26) X-Microsoft-Original-Message-ID: <877d5jk71f.fsf@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23d1730f-fe8f-47c9-87a9-08da4ddc1b57 X-MS-TrafficTypeDiagnostic: AM6PR06MB4647:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eTlUZeUrp09oF+XFknm1YMMH5KV2SRp/v8wAIFhY3lBkryM37YAoxh6Y5avZNf4Y5uOb87R7xPG3bIFGGArgyQXeY2BJ4tdvsjFbaLJT1t0ZRe2Onk7sJf7kJRB8pKIstX/lTGgKHumEHZUouCEfQKP0EOiagyBixkfUj8I9DO9TRnrJBueTDxOPLydsVGzZsfi8lTDgKCYQSXvTlhnHwzUwBbTcGPlVNojGBDIFgIEOgcI3lWhOjDtgk1wN9wPpUR7fuRRpMdGsN1HPYCP5oLpGTDrn6WsAVAXv+zRdAdUNBBVgHw+9n9t6j80INFIyZH2GbYsp341/Bogvo8vmPQRNS2qnHRbsAEUyNKa5MpzGVUuuEpE5ZYpYMEkAH61SLXJvs0cFo0y8XaSHq+wVua/hHmWndlFLEa4FEEqXTqcZiCQWmi+nLx6fYEjOuTpZ98W/bo7B1Tm0QqQTHThYoqITrrLZFCEsxGHWxV8A0aQLHzwLUWvJafqH3sKOBjIDdnTSI00iQDd4w8L5bBSOwGuTPpMqUWx37zLsESmJp2cL0R+SAR+Y7stGPqvalAFBVWqvyhUsY/ojI4Nx2xNTHn3RajKCZ+GjKMtvGw/4JTtjKq+rYobkAro3TOUm6bJt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CsrGX0q4XwzNMQSblojQzAvDXDHOyrauvYuDhGOpzlu9W/5kZ1thvUbBPJ9i?= =?us-ascii?Q?C+r9VTn45ImMeiyZcTIGH85fuP5nUQBNPsolkATN5juQNl7rFVyMbyW87qUU?= =?us-ascii?Q?mrUtAxom2p6dhCylwkU/LoXoy+zq/PR5MAefCpoDbztXLTIu3romGXiiaNsF?= =?us-ascii?Q?3SwiZB8kGdRNXyLbceV79PqVyrXq0N1ncRm1eo8WrRGXINBDSs3cwTIuwJsX?= =?us-ascii?Q?1TDUYPnxHTJys5qPdiRBHqmHXmmxZ232W1eqFkxKv0nWzsSsbLhqVaAX+nrf?= =?us-ascii?Q?+dVkgESAWHN0Xc7yGQ/kyXx0ax2eps+BvEOLzD2saw9W9ioQd1lGZQGfiLvl?= =?us-ascii?Q?pm8aBAn8tg+R//xTn538MhkwBD9ajWIfCGFr+hDssj8ThahVurFMLBTuhibs?= =?us-ascii?Q?3SkIuOZyjeZFm/lQ9ICOE+WEQD3j9oJu/hG4kWh4kxfNk4F2gADHWaS/Ty/T?= =?us-ascii?Q?bI7sPCs6OwwBQAkAaU4LwgaTPini9OhlQaFw3PG5BtGRg6tUXpT4YepFh8km?= =?us-ascii?Q?wYL8PiDmOncjR8DQ4nnmKlZSZOBX2S8fEWQtk2LABDQQi/5DIJ1+cLex4d8z?= =?us-ascii?Q?JKbkbLXG3TG+D1AButIY6IiVLUegWsTfOeYWB6bGZudQFF1X/87D/s7WfChv?= =?us-ascii?Q?nytS6PpLjH0o2CE1cgGgKpV6mJhSPDxoi/XEL/uow9sj3iPQWDz16MLRl6SF?= =?us-ascii?Q?fEqayt7gf40zPhFYY1HGjYvMm9y65gscT47Od1Y0k3+AGOEpHGSuFbUBIDdW?= =?us-ascii?Q?QbUiaXlIAqjXtRXRsNyJ12CswJO7aroz3t9Wr+zOUayAw4IHr/l5lwkEC3Fz?= =?us-ascii?Q?Ttu6fevy16qD9JLIMvx9tH9o4Vj4xyzMzY3CK7Pom8Ogpzi0bLXmzYmi7gs0?= =?us-ascii?Q?xFijBMD++kaWyFb4Jak/qdIdVTeaXQDTBvw6y1F3n9Us/egNulDEfCUf7i+Z?= =?us-ascii?Q?TGd1I9zq+JUB1d3mmjF/8GSEdb95/Xq+E2BN5TullyGf6Nkkr3izK3Jm9SxC?= =?us-ascii?Q?wKg6AtFWM47oP9o34A03hZHEZ/IzF4J6QhIsRt60/uU3GLe+uFxeFiIKr004?= =?us-ascii?Q?r448l0u94oAaEvrGZrVgs8NaGadqLGfWfuehAii+PkLDUZTH11lbpGcke+og?= =?us-ascii?Q?6nIpCAXSusI/zXJ/VMvWyMnLsueP5SPEMBF0mO2CGC7OkyJz7/ltEqZSo6z/?= =?us-ascii?Q?hTgUA51snryZMyz+ry9BkP+rVwBenvcpv/K8LnIz5nbFDynwuH2kREAVzD/B?= =?us-ascii?Q?ICEqoRzaIjbGfArDtIf8taiZ7+4i/PPPj7pv27gWlBqtl0u9PwhQwBJQymNi?= =?us-ascii?Q?TwwPbO52lX3dEtcLGxaOZ+2igB8lFvAZ7UcsZjkrDiG/F0UkeQvcibPAmQhW?= =?us-ascii?Q?p6m7YRn6B3jwANDD9TWTbBqL+J8muw+B3Gb4VX0+sS69cMXEDQYmR1dsdeo5?= =?us-ascii?Q?VgnFukbfFP0=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6e454.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 23d1730f-fe8f-47c9-87a9-08da4ddc1b57 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0601MB2087.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2022 08:01:37.6961 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR06MB4647 Received-SPF: pass client-ip=40.92.68.75; envelope-from=ignaciocasso@hotmail.com; helo=EUR02-HE1-obe.outbound.protection.outlook.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655194009; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=UkV7w6mDBsoBKjSnD9Q2r1Q8uHiZ5sPIfY2EisJecuM=; b=Fg0Pk1IIFK9P/D+CpS0MlTdq+oLTWmxdTqikehK/8VBTPnpc75yyQLeoPTyyZ/iBj5LBli 8tsap+mvGUVEa3Ppo0p048OBqxnqMyeE3RjjGVdy6GoPAm8f2qtsv9GKkYjKCYDZXELwx9 mtg84gVtuVQhSVgXHaF8Fcx8Eb2HRXCsF2vJB7Su7n6e30rkLnsjUzkgXpxTyqS6F3db+v A7OG79ziioFWtQ5YWfJJmJw/d+LGGvoU0udx7adiXOsKJrZs5EM0MfsGbTKivg9FNTJ61/ g8MhvLOPCARuMMjzZUxkQVrL4H3qH+9h+PVGoXxovuX7gI3ceeWpSMs++WKrRA== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1655194009; a=rsa-sha256; cv=pass; b=obFEkyuytfT8JOaDHGCCFmnGggByeZg41EO+774yj3rFEWHDr1LTOygvoIoFdhiqyqTpe6 ap10qXnRmaT2kHko5/Mi6yYvoCyRcKxKXm1NwKhFDkZHFHopRPkQ4Qi9rAUCmDpf89eHOA tnsUYuEvHqRyW32RM+rp9P9s0sfH4csQgBqsZoYl8/AnoAq66r26GLYNLtwAG/tj2uhHqJ ipyd9Zqrcf1XpmWfmz7ETybR99IQVXBie2N6lGYfoHMbyguemNfbZ2MHD01QlviOCaeaZL 73nUMFUSE7qPzFlteonLKE5OrbkskbnTuErqfcpSUzHY+0FXZ/mbKjMo/KRzwg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=hotmail.com header.s=selector1 header.b=ZmNXtU6Y; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=hotmail.com; 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" X-Migadu-Spam-Score: -4.99 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=hotmail.com header.s=selector1 header.b=ZmNXtU6Y; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=hotmail.com; 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" X-Migadu-Queue-Id: 226D03EF03 X-Spam-Score: -4.99 X-Migadu-Scanner: scn0.migadu.com X-TUID: FUYpWIyfWkV5 --=-=-= Content-Type: text/plain >> Subject: [PATCH] use `set-default-toplevel-value' in `defcustom' setters > ^Use > >> * lisp/ob-lilypond.el (org-babel-lilypond-commands): use > ^Use >> `set-default-toplevel-value' instead of `set' or `set-default' in >> `defcustom' :set argument. >> * lisp/ob-shell.el (org-babel-shell-names): Ditto. Done. > Please don't use ditto. (what does it even mean?) It means the same thing again. I saw it in the message of the Emacs commit I referenced earlier in this thread, so I assumed it was standard practice. I have replaced it with "The same". But if the problem is that it makes it difficult to work later with the changelog, I can copy and paste. > It would be helpful to reference the relevant ML discussions. Done. Is there a standard, concise way to do this for org-mode threads? I know I can reference the Emacs discussion with just bug#54399, but I'm using long lists.gnu.org/archive/... links for org-mode. I attach the new patch (same diff, different commit message): --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Use-set-default-toplevel-value-in-defcustom-setters.patch Content-Description: New patch with better commit message >From c38584ea4e396f56d34ca934582c43436372b102 Mon Sep 17 00:00:00 2001 From: Ignacio Casso Date: Sat, 11 Jun 2022 18:59:15 +0200 Subject: [PATCH] Use `set-default-toplevel-value' in `defcustom' setters * lisp/ob-lilypond.el (org-babel-lilypond-commands): Use `set-default-toplevel-value' instead of `set' or `set-default' in `defcustom' :set argument. * lisp/ob-shell.el (org-babel-shell-names): The same. * lisp/org-capture.el (org-capture-templates): The same. * lisp/org-clock.el (org-clock-ask-before-exiting): The same. * lisp/org-duration.el (org-duration-units): The same. * lisp/org-faces.el (org-set-tag-faces): The same. * lisp/org-footnote.el (org-footnote-section): The same. * lisp/org-list.el (org-plain-list-ordered-item-terminator): The same. (org-list-allow-alphabetical): The same. * lisp/org.el (org-babel-do-load-languages): The same. (org-set-modules): The same. (org-export-backends): The same. (org-use-fast-todo-selection): The same. (org-enforce-todo-dependencies): The same. (org-enforce-todo-checkbox-dependencies): The same. (org-display-custom-times): The same. (org-set-packages-alist): The same. (org-set-emph-re): The same. * lisp/ox-odt.el (org-odt-schema-dir): The same. This commit fixes a bug that occurred when using an autoload function inside a let-binding for a custom variable when the feature defining both the function and the custom variable had not been loaded yet. See bug#54399 and https://lists.gnu.org/archive/html/emacs-orgmode/2022-03/msg00085.html, https://lists.gnu.org/archive/html/emacs-orgmode/2022-06/msg00226.html, --- lisp/ob-lilypond.el | 2 +- lisp/ob-shell.el | 2 +- lisp/org-capture.el | 2 +- lisp/org-clock.el | 2 +- lisp/org-duration.el | 2 +- lisp/org-faces.el | 2 +- lisp/org-footnote.el | 2 +- lisp/org-list.el | 4 ++-- lisp/org.el | 23 +++++++++++------------ lisp/ox-odt.el | 2 +- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/lisp/ob-lilypond.el b/lisp/ob-lilypond.el index df128441a..dc33ebc17 100644 --- a/lisp/ob-lilypond.el +++ b/lisp/ob-lilypond.el @@ -107,7 +107,7 @@ you can leave the string empty on this case." :package-version '(Org . "8.2.7") :set (lambda (symbol value) - (set symbol value) + (set-default-toplevel-value symbol value) (setq org-babel-lilypond-ly-command (nth 0 value) org-babel-lilypond-pdf-command (nth 1 value) diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el index c25941a44..4454e3b5d 100644 --- a/lisp/ob-shell.el +++ b/lisp/ob-shell.el @@ -68,7 +68,7 @@ outside the Customize interface." :group 'org-babel :type '(repeat (string :tag "Shell name: ")) :set (lambda (symbol value) - (set-default symbol value) + (set-default-toplevel-value symbol value) (org-babel-shell-initialize))) (defcustom org-babel-shell-results-defaults-to-output t diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 773234967..948eb8bc6 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -376,7 +376,7 @@ When you need to insert a literal percent sign in the template, you can escape ambiguous cases with a backward slash, e.g., \\%i." :group 'org-capture :package-version '(Org . "9.5") - :set (lambda (s v) (set s (org-capture-upgrade-templates v))) + :set (lambda (s v) (set-default-toplevel-value s (org-capture-upgrade-templates v))) :type (let ((file-variants '(choice :tag "Filename " (file :tag "Literal") diff --git a/lisp/org-clock.el b/lisp/org-clock.el index e0c40ae23..b94c79baa 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -493,7 +493,7 @@ This variable only has effect if set with \\[customize]." (if value (add-hook 'kill-emacs-query-functions #'org-clock-kill-emacs-query) (remove-hook 'kill-emacs-query-functions #'org-clock-kill-emacs-query)) - (set symbol value)) + (set-default-toplevel-value symbol value)) :type 'boolean :package-version '(Org . "9.5")) diff --git a/lisp/org-duration.el b/lisp/org-duration.el index b242a6f2c..338ea11a9 100644 --- a/lisp/org-duration.el +++ b/lisp/org-duration.el @@ -98,7 +98,7 @@ sure to call the following command: :version "26.1" :package-version '(Org . "9.1") :set (lambda (var val) - (set-default var val) + (set-default-toplevel-value var val) ;; Avoid recursive load at startup. (when (featurep 'org-duration) (org-duration-set-regexps))) diff --git a/lisp/org-faces.el b/lisp/org-faces.el index f919a6b47..5fb6c3e07 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -338,7 +338,7 @@ determines if it is a foreground or a background color." (defvar org-tags-special-faces-re nil) (defun org-set-tag-faces (var value) - (set var value) + (set-default-toplevel-value var value) (if (not value) (setq org-tags-special-faces-re nil) (setq org-tags-special-faces-re diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index 0a5f994a4..8e0ac0da2 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -110,7 +110,7 @@ you will need to run the following command after the change: :group 'org-footnote :initialize 'custom-initialize-default :set (lambda (var val) - (set var val) + (set-default-toplevel-value var val) (when (fboundp 'org-element-cache-reset) (org-element-cache-reset 'all))) :type '(choice diff --git a/lisp/org-list.el b/lisp/org-list.el index 97d856fc9..872436fd6 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -235,7 +235,7 @@ interface or run the following code after updating it: :type '(choice (const :tag "dot like in \"2.\"" ?.) (const :tag "paren like in \"2)\"" ?\)) (const :tag "both" t)) - :set (lambda (var val) (set var val) + :set (lambda (var val) (set-default-toplevel-value var val) (when (featurep 'org-element) (org-element-update-syntax)))) (defcustom org-list-allow-alphabetical nil @@ -253,7 +253,7 @@ interface or run the following code after updating it: :group 'org-plain-lists :version "24.1" :type 'boolean - :set (lambda (var val) (set var val) + :set (lambda (var val) (set-default-toplevel-value var val) (when (featurep 'org-element) (org-element-update-syntax)))) (defcustom org-list-two-spaces-after-bullet-regexp nil diff --git a/lisp/org.el b/lisp/org.el index 229435240..1417fd5f3 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -231,7 +231,7 @@ Stars are put in group 1 and the trimmed body in group 2.") ;;;###autoload (defun org-babel-do-load-languages (sym value) "Load the languages defined in `org-babel-load-languages'." - (set-default sym value) + (set-default-toplevel-value sym value) (dolist (pair org-babel-load-languages) (let ((active (cdr pair)) (lang (symbol-name (car pair)))) (if active @@ -706,7 +706,7 @@ defined in org-duration.el.") (defun org-set-modules (var value) "Set VAR to VALUE and call `org-load-modules-maybe' with the force flag." - (set var value) + (set-default-toplevel-value var value) (when (featurep 'org) (org-load-modules-maybe 'force) (org-element-cache-reset 'all))) @@ -837,7 +837,7 @@ depends on, if any." :package-version '(Org . "9.0") :initialize 'custom-initialize-set :set (lambda (var val) - (if (not (featurep 'ox)) (set-default var val) + (if (not (featurep 'ox)) (set-default-toplevel-value var val) ;; Any back-end not required anymore (not present in VAL and not ;; a parent of any back-end in the new value) is removed from the ;; list of registered back-ends. @@ -862,7 +862,7 @@ depends on, if any." backend)) ((not (memq backend new-list)) (push backend new-list)))) ;; Set VAR to that list with fixed dependencies. - (set-default var new-list)))) + (set-default-toplevel-value var new-list)))) :type '(set :greedy t (const :tag " ascii Export buffer to ASCII format" ascii) (const :tag " beamer Export buffer to Beamer presentation" beamer) @@ -1815,9 +1815,9 @@ are followed by a letter in parenthesis, like TODO(t)." :group 'org-todo :set (lambda (var val) (cond - ((eq var t) (set var 'auto)) - ((eq var 'prefix) (set var nil)) - (t (set var val)))) + ((eq var t) (set-default-toplevel-value var 'auto)) + ((eq var 'prefix) (set-default-toplevel-value var nil)) + (t (set-default-toplevel-value var val)))) :type '(choice (const :tag "Never" nil) (const :tag "Automatically, when key letter have been defined" auto) @@ -1899,7 +1899,7 @@ be blocked if any prior sibling is not yet done. Finally, if the parent is blocked because of ordered siblings of its own, the child will also be blocked." :set (lambda (var val) - (set var val) + (set-default-toplevel-value var val) (if val (add-hook 'org-blocker-hook 'org-block-todo-from-children-or-siblings-or-parent) @@ -1917,7 +1917,7 @@ This variable needs to be set before org.el is loaded, and you need to restart Emacs after a change to make the change effective. The only way to change it while Emacs is running is through the customize interface." :set (lambda (var val) - (set var val) + (set-default-toplevel-value var val) (if val (add-hook 'org-blocker-hook 'org-block-todo-from-checkboxes) @@ -2368,7 +2368,6 @@ The formats are defined through the variable `org-time-stamp-custom-formats'. To turn this on on a per-file basis, insert anywhere in the file: #+STARTUP: customtime" :group 'org-time - :set 'set-default :type 'sexp) (make-variable-buffer-local 'org-display-custom-times) @@ -3275,7 +3274,7 @@ header, or they will be appended." (defun org-set-packages-alist (var val) "Set the packages alist and make sure it has 3 elements per entry." - (set var (mapcar (lambda (x) + (set-default-toplevel-value var (mapcar (lambda (x) (if (and (consp x) (= (length x) 2)) (list (car x) (nth 1 x) t) x)) @@ -3548,7 +3547,7 @@ After a match, the match groups contain these elements: (defvar org-emphasis-alist) ; defined just below (defun org-set-emph-re (var val) "Set variable and compute the emphasis regular expression." - (set var val) + (set-default-toplevel-value var val) (when (and (boundp 'org-emphasis-alist) (boundp 'org-emphasis-regexp-components) org-emphasis-alist org-emphasis-regexp-components) diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el index aa6e90122..9b46f15b5 100644 --- a/lisp/ox-odt.el +++ b/lisp/ox-odt.el @@ -404,7 +404,7 @@ with GNU ELPA tar or standard Emacs distribution." "Set `org-odt-schema-dir'. Also add it to `rng-schema-locating-files'." (let ((schema-dir value)) - (set var + (set-default-toplevel-value var (if (and (file-expand-wildcards (expand-file-name "od-manifest-schema*.rnc" schema-dir)) -- 2.25.1 --=-=-=--