From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 wNkIF6HRpGJzmAAAbAwnHQ (envelope-from ) for ; Sat, 11 Jun 2022 19:32:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mL3yFqHRpGKzzgAA9RJhRA (envelope-from ) for ; Sat, 11 Jun 2022 19:32:17 +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 A290A97C1 for ; Sat, 11 Jun 2022 19:32:16 +0200 (CEST) Received: from localhost ([::1]:46436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o04y7-0007px-2N for larch@yhetil.org; Sat, 11 Jun 2022 13:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o04xf-0007pn-Ih for emacs-orgmode@gnu.org; Sat, 11 Jun 2022 13:31:47 -0400 Received: from mail-vi1eur05olkn20820.outbound.protection.outlook.com ([2a01:111:f400:7d00::820]:62017 helo=EUR05-VI1-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 1o04xc-0002Y0-Rr for emacs-orgmode@gnu.org; Sat, 11 Jun 2022 13:31:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ch7SBXyrjpRI9ewgZqp2FjtlsVRto8VegcCIgIbt7Wvgez3ySa+FFeiDObeUXCQJWsu3vwdKQU146M+LK/JCQcafW6PkuMmbiRkyiri6HoYLGnhFxMBYF3HA+ERYJoDZ/5bt5jsnHtKjAAXB/9vk3KIWrTXffU31oHNru1aroGHXhBCPRwND5cRG36rMfME0ih0ZGykDzBVuyU30zN1MbeHr2E2iKHQsvoix9TxkSrrV/TwKEYI8BtsBF050M+IVIn3xOEettkhx3bskopl0CvTLDxbQPrNnK3+sbGiJ73zU2yM8KwdDOR5oiPX9KzQCw69maMcsMc4GvnjBK/Ja/A== 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=VznIShVu3FjGjIeIU8Qguen/eLlBXDKdQTz83k2bBAs=; b=Nea4vyP4FwLJr8XBKj7O21gb3caLP8pLjaHe09jptVeFYJtypA1flveoKV7P7bB/gvFfh2lgbdcJvs5trxmXj/Ifh7gXbbajFotO+Y7J079DAv9aaVKac/8MG3EXQ3oMFE1KGrmHFJ49E68GeF3AilWzotjR9ra4FvZGLyV0rOcGDgC5O7NRUBBjiZutdC9xNbrZAMc+/x5IxS6zUPi6iYwQZdwbmY9uMqS9aA13oou6SvgdPlTbKEb/n+fqnTEZ+aBQebLT9hBN7JJ/bau68CoCw9KFfQzdXfjJg22Xf/4OsQFeC96GcO6SZG/1Rb9ErH1Rg4KUb/D2/6KaJYN6vQ== 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=VznIShVu3FjGjIeIU8Qguen/eLlBXDKdQTz83k2bBAs=; b=k/tIL4ANSuFuNZWfnz50anx6Xf9JVuZMwj6wG22vaWJtcAWwrsgtWoumd5cl4CbzMK7klxrS00oqkCVN87TfpNEPsQFcxXJPoGWQ5aTf478xeInrBbhrJKEg5/0TWn69KJ7h7UEB34SMgasODxHOE+y8Sz6/CXCEnTMcf2TrVKC6cb6a+ekrItshT2bI6SgFc2c8PnC7GoV6s10+N+BEsj3vQOz9AI/q0R03fKSY0PdEEJACK2IHERvuqmFH2xpbQPLxVM9s3gcGtGUcBcTAsSIm7frmEXjQIw8uiF5izZWhu0PsBMgar7NtXEgTFMMOnKpMlOQZwUGD/clxxkiqrg== Received: from DB6PR0601MB2087.eurprd06.prod.outlook.com (2603:10a6:4:4f::26) by VI1PR06MB3119.eurprd06.prod.outlook.com (2603:10a6:802:5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.18; Sat, 11 Jun 2022 17:26:38 +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.014; Sat, 11 Jun 2022 17:26:38 +0000 References: <877d5nba1s.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: Sat, 11 Jun 2022 19:25:37 +0200 In-reply-to: <877d5nba1s.fsf@localhost> Message-ID: Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [V626/aBAHBrnQezM5FUOSYtpCyfVqYZ7] X-ClientProxiedBy: MR1P264CA0024.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:2f::11) To DB6PR0601MB2087.eurprd06.prod.outlook.com (2603:10a6:4:4f::26) X-Microsoft-Original-Message-ID: <87wndni01k.fsf@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5265ae4-af1c-44cb-d794-08da4bcf8a08 X-MS-TrafficTypeDiagnostic: VI1PR06MB3119:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MnzxKvpxZB8xBhUP8y7e6YxsUWCGZ3wBPu8k8XYWrPUnNjhK+ttjaX19qo/t+D2K30U6hyZEYYDjSg2s/V7EZle5npOpyKt8E2ihjt4dYQBOfnSrQFWX3bVifahUTq1EIBkdTS3l17lfVhlNj99CS5X34xJoa2lGpz2ZjWRiphP4XD1wrUJWHm/iJeR2pqIWLF67HwSIUZgtThNpXdpFicht/Mo0MdMy628MCAR53IdZ+c1ylugPRE77+ZCnwS/PUDnruglNdlGYHlL/Hn2ryXYXfAoTyleZiYnRnxVYYwhZ/vhTMCOF793orTvbYk2ly1kbsFrOXnziPOtVvMlOkOnmFTCsgAa4sKsgdAg3ABFRyFRKZdXhZDTE/mwRFNDQOSCgDSmaOm4Q/NQM9ADXlnZBdvbL5Aorz5qGEu1/oLenNyQS5aPi5s9pmwJlRtcROHKUU/RNWWgdxvkiiAFcufwX3XjSOSZAMob3q9EFuXc0teYYN/xZ57m+0Yfm2hkUqIBSHJXsr9O/sLse8773n26HDjirqFxV/SKzVNzC4qBwRoaINQVpJrfPSBcaNN6VpeVlw+JxDJquYZBAc2IDKw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OWIqRYUBXFMU8wrs7kATovhzC3qKya9wmu7X5pDQYz0eEdrkBK2QG6wkkffz?= =?us-ascii?Q?3Juph4XLk9+Ys6nNgtkq1HBpl62/ySYfJoTVCiOLUkK9Cj5B2CvVc0Hf8cu8?= =?us-ascii?Q?XvmbMHPtLLChokFqO/tt68eEZhFC3o029gYQ8AwQOIGmNV+sJHZhEsHrYjGu?= =?us-ascii?Q?oOOi4ir5D+OcIqeO+6p8yfSutC+DoGZuJy0PuNtfFUJNdr6qgGfSueLfDc/c?= =?us-ascii?Q?xeeWF0ww9E0dcMryp86cOk1PNTu2C/zjA/uLHvk4XZMQAZwmR9D9JFZ7Z6kW?= =?us-ascii?Q?IgP4RezOlbUAobpEZbGJG4Ma8vxRMBD27hzuJFd1W1Ci9Zj9AmChG/zHpYPV?= =?us-ascii?Q?chlpMGrCG27Wb7zlFCBY3Cj26LyX6VweEmRUmnFU9kWX8kTzdHaXn3Ja0u73?= =?us-ascii?Q?6wDfbUnzJBFE4Hh4ZzLFydo2E1DrWEhzZHDJHgoEMJG/rhpaPC/RxFP7nbrr?= =?us-ascii?Q?IbLpUHaSLpl0ne/A1xiN0HKnoAmd8JZO6bwVqoCM+r5zS3hJAlhU70OQxc76?= =?us-ascii?Q?dXfqISKsGrP0FdLiDrtdIif/VK9OXGyHT3j2rljIaNV0TXc70QdRTIB9QnzF?= =?us-ascii?Q?/OIn9VZKzVUWbg2q948mNrLJKdcl8P3I2nMAXNasbsTPDc+sutCQ7mtG/WkO?= =?us-ascii?Q?qXgaZp9UESXIJKydQ6mVw9ZRwP0hRwIopcyA6r+NT3FzR6VnJ1QnFAKOWMUF?= =?us-ascii?Q?7+JrMHMBNoqqBkoukH+xzsOe2xgmomsHmzwE0KIbZKeUDG0rqhQ3R0TjWn+Y?= =?us-ascii?Q?57phBB/QjJ2Mtx6XsfK3HssNEd6LeHch79Pi8wTCVR7zNtRrV0dIDyb+j4J/?= =?us-ascii?Q?ufm6ltsUz1k7xBmJxA6Ug7QUWUWKOqbpE44YjXi9sE9JysbUZG+xqNGhNRb1?= =?us-ascii?Q?WfDVFEn5NmmF0Q6PEUZIosEWcRo/XPP2KkGOg0wNOFyxbJMoM+bb+gyXdDVr?= =?us-ascii?Q?lzO0SfsdlzTtgpyAzO3lZGUnusPHTRK0zqUtO/rTmngN4hJcqxc5xKlMs/1m?= =?us-ascii?Q?ZAQWvepQVJAokeS8KPeLvVQU9ueyYflzu+Cb+ou/ak/UsRW/EBLwBn2/OZSF?= =?us-ascii?Q?xyvjC3d2tWy1tQMbrWh+Jwag4ilgSMisKT9Mw1GTQx3OAdE5oMJumqN6lkv3?= =?us-ascii?Q?xJ2cbKfW1cFgFwO9TOyCuOo0S8JiSXTdqGQwXsoRonf09TUJWM/SLnhmoLBR?= =?us-ascii?Q?bFF2BPHPngd0cocZKOw7Uo4wzPfKBAhdwel88NKM20qwJOVkdWSIzkBdHpgv?= =?us-ascii?Q?QzmrYT7BbsZpoYhWs4ue4aOGFN22S/CLqwc114U9i5eVXX2nC/N+nMjJpBjI?= =?us-ascii?Q?c97R+bTmkQBbtKeO/xWI3yKDwqL05r+IxrPzt0bd4kewaATxnubFpCGavAFY?= =?us-ascii?Q?cSFDWwnQYEjyNGQ5hE/2dpvmJfwtMCDZGzyX/d+HVY5UZXrXWcD2C59hwSXZ?= =?us-ascii?Q?NpcpfVHqTmA=3D?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6e454.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: a5265ae4-af1c-44cb-d794-08da4bcf8a08 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0601MB2087.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 17:26:38.0151 (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: VI1PR06MB3119 Received-SPF: pass client-ip=2a01:111:f400:7d00::820; envelope-from=ignaciocasso@hotmail.com; helo=EUR05-VI1-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, 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=1654968737; 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=VznIShVu3FjGjIeIU8Qguen/eLlBXDKdQTz83k2bBAs=; b=ibTI1mFJ4kJFyTdz7ZOR9rQsFFbumJaE7TVKFck/8eufVStxoln9xL/wE/eBTxErPDPvw2 dsWQR8ODzEnkYaGcyzse4M8El8MjweyzQDUQRHR5QLtSQSP62fpI82F+zDXaJDFTcD5vJQ TN8kKJrLIOasgUqEqC+PKb1PfecYg4jXH83WMaJjUT9By67QKWykvKufHnTdbaZIjPh78M K7NTkuWPsihMjLEA7n6tVzTA4NQtW/ig8C57PWaGqXQiL0nJTVC48qjONerZgNvg46gkoK OWFXTOddURxppFF96v9huFVsJIhEejLT0D3xKfokvulzWnOCiQvWi0uAWLt53g== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1654968737; a=rsa-sha256; cv=pass; b=Q/Raz7Dvoq214V6T3xChPMj0y9WIsrrnw4UyX8T/t8875XvqS9v/basV57OcjivZEuZyf2 Syw4iMQOZ7QdAffRTgauilzn5rGi6ZaM+ghxgpEh4LvoPK4oDtsGJPIDcgi/Q74juxswzQ 0X+/SES6MwmysTEuGRw9Shi00bKlLokFBxNwnNpG19g/f7NubbFe1NO37ec4rcepVJMbT6 GQEFyO/9TmoEyxw71XCwvzIxaG3il/XfJTvNmQZY1zSng4G8BnKRak7ECvVXV8yvcjDNf8 J+qlxNG1Ozv/sTaoUnUHBpbW9a3Ab2msoRZBW2n+fZGRfUG2MmvTHgFSf4AqJg== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=hotmail.com header.s=selector1 header.b="k/tIL4AN"; 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.78 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=hotmail.com header.s=selector1 header.b="k/tIL4AN"; 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: A290A97C1 X-Spam-Score: -4.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: cethFRKkpRFx --=-=-= Content-Type: text/plain > LGTM! Unless others have objections, I am inclined to merge the patch > fully. But please add changlog entries to the commit message. Done. I attach the patch with the new commit message. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-use-set-default-toplevel-value-in-defcustom-setters.patch Content-Description: patch >From 26d157aedfaf1496174682a1f9033d83160a06c2 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): Ditto. * lisp/org-capture.el (org-capture-templates): Ditto. * lisp/org-clock.el (org-clock-ask-before-exiting): Ditto. * lisp/org-duration.el (org-duration-units): Ditto. * lisp/org-faces.el (org-set-tag-faces): Ditto. * lisp/org-footnote.el (org-footnote-section): Ditto. * lisp/org-list.el (org-plain-list-ordered-item-terminator): Ditto. (org-list-allow-alphabetical): Ditto. * lisp/org.el (org-babel-do-load-languages): Ditto. (org-set-modules): Ditto. (org-export-backends): Ditto. (org-use-fast-todo-selection): Ditto. (org-enforce-todo-dependencies): Ditto. (org-enforce-todo-checkbox-dependencies): Ditto. (org-display-custom-times): Ditto. (org-set-packages-alist): Ditto. (org-set-emph-re): Ditto. * lisp/ox-odt.el (org-odt-schema-dir): Ditto. 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. --- 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 080962cdb..f01cd988f 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 --=-=-=--