From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 28 13:14:09 2024 Received: (at submit) by debbugs.gnu.org; 28 Apr 2024 17:14:09 +0000 Received: from localhost ([127.0.0.1]:51298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s186K-0001Wl-LA for submit@debbugs.gnu.org; Sun, 28 Apr 2024 13:14:08 -0400 Received: from lists.gnu.org ([2001:470:142::17]:43110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s186I-0001WD-9I for submit@debbugs.gnu.org; Sun, 28 Apr 2024 13:14:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s185n-0001Et-5t for guix-patches@gnu.org; Sun, 28 Apr 2024 13:13:35 -0400 Received: from mail-mw2nam12olkn20801.outbound.protection.outlook.com ([2a01:111:f403:2805::801] helo=NAM12-MW2-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 1s185W-00047q-5j for guix-patches@gnu.org; Sun, 28 Apr 2024 13:13:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAbPH8EvxGx3Lc6zcGp4GpgNHqnc1KTBtS3NtVN73Ba0IUEXADY+JB0NDJGE2HoHPeuP63VlzP1726Fia3egIEy3mrymtT63dFONPxSSrDXnaTfpO2w5jWahDSU27+IBzsyR+g0/zTbyWqIzM8yI9yJBjS87UXrs9q8bhL2ZCvdepCSbozEc3k+2wrDJQbcbTCnfx32S4XCF/dBEPbESK6PN32thnS0ZOVbMdRNXwhI4cGnBBGoZlQXXfO+++z/8NrWENp2bfBkIGiCtoQEFKdXlO+RNE3IxktVXTDICV7xuvEUdUbJb9hfEBj/qnhKdACC6uIH3k+LW4dfn9+Q2mA== 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=yl0EgJfKwudv3DAfkACW/bgn1IJSQ/ulUJQkanu3oSQ=; b=TJbshCNalrMFc2fa6kIwAG0a2rBarVRxvPT8kxwcoMqDNNYCGz7Y5mtN8KaoN2XY3jtYqkXRJ/7QkUXMDVGgQ+5wWjZNm1H+e1QNH34P3/byROB/ZPkxAb8pVQ1TEqup7+ojxVLYHstzNSQdtFnIEn86axX+MSqRGWFN5pjyErJ2NBt3AAqRzChEY87YPV8I7Zf/2cXlriPqgg0bFBeyz9NHlmBwbbqRlv3kePs/oBXVJGI5Ns87NA+cFu94eFVKog6QHNJ4itr41oyR4QE8I/lYgr8jrUQzKxOPZlrzwE32Zn82g/ivK8OgeFzzb4nmTXxrQmFqHa05FNDuhoYHTQ== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yl0EgJfKwudv3DAfkACW/bgn1IJSQ/ulUJQkanu3oSQ=; b=rVEWnGcGQFe32UNWLzdf43ZakzSBzsNb/UytaGwYPSuoH+aWg4+na0R/5kFz6MoHP9lC64h8GMl8DdQhH4q6KkXOwk7E/R5EV5dizg9gqVRPMFNzFG+P7q6NY147yocJ8mXbjLafm8jS3cjZXexC9EUb8I+jAhp7HmTUEnJ5f8or3R0nAFqvWB4qTNjFgWXVomBzBE17i8zZCqhhq5ws8e1whlwo+lNqPTGNzKox1DRz8kCg5ZAqdM9K1sY3713EFTPTlKRX1PIxLEow/6DYrxilSYktT/hRD10hqYJHLlK7Qf5D65n3AipYFuceo7X0EQH048ld9aSDxo6eVoVpEA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by CH3PR84MB3852.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1da::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Sun, 28 Apr 2024 17:08:11 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Sun, 28 Apr 2024 17:08:11 +0000 From: Morgan Smith To: guix-patches@gnu.org Subject: [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. Date: Sun, 28 Apr 2024 13:07:23 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 X-Debbugs-Cc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [S8BaoAYTNvlb3+dqUG70ElfI0GjYY2zK] X-ClientProxiedBy: YT4PR01CA0164.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ac::6) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|CH3PR84MB3852:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ef68ffd-7e1e-4cc9-a26b-08dc67a5c86d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ZZ7OGACgDU/Sx39Aymc1gch8Am0Lw/2pf2TClZ1Sld5fLr7Ft4eV6qhuS6tZqmnQBYP00r7YdKvv+Kg+tw95jVbPUoIbwu+xB9kMgCXPmEhp1DWMs1D+XGewPP5njeEyBGfxRTcIYPBKA3ECveqGH8A1FLuZshtWOMqPsJXmVlWA2dBSZidOrMXSTmWcqIDtE6M4fJWn2VndXKU0956YTweq6tTMfRcrCHTd19ur9IskOh9WD6TTD7oxSne47ODh0rcd0lrLUpOPCWy9sxNcQGPvAGvNakW3+IPJSDiVpzn9/2HjLf334d5hX8VQgx7da0mzDOj9LBPeQENVvWYcMAiZyDnAzArODHR+COKLm1FEq74Xof8G5CcfC217PrRQ/QRXHyOB1EmfDaSfyh9OhgFFPmNa5Lz+7H5IdpfEhOjXfaLJ8F+RBimGJU3pxjqtVFW4F3hn2v1fj40+IasisRWoHfohOTorBAvr7qOC8wvpgxMFi2K3Ude3Q82vp/OvYtyJezZBk/QHBldkUH8vZf7Boq6u7uZBX72Ji8r+QcaZ6XfxZk65j/3sVt0V9o1umF/LZhK+fjryCVhoH4UzYe1JUIfgwB+bJdrOAKoTwvLXP4gb8VYc+MebpSgP66Yi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gbureHH396ug3kUw0x2E0qYZZf/AHx6AOWiC0gzKSGHg4CJOiPO6Oeps9FYJ?= =?us-ascii?Q?nxWSqrDecpm+JPLtp7N3LrfGpR03WwrEj5t4Hi58YLTgax40B7IdG5GwVcEf?= =?us-ascii?Q?xQgtqYqsmjLOtXTlmHjxMZVi4Y1DEBBFqpqw5wTlvAxnx7W8hi88N7VQteSu?= =?us-ascii?Q?GERjK1GLjlNSnF0Q07B2HogGsNLsRgUTbkwXbZAZXohYTjbSSKqgJAlMxtPw?= =?us-ascii?Q?szprUhCL46Gnt6lHymwhpAHqz44NfOGLWy87USt6tVgcGnFQ3vSqWo8qEwXT?= =?us-ascii?Q?HrJbbJpQXRnJCSWpWM28w76keYsEfjlW3bukZc053I8ibSiU9x1/oZPnteiI?= =?us-ascii?Q?LwaJ98XneiY+HCw6I4wImfv85UEfW13cnfHpp9rG7UA6Z39cdw1RgtziIX1F?= =?us-ascii?Q?sqzJ+akHKkErOrtoooFo/GtMU8v9A2vzsH/NKozVXK3VbT9bFq/DtDBoyr0b?= =?us-ascii?Q?/wNrcFKwhnXui33aPWtObtHMwb1KHoI9bEknuk2yD+DH9JtQqdDhO/FvmCxz?= =?us-ascii?Q?zC5+Nlf9+u5QMPrNhhcGPwB+BQP+XoZKOPusmFw88R1J4Edm2FDNRPhK30c/?= =?us-ascii?Q?rNBBfotT82jsG4um/sKHx9Bi7N9LyutdjO+avAxS8xE9geUaN69uM+HgMRaV?= =?us-ascii?Q?J54+2MKC1Ru2enKmMan/eNSk07SJhN+zCSJpWAIYFGbwV/GbGnP/m58NaFjj?= =?us-ascii?Q?srB3LLZY8INqyxXp8WyIITEW0jnUKvHCuuEsUAhFPhNFXNgYd36SH8M321y/?= =?us-ascii?Q?vKoV3ANGoLlaSmg2w/2oM8Gk/0lEZ6GeASruUW8sIm8pL5ptESaFAyaXyqPt?= =?us-ascii?Q?dTp/XtkZplRnE3cLYRdZ8hiMfSfNBVdXBNVm2y7P8rKTNlIbbzB3rPIMUYox?= =?us-ascii?Q?tJdpR2yKvF59VRard0wKZyBxcw8jDqfft63ixPCzGBqaItt5P2UhFwmiEMAr?= =?us-ascii?Q?3MEn6bGV5iw2zDkKQPKzl/zJESnCGaTTxOcxXub2wOxyMewAJj5BatMD8tji?= =?us-ascii?Q?y+oqJZ/n/4TUrk9gUYnidvx9JowzvbNG5k9vW2FO47WsUnFqnDzMnngKqaUE?= =?us-ascii?Q?GSfAFwEpbjABWqgHodF5atGsKzBMTCUXK4jqlPpqJgT7VsncBNHSatdy1OcO?= =?us-ascii?Q?aUI3lnUxt7OeKYJ6cc3qhIGMbpITig8aJH7H2XysTqRq1j9PkvExG7q5e5F1?= =?us-ascii?Q?qa6vGmwA28Nu28chdR8lcC0tY1BCkD2cu6W4PuJ8eHVNMX5qsMJDBVFvMc16?= =?us-ascii?Q?5mKoa37NFUonPX+i496I?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ef68ffd-7e1e-4cc9-a26b-08dc67a5c86d X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2024 17:08:11.2359 (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: CH3PR84MB3852 Received-SPF: pass client-ip=2a01:111:f403:2805::801; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-MW2-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, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/aux-files/emacs/comp-integrity.el (expect-help): Update with new terms for function descriptions. Also return the description instead of 'nil' on failure to aid in debugging. Change-Id: I63a3644c91dd7817a72ab11ae87ec4fc8fdb2c1b --- Hello! Trying to build the latest Emacs from source fails because they changed the names of this stuff. I was able to successfully build the latest Emacs with this patch. Thanks, Morgan gnu/packages/aux-files/emacs/comp-integrity.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el index abe7e7c0c9..d969f58622 100644 --- a/gnu/packages/aux-files/emacs/comp-integrity.el +++ b/gnu/packages/aux-files/emacs/comp-integrity.el @@ -16,10 +16,16 @@ (let ((desc (substring-no-properties (with-output-to-string (help-fns-function-description-header ',fun))))) - (cond ((string-search "native-compiled" desc) 'native) - ((string-search "byte-compiled" desc) 'byte) - ((string-search "built-in" desc) 'built-in) - (t nil)))))))) + (cond ((or (string-search "native-compiled" desc) ;; Emacs <= 29 + (string-search "subr-native-elisp" desc)) ;; Emacs >= 30 + 'native) + ((or (string-search "byte-compiled" desc) ;; Emacs <= 29 + (string-search "compiled-function" desc)) ;; Emacs >= 30 + 'byte) + ((or (string-search "built-in" desc) ;; Emacs <= 29 + (string-search "primitive-function" desc)) ;; Emacs >= 30 + 'built-in) + (t desc)))))))) (defmacro expect-native (fun &optional feature) `(progn (expect-help ,fun native ,feature))) base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 28 13:19:14 2024 Received: (at 70632) by debbugs.gnu.org; 28 Apr 2024 17:19:14 +0000 Received: from localhost ([127.0.0.1]:51325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s18BG-0001cQ-Fq for submit@debbugs.gnu.org; Sun, 28 Apr 2024 13:19:14 -0400 Received: from mail-bn7nam10olkn2051.outbound.protection.outlook.com ([40.92.40.51]:31393 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s18BF-0001cI-Cq for 70632@debbugs.gnu.org; Sun, 28 Apr 2024 13:19:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rb756IkbVJmo6qSDYqdDP9ZLmlQK2yM7GH0uEQY8RI7LP8hRgbUb8RY5X7Hw7BJYQM1V8/y5jtYr6SskOI4EP5l9/VLj3OLakRH+ArwaFxLCwRFg5aJmZgcTUpp51ZkaFOV596ukEJt70T0yqTiwqsmVkIxYTB2dpdTkLP4WGOhUGdsRtoqCY8YcsP4l+7Rw8X4HCwFWZQP00pJldT0f4g3jRU7TwUZFWuQcn83bfraY+a4qJrA6rb8cTpwXR796+QXj8EMqZKweHY0MU9zspjGoBgcNOgbuAHt+ikg/dL7jZDXteZl9DcH/IBwrSYHMKT0kBmzmCC/PRHY6xz2GTA== 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=GOS99n9IIUr3UZbZ7oCM0aLMwzOpDBEmNkz4Aqt89o8=; b=SeFJRliKuop3PBhYOvQ3w0PkrQJBtizoVR1Da0PtY+ah5opGcux1lVvDEvPcy9nX2DybbXwTxOXfW3gs16FSihb+3yz8RWkmDkTxa8a3k+9QuDJsEGl7XhGXwuhcRztZDEmpek0EbcjE4LpzylGZ6vDdn4sDl8neED7mRzKBaKr8mSbHNdZYZorpaxRvigtfS/LM4YYXgZzOzMBl9RSeHl6YE+1gqfY+un4dRD5upQ2Z9+hyBXNn5NJVhN3dC/rVHeJrFou3QJya2cdnrs6nLsEK0yuaIBJ8Q+w/W0SeBac6Gh7KNEVMSycpuFbwgRJTl4g+Rca7pPkHREmVT8o7rQ== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GOS99n9IIUr3UZbZ7oCM0aLMwzOpDBEmNkz4Aqt89o8=; b=Sxm7P0gok4kXz0L7lnpeOyt3EfFK7nF0ibKTpfgYXI4kzWXMslVDOl8cUMOEqtLAsltKpJBApRZH+Yrng02EnNnnTgKG7BxkoebMdSgLsaQU7NHtznzb46f6sIlycKrtssvAbu+RA4cDr4B/CC5HQf0WwYlL3+zdJOYgWLqmzZiUWTprsfAOuC+5tDd6EjCemdvPjePkfdpBIdzFElJiLGMkvPBqjCcmeTk16q/wheJfUAs3Eh+qG9D6RZth5NBDj0zzF/jUfVCRMHrvGBm83ZanZcPfexMPKeN+TOVrzAMxHuGIj+yGFFmZpNB+w70kynKW9IiS5dXyQBCsZpw6bA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by EA2PR84MB3754.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:251::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.32; Sun, 28 Apr 2024 17:18:46 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Sun, 28 Apr 2024 17:18:46 +0000 From: Morgan Smith To: 70632@debbugs.gnu.org Subject: [PATCH 2/2] teams: Register the comp-integrity.el file to the Emacs team. Date: Sun, 28 Apr 2024 13:18:06 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [HnyLueasTlZflQRD25CRUYMsat5EtBNi] X-ClientProxiedBy: YQXPR0101CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:14::34) To LV8PR84MB3436.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:408:1fb::12) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|EA2PR84MB3754:EE_ X-MS-Office365-Filtering-Correlation-Id: dcc1e18f-d0ef-481f-65aa-08dc67a7414e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|56899024|1710799017; X-Microsoft-Antispam-Message-Info: 6OI7Vq6IXpw09tnnCNQicoHjsWAN3Q6835aVpQTYfvgdL9+s4kMV+3cQGzcuXKJbELRsDtLfygk7ZIE/Ps43ot8G4NJEXULme8nUo71MVjC+fljJbhFyRFCFSXLDrnnYhpGqeLwTbqzgOOtbneOqKhLsTU+UW/gvRRaYxCJpg8AG+WEUiTy/lrRLHtAF6ZxLGnNk8t+ooidzN66GriJ1akLCOzreUjvDNg1WFUkANRzz2p7/lMpKtz/D+zTSY18vTd8A0jRjBNpUhG65/tZyUYFcQnHu7X+e2U8KnFqNI7bl1xDG71x6ef6bp4SPQccKfX1QNLvcdLD2UiWr1qni8XiwWmWtA+oS5e1Yt+cxakWJD+pMWlTXb3ioRTNil5S6dNNMeyLAu+DhVVqo4ZUujy4WD13ZGJEM2vhbNRRen+Hx3kDLqCSd1zhL9AF92vVXfHgCA+6T7N5/VlqGU0Il4izio657rogtF9Ngu/E0Rk9d738OpVGqP3j+xiYpz23MXU4t8DPPcpE1F/oHrjhLzIePmX3QFH2RgcLnxwGSO9rqAPOcQfft23eNYkKUzZtweG2KdioHce6wCwE7QFVPgNMzV52fAJC4BZluDQO6Tk/+NdD2cy+ucVxbywPHkHr2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Dd+ReKQH+Y93J1NfpRcCRbkNrb1GnO5JpPOnXkhCkFlJQhL4vlBfXexZSEHL?= =?us-ascii?Q?nGvsogxs7Hzwf9O6lDE8gJhVzleYcCqtzQywBfFgyKEh3fcd8Dx3WsMhmSax?= =?us-ascii?Q?LzUI6WUiWCvZbmaHRxeym1E0mTObBMAiP73k1+/ot8jFgVgUwQWo2Ao/dVo7?= =?us-ascii?Q?to0x4SXskn2y/TAPyX3UIb0VMiYJV9VDP2LkMa8NYxzNrEFV33Kztn/1ze6s?= =?us-ascii?Q?2t3lRyAGM3PBRbN+1Zss9zG0S7NAqRu7Ktiks7iRC7xGnr/BkC7i+Leyrc2B?= =?us-ascii?Q?lgyT9kWJWRlL/xYwy9evRUm7v2up6TSeLh8EFjEq7gB7y//RKRif1bHTCRgc?= =?us-ascii?Q?mubx/tZK7a8AjvbF5vVYeDVDX2E4MyhBaZduQVeAv6lZeYE0gzfoSVGv6jhA?= =?us-ascii?Q?eFIgo9pkIARuuoabMj+lrkaNVzES4oDeX9kJwZ/hXhy3cJXMv1pfOIqKBX3t?= =?us-ascii?Q?NJA2ZXCvWw39r4/NwiqtlkimOTvmJG4SO3iraNz6OmgQQ6BeEU5iwEvj8kR2?= =?us-ascii?Q?Ux/3SCwivNST76XGC588yCXJrLIRz5wLErYT1Le1b1zGOCMVl+D8JUdeFtuk?= =?us-ascii?Q?g+kNUGY9eRq6p7jGA810RhjC9EkLj4IHgVKJ1qz06cnx0hkI4VEICvFgEm1e?= =?us-ascii?Q?o5buecmhA2btabhk6r5WtATgwvHNmZBJDMTqsC/J2g+YRRMoFJuREXWjVrWj?= =?us-ascii?Q?xKFqdCenqsMDDEhVgiEVhkmB6pDRu2hoPxnQkR0Q5tQYycX4BaXIyjqpzWZj?= =?us-ascii?Q?MylAEzJxP5FMeGbpYihbSABrnj7Hj6r2wdaoyjUPxREHl9XtUyWtbzY5syG6?= =?us-ascii?Q?dR0Qaw875eJwD5N0S7ESJrS0D4o4kItKiorFMxfwDALyq+885k9NCsCbQorD?= =?us-ascii?Q?Xa5nqL50hIcnmdArBF7OGEMjkRDrw6gzZoMZ0Jc8OMWOdaULhzvrfAUHgAyI?= =?us-ascii?Q?cg4u9QPUZp7PDmP8eDKuVHe6NccQz051RX5m8l4yJdQ0VrYiGcMyQNHjgTza?= =?us-ascii?Q?gau/4qdHqzm1SI9DkTgJtnKm2f1Ry8i2u8/x7CKZvoHs4qWYDOmYxMusbbDr?= =?us-ascii?Q?w76whOqqDGDVlVW9b5Q2SeBnawta2qmInIl6wOJJMAanC/6ru6q9+kZ/Ta97?= =?us-ascii?Q?rRtwXWTgFt9CNuAJnjaZC1aW8HFHF3uf7AySAdIt7ZtuP1NWhLYN3Lm16t0c?= =?us-ascii?Q?Dc4ixDw0LGsco6Uok2r009hTCryQJhoNC10+tyt+1GUM+dYJyXYJnlHtTir/?= =?us-ascii?Q?FmuVqHSHB10Ob2E3nxTx?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcc1e18f-d0ef-481f-65aa-08dc67a7414e X-MS-Exchange-CrossTenant-AuthSource: LV8PR84MB3436.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2024 17:18:46.4232 (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: EA2PR84MB3754 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * etc/teams.scm (emacs): Add the "gnu/packages/aux-files/emacs/comp-integrity.el" file to the scope of the Emacs team. Change-Id: I66014b94e73fd87eeb3aceaf5f61f08abc875c44 --- etc/teams.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/teams.scm b/etc/teams.scm index d537e83efc..73f57d7f1e 100755 --- a/etc/teams.scm +++ b/etc/teams.scm @@ -273,6 +273,7 @@ (define-team emacs #:description "The extensible, customizable text editor and its ecosystem." #:scope (list "gnu/packages/aux-files/emacs/guix-emacs.el" + "gnu/packages/aux-files/emacs/comp-integrity.el" (make-regexp* "^gnu/packages/emacs(-.+|)\\.scm$") "gnu/packages/tree-sitter.scm" "guix/build/emacs-build-system.scm" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 28 13:45:58 2024 Received: (at 70632) by debbugs.gnu.org; 28 Apr 2024 17:45:58 +0000 Received: from localhost ([127.0.0.1]:51435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s18b7-0001z8-SH for submit@debbugs.gnu.org; Sun, 28 Apr 2024 13:45:58 -0400 Received: from mail-mw2nam10olkn2089.outbound.protection.outlook.com ([40.92.42.89]:10665 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s18b4-0001yx-No for 70632@debbugs.gnu.org; Sun, 28 Apr 2024 13:45:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WV0iEsMjtpriDO6vRM7bLaE6+WXMF+ZXwbxCHqtdtKXR6q4x4HE1I2OAGSxUx9zGM29ejwHUL64NKxwB7foy5n+UESfufmRBOBsWd/8T7fak+oQp7WPmPAGYuE/tjf2xjPfTouNyjmauOaGUE79/Cx8dLUzFqYpBkJUyFPZuZZkWAt8DBwubIn5eDyv4tsD1/pJ59O5/V1o9kN4sTL4q/IbIFrWWUN22IBTo5mHRuBNrIfGMkOR1mvpakXgnCNONSdsHD4JN8cSAGN6sn4h30ez8RmyUSStU0r6BVu4eCzlQCRNHdA1PvNyfUPBk6C3dtthbtXNYRtVsXdnAmZQ7aA== 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=z75/Wd5gNuxrRMNlpcjK28EJr6uVhXAKDhccp1BHFaA=; b=i64TMKQtO4bxEFu/1yPNXzgSZKQKlRUdVTJvqOC8ToUZFO1NdJQ0BMh/gkF8wavdA3l3qiB2HYe3K0QVbp9DZyAyHMcg6oxLcW5YVipAQrrFv5aB2ef1zytfM/NrYxuM13lxeIN3i7uecQdbD2MKJWQTaQhZkccH37cHlTlqwl2cFr+/jUs4CeAN50OgFX87DeMmS03f9d4n3mueA+XWpQ4KmJqRAL7kuM9HdAs9E2WkZ35+BI2HZb4dI/bF3oHzg2uyhZv9zJJ2VmkfsIrK9qeWS7zAUi927ypnPQOgDvazI2+2yaXsfvmlsTeXwdYurhjF0gS+FFKVU5YpFqWsgA== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=z75/Wd5gNuxrRMNlpcjK28EJr6uVhXAKDhccp1BHFaA=; b=m3a4Gnl+jouuH9SJGuCNkSs5bi0Y0l/jQMpbTgRf3cO1xDgb3Ew9fa/xRp0lTMDH37itOJFQBBwLZfMZZcdKEpp5ZRl6SSOh6nlAAvllJ6FUwI6MXAvYegixsJZ6PxHc50BcfZofwme5ub64Mp4kOonHyQE/E7ERaymShG3C6otRKZ0H0RjsGyX6w+IbSlnLdg5Jz8KR5Oha7LGJFQr8S6S4loQ9VZJIqwDLXQcXzL7ym9x7Avxiv8xqaJWX823AsplUWSIhaeXhYHvlawqYYnrstCTtgG3SyOTbfNMYD56VK80CCSwBbYNATJWs4CC0IWzqsWBo4hMhee+ROui2Gw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH7PR84MB1677.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:150::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Sun, 28 Apr 2024 17:45:27 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Sun, 28 Apr 2024 17:45:27 +0000 From: Morgan Smith To: 70632@debbugs.gnu.org Subject: [PATCH v2] aux-files: comp-integrity: Adjust for newer emacs. Date: Sun, 28 Apr 2024 13:40:51 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [6GD6AEZ1PNRNK7Lpg1af5fKv3nJZeclP] X-ClientProxiedBy: YQBPR0101CA0316.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6c::10) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <29d9cd5e76abd61cfb02935e165186268a36dbc7.1714326049.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH7PR84MB1677:EE_ X-MS-Office365-Filtering-Correlation-Id: b57251bd-0810-42e0-089d-08dc67aafcff X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: KXIqEH4q0KZXz+TjFBK82B1bcvxefwIQSWa2G5TBVGNM0UDHM/B98DqX6Vvpi3vpo3cxV2okja0br0fH3OIP2+vvVqPWqY0abQ0Hjf2ujIvGXxFOz52xQbu/fphLDTSeus88u2cEJahuFRh7VdcSGW+9bVkSC16o5KQzVfCS0MWSBdUbaHDb4mKYPttE3pB6F8GUVjZBUwUVuW50ozdRucdowUJ8NmQMyklLRGscFeihQKURuhmv2WZw372V4sR0YBeOJI4QUlYkx/LuimetJ1+2ic/QtMKfvPA97Jakmf1NJwmbi3HfbvE4Wpml6CYmRcz3E6HM9qa9S3UtmHjN7aPPDhuHR4rhadoKDY24m3KgrSpp2ooNx1LE0IcxQ0nkjLNKx27zcnqRt3iZppuRdq9qXUI1I8a8SyKFwJOLCZSVAMvCbFJgygvW7kQG8UHHLAW9fbngebqxDwp7yePUiwuE7/ru5JiXVbSzlaKnDKPlQe76nkfUlrCxbFhFVfXYR7KAuUtGoDoPrrj7ApQkCN1135NLVigwQhs7ndyBSiEQ0msfUNNAN9S9QgbpbyMEqO/kGSOojTsUjhoIl8xi749ID+47Kg9TBlINJtTKb10kF951iUTxnQIJoXQVYiwA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6FkvmO91uk9nxAIg7pKDW0xE0dZxwaprGrSk+S1XTJm2Tu4ursiz9DDclOhj?= =?us-ascii?Q?wLABr70+coQqrwidAvFAP2zDkRdj2mBKl/05qTsIdmJZjZRfymmM3xKRf1zu?= =?us-ascii?Q?oU9XLVyVMxWd/f9kbroLzYUWMdOZfuO2f3hkTNQrsG+VmbHirPSBHEp5xU6z?= =?us-ascii?Q?U9LbAeEkWJBf09T9n14c/y7GwFsJM/DpK+fWb4IYkO4mEnveKIs0ojaFqDPX?= =?us-ascii?Q?MYtrwm7Nf//EBiHIQDKgugvdjsB3QvrFOAWAz1rTxTgohBzVTumLOWDgFM5D?= =?us-ascii?Q?nDKSE3PF6l+95nP1AEhW+VdyEpHy+pI03c5RYpHaG40ZloYe3kayskAx3IIU?= =?us-ascii?Q?LxR8I07vYDzCHR8iitst2elcxGixajXSnsDUj0FyWqPi30M2d/D0FQwXEeFd?= =?us-ascii?Q?kYyDdXj2JP4vL7y+9ohkiudVxuHB7DuNL+3+/Cj27RsnUrq+S5n6mlZ61MBf?= =?us-ascii?Q?WFw5utoA5cdg2soq9PxzldaA6iluw0SxSW3bfxMD3BNHQs5K6biB4BBd9exr?= =?us-ascii?Q?Hrr9l+Ro4q5UcFTsHhZfbjSFLDDKzsJwinVuo/dij7hU8XsJX63ofPgDa2nt?= =?us-ascii?Q?/2NbPWkHUSkXz5DTqBiBqawC8iTdb5nzWTnWNsuuuz0cQtejxDhc/iXNOZPu?= =?us-ascii?Q?lH1djrCYqS5yuSJTXWNQUan1FMzeR4UkasvgWSg8bqe8hT2rgzbyKxwn7rqY?= =?us-ascii?Q?N63KdWU/Zsgqfi2eN01HsNt+Vto+xaTp9beD0Q6gfIGeMJ81HYSv1KyynOM4?= =?us-ascii?Q?MxTAewrsQqGX3ZfWKohdWIK8MkPVMWMy+ZOmGQVzdSqojC01rCUCFnD8AiOg?= =?us-ascii?Q?qNcN45C5pGhysIEB65ZM53bW4JCu0NH9EQKJIFZgq1uMe2NuKBGOxqLP/hQ2?= =?us-ascii?Q?Jf+g8t8oORizWs55ShkWMAxTeCRAfJVgvDjR8iFFnRvwTYXE8xBEbbtYVTsz?= =?us-ascii?Q?nVO8LACGIdG0eAbOMEtrZZNsWXlPVI1Z+jRy1BV9eQveQzYBBZrDEckIIm0j?= =?us-ascii?Q?56O6PD41PPuxKIAUgXGLUsdJOXGQt4/yXNn/Gz5cdBLgVFJJAw281wCbYVAS?= =?us-ascii?Q?UZovpjNMnYhjvAyKp8J7Jv+ifdM+Imq/Embw97V/Q8Q0Q1p6AZ3kPPVFSuEf?= =?us-ascii?Q?TZA12l3sZGbpdRUiUKnzEpObakpF8uoX9Mq0IT+CbBkoqw2SjvikPJ6crbKP?= =?us-ascii?Q?KjjtNlFyGb2j8+5FQktfFuZtDOaL44uI1hW8sFqbLFIZQX9pjA/5bI/pRz89?= =?us-ascii?Q?bjLgGlrUrxIdJm9oQ+ss?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b57251bd-0810-42e0-089d-08dc67aafcff X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2024 17:45:27.4509 (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: PH7PR84MB1677 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/aux-files/emacs/comp-integrity.el (expect-help): Update with new terms for function descriptions. Also return the description instead of 'nil' on failure to aid in debugging. Change-Id: I63a3644c91dd7817a72ab11ae87ec4fc8fdb2c1b --- I apologize. Two hours before I sent the original patch they changed the descriptions once again. This patch is the same as before except instead of "compiled-function" we now have "byte-code-function". gnu/packages/aux-files/emacs/comp-integrity.el | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/packages/aux-files/emacs/comp-integrity.el b/gnu/packages/aux-files/emacs/comp-integrity.el index abe7e7c0c9..0c11100d22 100644 --- a/gnu/packages/aux-files/emacs/comp-integrity.el +++ b/gnu/packages/aux-files/emacs/comp-integrity.el @@ -16,10 +16,16 @@ (let ((desc (substring-no-properties (with-output-to-string (help-fns-function-description-header ',fun))))) - (cond ((string-search "native-compiled" desc) 'native) - ((string-search "byte-compiled" desc) 'byte) - ((string-search "built-in" desc) 'built-in) - (t nil)))))))) + (cond ((or (string-search "native-compiled" desc) ;; Emacs <= 29 + (string-search "subr-native-elisp" desc)) ;; Emacs >= 30 + 'native) + ((or (string-search "byte-compiled" desc) ;; Emacs <= 29 + (string-search "byte-code-function" desc)) ;; Emacs >= 30 + 'byte) + ((or (string-search "built-in" desc) ;; Emacs <= 29 + (string-search "primitive-function" desc)) ;; Emacs >= 30 + 'built-in) + (t desc)))))))) (defmacro expect-native (fun &optional feature) `(progn (expect-help ,fun native ,feature))) base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 14:45:26 2024 Received: (at 70632) by debbugs.gnu.org; 29 Apr 2024 18:45:26 +0000 Received: from localhost ([127.0.0.1]:58591 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1W0E-0001Ei-6M for submit@debbugs.gnu.org; Mon, 29 Apr 2024 14:45:26 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:46250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1W08-0001EW-MS for 70632@debbugs.gnu.org; Mon, 29 Apr 2024 14:45:25 -0400 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-5727dc6d3edso1827435a12.0 for <70632@debbugs.gnu.org>; Mon, 29 Apr 2024 11:45:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714416294; x=1715021094; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=gjx7eB9KJ9dJDpzB1+5FUG+EbuLoinBYq1RKfqy9vcs=; b=WM4KasvD6ic61E3ErhmiU66nHo418NVnw15/u4uxkL9QJTbhIDDWRvWqJKAfVuTmEP fST8CfRb+5nUFAm0CsCLh7brqRga9GLYtOlqEa6YkOFgr4qFnSMohx8RS/QVzJpMG0VS 7/z/QqSW1HG8QgaXVeQM0G+3UVn4RWw8PKm+0McNwkgI4C3ih+Jr+fl9QHstPRRWpOO0 /RKdXj6JX90cA6oBoTgE9oPZQZJDNT4G5aocP2Hnv0l5UYFKlaJja4kb+njeiSgBJOBE uDCB4zlhLzOHbvo9EK04clrlyUCXlpYx75oNsAYcy4/kPhenjtaVmWOLRhIrEfXEiodf rkyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714416294; x=1715021094; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gjx7eB9KJ9dJDpzB1+5FUG+EbuLoinBYq1RKfqy9vcs=; b=Yh+ta3SsqRGKVTBDl/C9QU1fc5KyGYamljJrk57Jj9cWIlQzvxbfyrOkIXBatYAHIx Zl7ojxCMFCuhF5Geb1LTVLHcni0vtc4xJQvCrTWOa0mA3x/i8uoZZi42xV9EqrWCrfnI ggCJod6WPl02tY1rh0osFcTnFEXFaGbobxBy8db0DhGjXLhOhj991CHVMJ+enj/6Oi48 7AiNzkvHxPTlmrERdWQxoEuk3VRxQm/tnC1PtUN7QV3ipHcN6tbHoSoxq9wl3HCS4xgl 4r4BhXuVuIGLNZEc1SPqKDa5l9KGgindpz9Ho5ao6C71X3XsRBxT2stxm1l2WRRUNymK M0og== X-Forwarded-Encrypted: i=1; AJvYcCU0I+qwkfw1b+81ywudRgE0oY1nLFXE/Zp91SX6SLChcAPEFszNAkxuAY9DHfMYD/WSefdmSvKI9Ym8hz6OShFPrRrytYE= X-Gm-Message-State: AOJu0YxufCpAtRzEfG/oLdMXk6tbeM2CjVzeZx4b/HqtaW2hQmhucd+c pVKTS4pGDq152ZurpMyuRhPi/18GvQ6kYIiHJGKi7Deh+n8ozzYm X-Google-Smtp-Source: AGHT+IGZRVEWbNm5aTuDkumUKif8MM+Alz05+Cs+n3ajI7z2Tv2J8SAtKftgNCEJM3kMfcs7mnzhLg== X-Received: by 2002:a17:906:f299:b0:a47:3312:b32a with SMTP id gu25-20020a170906f29900b00a473312b32amr285174ejb.58.1714416294266; Mon, 29 Apr 2024 11:44:54 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id u8-20020a170906654800b00a58f15b070dsm2615990ejn.43.2024.04.29.11.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 11:44:53 -0700 (PDT) Message-ID: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. From: Liliana Marie Prikler To: Morgan Smith , 70632@debbugs.gnu.org Date: Mon, 29 Apr 2024 20:44:52 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) SGksCgpBbSBTb25udGFnLCBkZW0gMjguMDQuMjAyNCB1bSAxMzowNyAtMDQwMCBzY2hyaWViIE1v cmdhbiBTbWl0aDoKPiAqIGdudS9wYWNrYWdlcy9hdXgtZmlsZXMvZW1hY3MvY29tcC1pbnRlZ3Jp dHkuZWwgKGV4cGVjdC1oZWxwKToKPiBVcGRhdGUgd2l0aCBuZXcgdGVybXMgZm9yIGZ1bmN0aW9u IGRlc2NyaXB0aW9ucy7CoCBBbHNvIHJldHVybiB0aGUKPiBkZXNjcmlwdGlvbiBpbnN0ZWFkIG9m ICduaWwnIG9uIGZhaWx1cmUgdG8gYWlkIGluIGRlYnVnZ2luZy4KPiAKPiBDaGFuZ2UtSWQ6IEk2 M2EzNjQ0YzkxZGQ3ODE3YTcyYWIxMWFlODdlYzRmYzhmZGIyYzFiCj4gLS0tCj4gCj4gSGVsbG8h Cj4gCj4gVHJ5aW5nIHRvIGJ1aWxkIHRoZSBsYXRlc3QgRW1hY3MgZnJvbSBzb3VyY2UgZmFpbHMg YmVjYXVzZSB0aGV5Cj4gY2hhbmdlZCB0aGUgbmFtZXMgb2YgdGhpcyBzdHVmZi7CoCBJIHdhcyBh YmxlIHRvIHN1Y2Nlc3NmdWxseSBidWlsZAo+IHRoZSBsYXRlc3QgRW1hY3Mgd2l0aCB0aGlzIHBh dGNoLgo+IAo+IFRoYW5rcywKPiAKPiBNb3JnYW4KPiAKPiDCoGdudS9wYWNrYWdlcy9hdXgtZmls ZXMvZW1hY3MvY29tcC1pbnRlZ3JpdHkuZWwgfCAxNCArKysrKysrKysrLS0tLQo+IMKgMSBmaWxl IGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdp dCBhL2dudS9wYWNrYWdlcy9hdXgtZmlsZXMvZW1hY3MvY29tcC1pbnRlZ3JpdHkuZWwKPiBiL2du dS9wYWNrYWdlcy9hdXgtZmlsZXMvZW1hY3MvY29tcC1pbnRlZ3JpdHkuZWwKPiBpbmRleCBhYmU3 ZTdjMGM5Li5kOTY5ZjU4NjIyIDEwMDY0NAo+IC0tLSBhL2dudS9wYWNrYWdlcy9hdXgtZmlsZXMv ZW1hY3MvY29tcC1pbnRlZ3JpdHkuZWwKPiArKysgYi9nbnUvcGFja2FnZXMvYXV4LWZpbGVzL2Vt YWNzL2NvbXAtaW50ZWdyaXR5LmVsCj4gQEAgLTE2LDEwICsxNiwxNiBAQAo+IMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsZXQgKChkZXNjIChzdWJzdHJpbmctbm8tcHJvcGVydGll cwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKHdpdGgtb3V0cHV0LXRvLXN0cmluZwo+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChoZWxwLWZucy1mdW5jdGlvbi1k ZXNjcmlwdGlvbi1oZWFkZXIKPiAnLGZ1bikpKSkpCj4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgKGNvbmQgKChzdHJpbmctc2VhcmNoICJuYXRpdmUtY29tcGlsZWQiIGRlc2Mp Cj4gJ25hdGl2ZSkKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoCAoKHN0cmluZy1zZWFyY2ggImJ5dGUtY29tcGlsZWQiIGRlc2MpICdieXRlKQo+IC3CoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoc3RyaW5nLXNlYXJj aCAiYnVpbHQtaW4iIGRlc2MpICdidWlsdC1pbikKPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodCBuaWwpKSkpKSkpKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIChjb25kICgob3IgKHN0cmluZy1zZWFyY2ggIm5hdGl2ZS1jb21w aWxlZCIgZGVzYykKPiA7OyBFbWFjcyA8PSAyOQo+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc3RyaW5nLXNlYXJjaCAic3Vici1uYXRp dmUtZWxpc3AiCj4gZGVzYykpIDs7IEVtYWNzID49IDMwCj4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAnbmF0aXZlKQo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgob3IgKHN0cmluZy1zZWFyY2ggImJ5dGUt Y29tcGlsZWQiIGRlc2MpIDs7Cj4gRW1hY3MgPD0gMjkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1zZWFyY2ggImNvbXBp bGVkLWZ1bmN0aW9uIgo+IGRlc2MpKSA7OyBFbWFjcyA+PSAzMAo+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgJ2J5dGUpCj4gK8KgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKChvciAoc3RyaW5nLXNlYXJjaCAiYnVp bHQtaW4iIGRlc2MpIDs7Cj4gRW1hY3MgPD0gMjkKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN0cmluZy1zZWFyY2ggInByaW1pdGl2 ZS1mdW5jdGlvbiIKPiBkZXNjKSkgOzsgRW1hY3MgPj0gMzAKPiArwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICdidWlsdC1pbikKPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAodCBkZXNjKSkpKSkpKSkKPiDCoAo+ IMKgwqAgKGRlZm1hY3JvIGV4cGVjdC1uYXRpdmUgKGZ1biAmb3B0aW9uYWwgZmVhdHVyZSkKPiDC oMKgwqDCoCBgKHByb2duIChleHBlY3QtaGVscCAsZnVuIG5hdGl2ZSAsZmVhdHVyZSkpKQo+IAo+ IGJhc2UtY29tbWl0OiA5ZjE4M2MzNjI3YTAwNmU4ZmQzYmI5NzA4NDQ4YmMwNWE2MjA0ZTZkCgp0 aGUgY2hhbmdlIGl0c2VsZiBMR1RNLCBidXQgSSB0aGluayBpdCBzaG91bGQgYmUgYWNjb21wYW5p ZWQgYnkgYQpjaGFuZ2UgdG8gRW1hY3MgMzAgYW5kIGFsc28gd2Ugc2hvdWxkIHJlYWxseSB0cnkg dG8gdmVyc2lvbiBpdCBiZWNhdXNlCml0IHJlYnVpbGRzIEVtYWNzIGFzIGEgd2hvbGUuICBUaGUg ZW1hY3MtdGVhbSBicmFuY2ggaGFzbid0IGJlZW4gdXNlZApmb3IgYSB3aGlsZSBhbmQgSSB0aGlu ayB0aGVyZSdzIG5vdGhpbmcgYmlnIHRoZXJlOyBhbmQgbmVpdGhlciBpcyB0aGVyZQphIG5lZWQg dG8gZXhlcmNpc2UgaXQgaWYgd2UganVzdCBhZGQgYW5vdGhlciBmaWxlIGFuZCByZXBsYWNlIHRo ZQpwaGFzZS4KCkNoZWVycwo= From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 16:43:25 2024 Received: (at 70632) by debbugs.gnu.org; 29 Apr 2024 20:43:25 +0000 Received: from localhost ([127.0.0.1]:58778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1XqO-0002vX-J8 for submit@debbugs.gnu.org; Mon, 29 Apr 2024 16:43:24 -0400 Received: from mail-dm6nam10olkn2095.outbound.protection.outlook.com ([40.92.41.95]:20833 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1XqM-0002vQ-7Y for 70632@debbugs.gnu.org; Mon, 29 Apr 2024 16:43:23 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FxVGgf/F5VuT1cwjBc+4rU5DOo3PpDkpB75e9MCwKEvyOMK7a2KXntifXKvCUYVgyc74VEuaruwAeuHgXr8N+F+wm6uG6JHIIw8F6q3oa3/APkZezVUFJY2hZXjKrUS6GtQUr9Hdr1fh6CQoo6yxbPZuuv6U/0+A9HPRQ1h0FrH7Pn/milWhEXk2ujXsyeqTw1cwwUOCml7q/AaqNBDvagVF5K4V6qHfWI1e56efDbYVy3PDvd8i7fw9t/B5+5eYei5tUKnoTYy3DNz5OlpJgbOCft1ukpTQlEcQimtOt2hRrjGgPnws9FhJTxt57j5/3kPQZv+8glDqTGnGUtvgKw== 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=9lZBzaKcgLLYehGQ+cR9v7NEgDcrZ7t4ulSzjeqtWvY=; b=HSmsSncst4crAO/RBZgtk9VTPtwfsi3Hn30GO2bBtA4b2NxVIqWtKtuHhddLFeho2bMCUsUygemX1JTN5FkRS8kKfhZjgaXKucr2RNRAGNtXGbsgXpzL+gSX7ezofdOZNZ6oVkKgoWwOF2sYeNyJ0y/ONYLuR3NiHhOoUXB/fJM9ArkkLIaQu2dXVcNC2Wr5htpEkxgvQwXVoVJzuZb5PTaGo5njGVs8D/j3m2ELnNVxFO+sLrCLnNXYM2a1vR35/aLEEMS+Pkj3Q5BvGOB3nYZqhzfveVyI+baDZHXdkBgHNZj3FxjaP9BIMdeAIRq99wmFHaKADo/1y47JwmgEpg== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9lZBzaKcgLLYehGQ+cR9v7NEgDcrZ7t4ulSzjeqtWvY=; b=UcD4yXnrTMhe396OLqG3cunFrlYtF1nGyWZFSDzpKQgv9Ybb1zAJmtk3NonswVPlw9iPZvfKajd4RLql1UOp3sGvgAWvp92J/fZnGSanrEE65HPElWKPAWKYCnM9WDba3gpT+WQvO2nD8sjxhPuB6KSH/XeX3c7imtyrOC+GwFB0UBf04jHGxcIIm4d63QHpFSRYyHcB5L2bEtvdBFpxZ4/BPI+Tk2g9CO0C9YM1DX8b4B7sbHblEI5joJYc5BkLbqChREgNq+OmORQfQReqPRCe/HRhcTEnFwsZk568CmTxrmi7LNqKem70723QxWUjvY/l/GacpE4XBMIdlhw14A== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH0PR84MB1812.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:163::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.36; Mon, 29 Apr 2024 20:42:54 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 20:42:54 +0000 From: Morgan Smith To: Liliana Marie Prikler Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. In-Reply-To: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 29 Apr 2024 20:44:52 +0200") References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> X-Hashcash: 1:20:240429:andrew@trop.in::r4naJ33dpjV6SWXt:ze6 X-Hashcash: 1:20:240429:70632@debbugs.gnu.org::eumsX4msJ+Cx8zHn:1F5L X-Hashcash: 1:20:240429:liliana.prikler@gmail.com::T9IDNNY7NORCsSJA:0odD X-Hashcash: 1:20:240429:cox.katherine.e+guix@gmail.com::wuH6PGKhqMioa0I4:3eSL Date: Mon, 29 Apr 2024 16:43:06 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [JpQr1cp056XgTIo19MnNH34Gy6MKuh/X] X-ClientProxiedBy: YT4PR01CA0371.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fd::20) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <87sez3zyqt.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH0PR84MB1812:EE_ X-MS-Office365-Filtering-Correlation-Id: ef9f4b19-4cc1-49ff-9b61-08dc688cf1f1 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|6092099003|440099019|3412199016; X-Microsoft-Antispam-Message-Info: 7y+uTeW7nRAFU7MT3PEau4CSUYCDWbCKC9PUjFURGAb7+e7AConMyOHkYiXwYOsLp/vsSwyXmxDh38+2KUQzGSLiTZ58IBYVfvYGtSk2MSzVfwpN8loINOiUSNQT5aGQ71l7Rqh19q8OYxSR3nyUDs+cgd1FH/HJ+aUPWnIhznm5uZ0Jj68wg0ioRBTOHAXYOlG9QF9HozQjbdUueN10tW5ChJme4P4Z1RI7Db98mXyPFF6NQjEEn9Kyb3wK2ox8ZIoKKd++Xr4A5DQrHSk5V3znbMs2+b2s8jJh/TzG9UBmoGG4xSpsIR0TzecQHMTG2UWzgc8EqEaAJ8owEAkiYilcYK82TA+ZEV9eGEqiXdxk4OcnwJn7zwxxUu6JSXvdaSqK45EcRwgkTOqkNqazLoga0TzjuYSQFG+7UNB3q9FgUzE4F+Jqm56wJUvcyuivfoZaF54HUOgsf6dauPi2+7dyGLtV60tTGMrQEfJmdSGcaqeoKf1JFx4v0QPk2gvmSxrT/FowlVQEHktrBd/TjTftiGueiKjxaCOjP5zqK95xPEYz6xrbSi3akRmHj6esEl0qAb4No0QO222bwfAUyZyD/sgmQK1QThzZO5kqy2fEB+bD/F/83v1dqOfViETJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bRbAoxTpgA3Fv+VzL7Ho1fnV7HXriPySWk7zHovMQ2I88EUBBExOYidI8Cj+?= =?us-ascii?Q?p0ROulVzMexd+bJtLmunx1I+i3AlaD7mu4Yy0cBs1PNh5ukRe4tUjnEAq8VQ?= =?us-ascii?Q?CV8Aq8C5+jq2ZPtkftKUcaJ+1MnAsu0qAnO4GLPf9O0Fi5IWQ6AqbA5jKJJv?= =?us-ascii?Q?3Usqw8x0pGvaWGbKlJp5Fyzz98G80n7iLWWbiiglpFBB/NlmZpUQHTDhIda0?= =?us-ascii?Q?Ssyhvf6q2BcVOjKkA+9ze+KGJkt99plqaEO+C5boXtRdEQoZtYlsBbZCU2Cn?= =?us-ascii?Q?1HF+HkRLBVOf66TlELjlbKf1BU537LAoi/xhgZ2tY/Dz4KVsiActLPumCbzI?= =?us-ascii?Q?0B3lAorT3Xvp8L9tX5Dda6DsGGhGJHlb8mS9pwDmgi0T+29Gf+RraE2VfNmc?= =?us-ascii?Q?wJJTzKkAZqYVW5K7PGmZrlUvOfe51tEdNIELcCdo5vmx7SbMj+gqReyayTTg?= =?us-ascii?Q?QbfbOrDF1l0sjSqwWxonPxXt9TL/VUirSQDV2yiu3/HjD1NCq4d28OV3CeRW?= =?us-ascii?Q?3Or0WhezU1aSlOvb8017tyMiOUA9OPVZuc2fkwk/R1fhJocJiGZN57Usz1k2?= =?us-ascii?Q?DS8BxvL2Qjl6X4zo/p5cFluD4cVDTTgnSP2IjB7faFa0r4aVwPjbzozCcJ5a?= =?us-ascii?Q?3VspIANPn5WWJPmLtxiSz2cdmmjj32B11AiGH8KAoCCJAIL8o5DGpBCrnDSL?= =?us-ascii?Q?TUa2AHWwiPMzLRg6EBMevqQN3+NtN6ZwdUe2x4R8PnFXpHvg8yeZJtFVUTbb?= =?us-ascii?Q?+t71NXdjnkN75ElboVnkq5EYR7sYiHpkhqeMZdJPtFpWIlu8RaalpWThExXP?= =?us-ascii?Q?iGtpZrphdXytRBIwHCT1b+vPnzsrXLBVGmF4ObSLqXylUP0hGWPW9bJl7xOY?= =?us-ascii?Q?vEIiX+SkSRx1kkB5SjbXcrdA8pYKgGFSL7RzdSBOqLqO6QEHn2FIUnvT6Z+o?= =?us-ascii?Q?Pj73jAcY7YCsK0CZ79ft0TS2htKxk8AzHrqaLBYdBTb6fdqcgfGb2fd3kivc?= =?us-ascii?Q?x95eLnljmCabkG1sh4eIAxZCJ1z6hBNlcQRSztF9stmISHO2Fh0FhPuTvtIQ?= =?us-ascii?Q?mYqUCJo1ceqKCMrIZEgS/LzD9Nyrp4ftTcjvc3a9PGqsx4wDMjyxLDTzMZrC?= =?us-ascii?Q?xidfFJaVAWWHRJzMKyphXT6I2ZMrfYX1ZO5kTx8cqw+UvNe1pLA+JjX0Nosk?= =?us-ascii?Q?KtMH6SKF19kDP6Uh0NKVwNyzVq/d0CPPjcvlkGyDcEqV6C/0NTbZrBmrEvkb?= =?us-ascii?Q?Dx0wRPdoZzRf5iVZxCx7?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef9f4b19-4cc1-49ff-9b61-08dc688cf1f1 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 20:42:54.5959 (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: PH0PR84MB1812 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Liliana Marie Prikler writes: > Hi, > > the change itself LGTM, but I think it should be accompanied by a > change to Emacs 30 and also we should really try to version it because > it rebuilds Emacs as a whole. The emacs-team branch hasn't been used > for a while and I think there's nothing big there; and neither is there > a need to exercise it if we just add another file and replace the > phase. > > Cheers I think some people might want to build newer Emacs's before the 30 release. Like how people wanted the pgtk and tree-sitter features early. People might want to try the new GC that's being developed. I'm not a fan of adding another file so I came up with this solution. See attached patch. If we believe that a core-updates merge will occur before Emacs 30 then I would like to see my original patch applied there. Thanks, Morgan --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-emacs-next-minimal-Update-to-30.0.50-3.ccb49ac.patch >From 0440fff5e554d442a113579fbc1330c05da98f6a Mon Sep 17 00:00:00 2001 Message-ID: <0440fff5e554d442a113579fbc1330c05da98f6a.1714423314.git.Morgan.J.Smith@outlook.com> From: Morgan Smith Date: Mon, 29 Apr 2024 15:27:59 -0400 Subject: [PATCH] gnu: emacs-next-minimal: Update to 30.0.50-3.ccb49ac. * gnu/packages/emacs.scm (emacs-next-minimal): Update to 30.0.50-3.ccb49ac. (emacs->emacs-next): Adjust 'validate-comp-integrity phase for newer Emacs. Change-Id: Ib191d6044a4a3b56931f893c71dc998fc748245e --- gnu/packages/emacs.scm | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 411bea3ab6..022aac416f 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -553,8 +553,8 @@ (define-public emacs-wide-int #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42") - (revision "2")) + (let ((commit "ccb49acd2afb8cec9cec1afba16e16420b9f9261") + (revision "3")) (package (inherit emacs-minimal) (name "emacs-next-minimal") @@ -567,7 +567,7 @@ (define-public emacs-next-minimal (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk")) + (base32 "1hxwaqjm596yykq42wl28jicd0b8rqcabyb5xp958sirr3yi884b")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -585,7 +585,33 @@ (define* (emacs->emacs-next emacs #:optional name (string-drop (package-name emacs) (string-length "emacs")))))) (version version) - (source source))) + (source source) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'validate-comp-integrity + (lambda* (#:key outputs #:allow-other-keys) + #$(cond + ((%current-target-system) + #~(display "Cannot validate native-comp on cross builds.\n")) + ((member (%current-system) '("armhf-linux" "i686-linux")) + #~(display "Integrity test is broken on armhf.\n")) + (else + #~(begin + (copy-file #$(local-file + (search-auxiliary-file "emacs/comp-integrity.el")) + "comp-integrity.el") + (substitute* "comp-integrity.el" + (("\"native-compiled\"") "\"subr-native-elisp\"") + (("\"byte-compiled\"") "\"byte-code-function\"") + (("\"built-in\"") "\"primitive-function\"")) + (invoke + (string-append (assoc-ref outputs "out") "/bin/emacs") + "--batch" + "--load" + "comp-integrity.el" + "-f" "ert-run-tests-batch-and-exit")))))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) -- 2.41.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 29 17:38:56 2024 Received: (at 70632) by debbugs.gnu.org; 29 Apr 2024 21:38:56 +0000 Received: from localhost ([127.0.0.1]:58834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1Yi8-0003X9-HN for submit@debbugs.gnu.org; Mon, 29 Apr 2024 17:38:56 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:49318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1Yi3-0003Wz-Hm for 70632@debbugs.gnu.org; Mon, 29 Apr 2024 17:38:55 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a58d0aea14cso443524666b.2 for <70632@debbugs.gnu.org>; Mon, 29 Apr 2024 14:38:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714426705; x=1715031505; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=w/kc8nbtFTxzB3ItMkgyxdy5Pv8rWDL91iETr93cY1I=; b=ADNeONZ5GAJtDFMW2h5EbSwmdM5WJnev4bzPYFk/uRPKbTN6q/7AzaEMvhms4OeGL6 wD8jF25c6H3+e0rfYGYhu7sCoMbHevU9hSrLwBLk7MFHxAeEs/TXMhfHYULBkYW/GPxe YhFUPDAGYU1YHOkwCP0aQSdztDdqflcYOdEnSK8JeEDnthpGB3srzT1gD+UgI2ULbyH1 DIeaqQGuMCvcyaZr79Xc7iiNblJXuO+F+rmzb+IjB/F7gXNy9+vDNlxBliVOSVtsb2ki TYHZho+uq90pyBwGPtRH0CuJIODOn0K31fbiScFURfHk9WIGC4/wFWBQpWMnudwbRBcH WnFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714426705; x=1715031505; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=w/kc8nbtFTxzB3ItMkgyxdy5Pv8rWDL91iETr93cY1I=; b=G7ZGeuvWq116xXia6G8tTBUowHnEayh19OBwAypWPbFCHmsBaxlv5cEv98GzvfucYx LSXmrawy7kEaRyRsvSDbSbFXcQXQ8afli9UhoKIj/xgi1uPKYDaVlS3GklxKpGsjbXsB qzQiUpq4iWIIEmAbQG6DQO6G1tUOD7mvvADmI4g0Jua1rvk5CH+sJperT/7/Rmb/z5vj h811rbN03u3snDf/TftOuTEjJHdw+Cf+OibtDdcDQKWHS8qZpLS/DNM7LVET/B0buIEo ytSGMnx3Q9WxJESyp5XBCGnwzVL1LarBuiD0aWiePk8en0AhYFWobe/X6E63nJSWt6pj JjKg== X-Gm-Message-State: AOJu0YyxpuiGCRHc8Xu+VfrPWr1y9Cz5J8JJ5OytAVnEQUelysPTaN1A WNp1a2UgIdTjCwJy7aVVLu3UafMzuBbdRG61rITHPalMJNG0XWxP X-Google-Smtp-Source: AGHT+IFP0NHBqm86h7HDlRjftR9zqcBXBekWr16o8uWnEwOmfRydABQkP0GVQU+IIiUtn/EKSLF8xQ== X-Received: by 2002:a17:907:28c3:b0:a59:2655:4f8d with SMTP id en3-20020a17090728c300b00a5926554f8dmr40336ejc.65.1714426705178; Mon, 29 Apr 2024 14:38:25 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id h17-20020a170906111100b00a58e8d08b40sm3215770eja.21.2024.04.29.14.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 14:38:24 -0700 (PDT) Message-ID: Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. From: Liliana Marie Prikler To: Morgan Smith Date: Mon, 29 Apr 2024 23:38:22 +0200 In-Reply-To: References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 29.04.2024 um 16:43 -0400 schrieb Morgan Smith: > Liliana Marie Prikler writes: >=20 > > Hi, > >=20 > > the change itself LGTM, but I think it should be accompanied by a > > change to Emacs 30 and also we should really try to version it > > because it rebuilds Emacs as a whole.=C2=A0 The emacs-team branch hasn'= t > > been used for a while and I think there's nothing big there; and > > neither is there a need to exercise it if we just add another file > > and replace the phase. > >=20 > > Cheers >=20 > I think some people might want to build newer Emacs's before the 30 > release.=C2=A0 Like how people wanted the pgtk and tree-sitter features > early.=C2=A0 People might want to try the new GC that's being developed. That's fair and we aim to support that case. > I'm not a fan of adding another file so I came up with this solution. > See attached patch. Hmm, I'm a bit torn on the solution. On one hand, it is a local solution with just a phase, on the other having the file makes it easier to just mv it. > If we believe that a core-updates merge will occur before Emacs 30 > then I would like to see my original patch applied there. It'd be only emacs-team, not core-updates, but we could do this "quickly" either way. But the point behind those is to keep them small and manageable in a sense, so core-updates is typically not concerned with leaves or leaf-like stuff. Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 12:32:58 2024 Received: (at 70632) by debbugs.gnu.org; 1 May 2024 16:32:58 +0000 Received: from localhost ([127.0.0.1]:38277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2Ct7-0003c8-Ld for submit@debbugs.gnu.org; Wed, 01 May 2024 12:32:57 -0400 Received: from mail-mw2nam10olkn2074.outbound.protection.outlook.com ([40.92.42.74]:31681 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2Ct3-0003bo-M9 for 70632@debbugs.gnu.org; Wed, 01 May 2024 12:32:56 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GY2HY9ry8tmxcKBH6PVZ1l42EFN4m8PDwXYPmJCFL7v5RI8g5SeDBXXvY/G5caWbxrSZqAKtTIpFbymfr4KhcUJw9FA73J9tlLl6sscECtViCTYALgrUD+O1qJOoQpyYuT0R+FQbdT1/ywLRk7QZalrphxUnu/IMVAMXfxgt/JpWHNyO41B+NU4EQe12iY+iB1DKIIQLGhsxy9tq/SnA4r+cxVexbR4XbP7uL3GLWxRXsuYTYYBUjUG6ec8si63+EpP42WBjPhu4McECN+2v8OVNjyKt0c/OHLqOpwGIYPob8Qc79qCNzWwhtrEORnOHPnL4DfWK8YwhKyzo8nifeQ== 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=TzeUOaiEHMKYcVL39rcQ83uRhxdrhd8qMXuYMgMWNxU=; b=BQsIamkpR5tEO0pcMrEkPVJCqfxR4cr3aYDd2B1fqeCDxO2sFkDaApAkN2NUefvYz11eg7tCbM1iLyf0KFLmzkwbqSNQdbgNoiaqASvip3/084/K3RYBtd1/n83RVHOSsl5dSoIWgMMcfQ2s2gGozsc+yDVYXx7gRPOd3+MDqwlKqnOLO45xedShnCJkRZyYlLQngOq/z6VYM0RuWYE3hu0vBMqm9K30x7dCA8ikMK2FOAZw2N4KKXbdZMjWX/6dB3moWEsclWRXuNA9/o9GEs2G0HmfjButwKdymnua+SwuiE/2yvYMLWABYPfUt67ZzIw0BVgIMzm1TH0Jelx2EA== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TzeUOaiEHMKYcVL39rcQ83uRhxdrhd8qMXuYMgMWNxU=; b=n5My6rZ1ebhYUNoXP3Z6yX7bdvHA/1n+rV041U4iHXtQ2vqaTm4Q2Xio/Meaovjo/wK+9ORanxG8dhcpL2BpjFaiup/mh0GV5io1uYjS2GQKdS7X95DExOvhjxiDXlToFZo3nzu7QtUeM0OFr0o7OrdSmu4J0qMz1KGkE1wbcC0IPrFB6oh5h4mGTk3FfAqPLl683l1bGoUFQoTHt1UlYjnFBM/Q6+IfdXBbxJUQQJdhZMqt0jjayXTiu5LUVvxHYkPP0e9JJLcIsoSWt6fZh1ywhtEyEz9eAfeHZYqAC1SJtcgOuZuhmZIO3ZWM/26kL87EFgwR3awKcj0F4B18MA== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by MW5PR84MB1913.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1c3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.37; Wed, 1 May 2024 16:32:22 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Wed, 1 May 2024 16:32:22 +0000 From: Morgan Smith To: Liliana Marie Prikler Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. In-Reply-To: (Liliana Marie Prikler's message of "Mon, 29 Apr 2024 23:38:22 +0200") References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> X-Hashcash: 1:20:240501:andrew@trop.in::gnoO69cnSbidddB/:68m X-Hashcash: 1:20:240501:70632@debbugs.gnu.org::+NeuBBaLks45F3BK:0+Rf X-Hashcash: 1:20:240501:liliana.prikler@gmail.com::aOk3EPpVoNR53bLn:17Ev X-Hashcash: 1:20:240501:cox.katherine.e+guix@gmail.com::PoIljNHkOB1FuK0R:2qxx Date: Wed, 01 May 2024 12:32:19 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: text/plain X-TMN: [94O2FDI+CQmk+5fF5d64DwoPsuiFo02U] X-ClientProxiedBy: YQBPR01CA0152.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:7e::11) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <87o79pze5o.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW5PR84MB1913:EE_ X-MS-Office365-Filtering-Correlation-Id: 325a8a00-dffe-49e9-b5c5-08dc69fc46c3 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|56899024|440099019|3412199016; X-Microsoft-Antispam-Message-Info: i6VsRUixhUWboB1oK4kapTwlhhEGHEZxZcnS3SyOhHulOITKAOcKq7GZ3Mqyh0xHCHck3DD+nrX1pxiCEazEMLFQg6xTNbc7pY5u9u7EgqP/eu9YXcrNKE8Zdybnp7/Uo+3f3N/lv5rbKbHzNWS41oqS8J/yIAHtxQBskMZ1+osyJvBR90MPjH1dXU+e+26Y9jGX7m3wnfq4AOL73K/m3KfvsAZl2KaqpB0qHOAa1DdGirqNvIuZlRsYtUyGkq5mCflTIcy2p0p19rxRWonLan0r2RsQArX4tTeK97W5qstpnyzscXq8M/KW3DOfPJw/qnydNLGrG7PyqmTmftGpNkOaMevPcb1OW3QuD5044spAGOlavTgo6fPhHeJDlN3hsd0dlT45zNBvy72oRQB7t02l48hN7/cBDS3uW4TIUC8K0RQxS+pd8pyVahqOgDgZdPoOxOc3OgavN8Iycp9RGqA5XGPpfoUmk9Ea52GFp0bYKReHtPsPmHRgvSXkUJJ02VSMWXaO2VNKsWWtJWCi3b7zVD73iMbF5SOLXNVMHc+jO8kcXynQ6S/Cb1CK8kFt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dXGbCi8c5otFXUwJ9OQIfwBcvxIgYybANyn5WltRZkWf7djBk/QFKTNu2UWv?= =?us-ascii?Q?EJBg6JfwqmOTM+CtCpqvdFOYKUtwwjHkQBMgHD37JbH6QT1mjGkyEockX9js?= =?us-ascii?Q?3xwZC/u2WMuLAn9QsjH94YOpvZxaNKWhFpFYKyrQFm3feKO0PuO5osereTdb?= =?us-ascii?Q?E+N+2v7CG970dnkFl/Snhrnm56Vg3z+F47DwhrTNHTc1zz/G7rO2bUfALXwz?= =?us-ascii?Q?EUPfGXVYJBpsLQHwoLRJHY/Jg3/gpUrKWkKQJxs9q2TugUtlEEBdnBX8qQr1?= =?us-ascii?Q?PaAy5GtbpCIjZ5V65OPFfZzRn/sxrt75WMOZmvjR5PkBVEYnMoFjIGiZwn0T?= =?us-ascii?Q?asD/HgnXJVcbmJyDtsbq8rWWtt4Vik04o1ve4y9QQjnih8ERsX+66VtB2Fja?= =?us-ascii?Q?MR4/L+A1u13wz7Ahh9b6KN8JQjMDZwzmHC31ep+lSoMhMWjiC6Wj9SdVIP9T?= =?us-ascii?Q?VF5KihzLC0X02DzZILLDHGOk73rBrnx1yX9rfjosOXublhaiOQwuOHKMMUD4?= =?us-ascii?Q?YiKjl4+quiPc73lLwTMVK33RAYjsGjrIgA3qKt4drglxQqhDwdzqWpGkC36F?= =?us-ascii?Q?tfGzEjNbCCRud+inVGGlT2zom1vRVSp4mdaayyYiymtk9Oe48Z6rZLiOixVS?= =?us-ascii?Q?kznGPnC90g5GW1OoiCsALm3A23DSMyTv/KKRvc+QsQZq9ywBbf+nN/o442DA?= =?us-ascii?Q?55OOHisE8SWAN7NsEyXjFhCqscmZezNwzKDdSsSz4dg4lW1RNBbrKATzlBQS?= =?us-ascii?Q?Cu79C5iaGVXwLDkR57DHcvqEfGLxdJ+IbRocE38Usyg+zPsTC/+8PKS5uJOJ?= =?us-ascii?Q?tKkoHtms9Dpi/gorjkdCw86pd/6knaZN+6alA1D2VqoxmQEjcp3Y6slFyLX9?= =?us-ascii?Q?2v48Lc1LMDoOJnK+AuxrrnpOmoI2H3Xu7fDQcpojq/GXfMKPiSfJbr96Gzf3?= =?us-ascii?Q?4Mf0rp79gK43Lpu24uMQdcqsc+z/oYJO7eFM0sY860sYGCL6qAoxT8R27LAn?= =?us-ascii?Q?CzmHXl2zhM6FjV4L04C+tpjjYvxZM1g2/XqUeVvHJhi12jA6jPElI5Sh7Py6?= =?us-ascii?Q?xLD7pX4iGy4GrX5ZEhwN3UpUyDHayUbGg9Yb+4KEgipVZ0vCFv4aasZjjbGj?= =?us-ascii?Q?7Z3Mw8XtZqSWX1sdK4BZRvIcsUpp8WTV0JmKGJEIohq+Z6ftQgeqDeEdbGbl?= =?us-ascii?Q?3omxyLkXCERqQWS6HxXQWCmWJ9lH0oDnC7zrki+gHlRrP0qgIpUEHMugRcBm?= =?us-ascii?Q?gmyWCq1AE2pJ3o64O5m1?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 325a8a00-dffe-49e9-b5c5-08dc69fc46c3 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 16:32:22.1767 (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: MW5PR84MB1913 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Liliana Marie Prikler writes: > Am Montag, dem 29.04.2024 um 16:43 -0400 schrieb Morgan Smith: >> Liliana Marie Prikler writes: >> >> I'm not a fan of adding another file so I came up with this solution. >> See attached patch. > Hmm, I'm a bit torn on the solution. On one hand, it is a local > solution with just a phase, on the other having the file makes it > easier to just mv it. I don't understand the trade-offs here. I'm a fan of keeping data as close to where it's used as possible (so ideally in emacs.scm). I'm not sure what advantages putting it in a file gives over this solution. Just to be clear: what do you mean by adding another file? I assume you mean adding a comp-integrity-next.el file which is almost identical to comp-integrity.el with these small changes in place. >> If we believe that a core-updates merge will occur before Emacs 30 >> then I would like to see my original patch applied there. > It'd be only emacs-team, not core-updates, but we could do this > "quickly" either way. But the point behind those is to keep them small > and manageable in a sense, so core-updates is typically not concerned > with leaves or leaf-like stuff. I don't think I understand how our branch development stuff works. I thought we put large dependency changes on core-updates so that the CI could chew through everything and make sure it's good before merging. Regardless, I trust the team to do the proper procedures. I simply believe we might do more package fiddling before Emacs 30 and that potential problems might be assuaged if the comp-integrity file was more forgiving and supported every Emacs equally. Thus, I would encourage it to be applied in the appropriate place now to avoid potential headache but if we wish to wait for Emacs 30 that would also be a valid choice. From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 12:46:58 2024 Received: (at 70632) by debbugs.gnu.org; 1 May 2024 16:46:58 +0000 Received: from localhost ([127.0.0.1]:38347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2D6g-0003r3-3E for submit@debbugs.gnu.org; Wed, 01 May 2024 12:46:58 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:45351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2D6e-0003qp-2n for 70632@debbugs.gnu.org; Wed, 01 May 2024 12:46:56 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-56e1f3462caso9037144a12.3 for <70632@debbugs.gnu.org>; Wed, 01 May 2024 09:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714581989; x=1715186789; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=LpgBDTHlaIAeybSmbvHkPrMcjkbh8k/ncVzF7CpPoa0=; b=hTEU7ieH1iT5njlx1CFPraNBYyoo0ewzX3PfgDHkMfUz4THGPkQPdyVAoEq+6JTTrf CH2IxiGCwZ4ct9sH6J2gKvGtSTmk1M3+fbJWV554Vx4qTmOKs/7dKh5n5H+WCtXMrUZ8 i2ZR3ECbieSQkKBaVIM7fZLLNcHPoPQqrbQqWkWkcDE/wRRyV9TIgdUeWx2gJ3Ndn3PH n+j1/bfwaHhk5RqonMOHqIfwAdiBO2lnRXVbuxhgqh09rZsjbDLGcWhjST6PB2iBRpih 4nS9Q01GKBkTpv34ziOBpBGBSy3uRHImzbZ1wegGohyL/JYb9xDnBEK4IBtp6Y98Ccqh 0tlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714581989; x=1715186789; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=LpgBDTHlaIAeybSmbvHkPrMcjkbh8k/ncVzF7CpPoa0=; b=uALd2q0nRLxgXEivx5oWK/fdl768k2weN1La7VDkTjrPSIIBW/y4pIG0K+o5L68BLD bpH0GrUVtJlDcTEwEDIVdzzXwh/6wGvY7u+L15EbxYypgcgnOwPQoqjl1bY8gNHRzTD5 xWioX8QFYYEvaA/rmgYf+7eglZPtr4Phg8rYQBmeHsokkIrREsy2Obm6KfRmmbXsCZtY /r06KjzYy8l7WAN7Hyw90LuL0dEHHNdDaa2XJjLNd3Wxqbw34bl51SuFBealZGIuY678 p/cFR76OomoaAGpNZ4Zn2azVfLpBEpiBQfHA0vvLXtLXKqAYvblV6hMC3rwZHh1Bl+yI azEw== X-Gm-Message-State: AOJu0YwvmOmBJifPXQ23dwczayW2WiBlY5mn5QrHKvuUmxokO8neR+xg fjtCe+ravHlPDjjgafJbJNmYJBCl9zkfkfXfWipQOVjsCRPXlrGY X-Google-Smtp-Source: AGHT+IHAsAIwzuGyanBNFXy+trta1MMpqIcycuyR1ipizHhnP5UjomwcWqf4KFAZ4q37QXt9C8TPsA== X-Received: by 2002:a50:9993:0:b0:572:51fb:5571 with SMTP id m19-20020a509993000000b0057251fb5571mr1948974edb.5.1714581988666; Wed, 01 May 2024 09:46:28 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q25-20020aa7cc19000000b0057203242f31sm11575525edt.11.2024.05.01.09.46.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 09:46:28 -0700 (PDT) Message-ID: <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. From: Liliana Marie Prikler To: Morgan Smith Date: Wed, 01 May 2024 18:46:23 +0200 In-Reply-To: References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 01.05.2024 um 12:32 -0400 schrieb Morgan Smith: > Liliana Marie Prikler writes: >=20 > > Am Montag, dem 29.04.2024 um 16:43 -0400 schrieb Morgan Smith: > > > Liliana Marie Prikler writes: > > >=20 > > > I'm not a fan of adding another file so I came up with this > > > solution. See attached patch. > > Hmm, I'm a bit torn on the solution.=C2=A0 On one hand, it is a local > > solution with just a phase, on the other having the file makes it > > easier to just mv it. >=20 > I don't understand the trade-offs here.=C2=A0 I'm a fan of keeping data a= s > close to where it's used as possible (so ideally in emacs.scm).=C2=A0 I'm > not sure what advantages putting it in a file gives over this > solution. The advantage lies in only rebuilding Emacs 30. > Just to be clear: what do you mean by adding another file?=C2=A0 I assume > you mean adding a comp-integrity-next.el file which is almost > identical to comp-integrity.el with these small changes in place. Yes. > > > If we believe that a core-updates merge will occur before Emacs > > > 30 then I would like to see my original patch applied there. > > It'd be only emacs-team, not core-updates, but we could do this > > "quickly" either way.=C2=A0 But the point behind those is to keep them > > small and manageable in a sense, so core-updates is typically not > > concerned with leaves or leaf-like stuff. >=20 > I don't think I understand how our branch development stuff works.=C2=A0 = I > thought we put large dependency changes on core-updates so that the > CI could chew through everything and make sure it's good before > merging. Most stuff is now organized within teams that have "smaller" responsibilities. I'm responsible for getting Emacs and Gnome updates way later than we could=E2=80=A6 > Regardless, I trust the team to do the proper procedures.=C2=A0 I simply > believe we might do more package fiddling before Emacs 30 and that > potential problems might be assuaged if the comp-integrity file was > more forgiving and supported every Emacs equally.=C2=A0 Thus, I would > encourage it to be applied in the appropriate place now to avoid > potential headache but if we wish to wait for Emacs 30 that would > also be a valid choice. There are tradeoffs to be made here. In principle, we could support "every Emacs ever", in practice, it hardly makes sense. If you need an old Emacs in the future, you might as well use the built-in time machine. The right place is a new comp-integrity.el. We can just mv it over the old one once Emacs 30 is the default Emacs. We don't yet know how the help changes for 31, so we can't really ask a crystal ball to insert the right check. Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 16:07:33 2024 Received: (at 70632) by debbugs.gnu.org; 1 May 2024 20:07:33 +0000 Received: from localhost ([127.0.0.1]:39168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2GEn-0005vw-Ca for submit@debbugs.gnu.org; Wed, 01 May 2024 16:07:33 -0400 Received: from mail-dm6nam10olkn2108.outbound.protection.outlook.com ([40.92.41.108]:21985 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2GEm-0005vo-A3 for 70632@debbugs.gnu.org; Wed, 01 May 2024 16:07:33 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZRxgC02CrQgy/gXW4zoXOd/mJ3iUM+u8QdDurAowveWc4F9LWtw4YeOVgwKPKmsMjOrdCDLF+URpHllBUFZBStyaXc7/Ij8NoLSlZ/wjaQZ5R6PpyqGzSA9J+y4qBF+NZB4UlnGlsUSgkJzi2kHICjHd1qfqK4QlGrXhPgnFF6Ft6pN3kNl3tr2IS5QwSUhz3Pl13Y4Jns56TV6tjhQScRCqPzSokoFKUUwxo5Fje3wfQSwAASzjbsEcTiBYh6YVZ3TF0Yt6OlfEpWh6kb5oEh2cKMfNOjyqXjk1HQFD5JA1fLBKDNG3nPRGf+U/OPUqr6UMzZNYWpNntL945Wjg+w== 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=uFjl86NYiYG5Z2reGxXu6K5c/qUYyO4HCHRluqFuQ30=; b=VqQxiAJr1jHElPZakNjhEbnkNK8yV+T4VJcE9JHgffmgZJ+IgQKNEXceUedhfnuv6VMeJ9nE/t5yaUJ9RZDnQJ2iJBHlPCY6a5ZFWrr5BurY2xQ3N/tfjpe+vRwKIqY8UckDRU5GspPktIGG3UzMwrclHsC3UgCnJaQ2Ywb2vV50ZypgUdWISZaPX5PNA0vLi+swSejE6ON4p63LIdsR0G35qGOWkDZoYeghfQS5UZ146R5VZ4OSAaaN7GRwCO1dBSJGLharUCzgJlU/GXghcg+xAhGU2j041Aiu8dmGmQqo6+2hSTyDhuRe9QK9ZFdaKi/BE6/MmnhEHoPmpOyqmQ== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uFjl86NYiYG5Z2reGxXu6K5c/qUYyO4HCHRluqFuQ30=; b=FPV0C9NN7HQKnexsn9F8MFoRmVHrtE5pvAeRMYT1IRKSh66hNOmpOscL98rKko2r9d2DGPxUYdhbfpDCY24/QKYjvpCuVY2FjaYnaIg99L0VlMNLlZc6zmn3eidHYpDyXKxN/4E9Ulx2gyTyxMEjsYe8mwRX4wKTy3H6sqSqwvSxWjq7QjIwQ71sMR6qVa2Z3+SQ1yLdUTfX+nwlKe3Sg9Xxbej1CC6EAxxXB+sy7iZA/JPauIIjB/ccn737XholIi4x1mQBiMChTF4i4M0laPwaIV8LCM+mVwro2xIkYsktmNLbATUA8hJmD6hZLU9G+FKYSUr0V2nA794JgdRduw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SJ0PR84MB1580.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:a03:432::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Wed, 1 May 2024 20:07:03 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7519.031; Wed, 1 May 2024 20:07:03 +0000 From: Morgan Smith To: Liliana Marie Prikler Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. In-Reply-To: <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> (Liliana Marie Prikler's message of "Wed, 01 May 2024 18:46:23 +0200") References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> X-Hashcash: 1:20:240501:liliana.prikler@gmail.com::pLaFBk7b05USz1DN:0KbJ X-Hashcash: 1:20:240501:cox.katherine.e+guix@gmail.com::F4GfK0iI3SPH7e0f:0MB1 X-Hashcash: 1:20:240501:andrew@trop.in::M07mKHot484k52Ux:4KeE X-Hashcash: 1:20:240501:70632@debbugs.gnu.org::uXPmX5aMWcy+DD63:5QdV Date: Wed, 01 May 2024 16:06:59 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-TMN: [tQmWLRGPkDshiz8vfWQoMtrGAwC3NKfx] X-ClientProxiedBy: YT4PR01CA0135.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::16) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <8734r1wb30.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SJ0PR84MB1580:EE_ X-MS-Office365-Filtering-Correlation-Id: 6dd2346a-f29f-46c7-09ac-08dc6a1a444d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|56899024; X-Microsoft-Antispam-Message-Info: 5tnh10Tz+HEpwzZs2EQ8HAGtcTHl997WOlGxiYrWD/34iJTO41CuA6VHx3Y07YcbaiC6yO7tKglTz0mDIQf5MFLyqlH3xPrmD0jcwJzLnJUbqE7L8zJ/mNZm9tG999mK4OpsE/UhsPz4OsS03AyRFwQ+Ilbp+3nQd2cheG2YZc4J+pBXyvWO5f5cax2JbhcGy1G3MKOueo8b+azRVIMmm4/SyRIhEVbUQJkmP9gPdKPbvWf+DdSnQ7xZbs9TABampkK32VLorHp7m/f6z05g8Jry5H+jfd9ersG8BysFBGM2WwQWzoyNEftd3tDKed4qJA+YAUUZkCvMUF+XlVeuWzQ2ajgXUyNs9FNEvKCHGrogRcvZsCwDkitPn3NCNLSn+gNes/vg9zwSo6Pe639aeLAsTfNaucz+W/Ezc3AlDXHpB5IQ+rw1Z1cjR8jAgczt8tvBrrQtFGWFn441A2Z9n7RbEiYPSEsY4A5p2FSMTBCdg3WCIcVVfryuEHLWPzfwj4Sg6oM18z2H0mKFbEQW46iHVm+6h9nLvWCY4bEv37HA71a0Kplynxkc1Yzwn44O X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TFNZcVk1S0F5MnI1clo3SHJWSGU5RUZaOVVQS3R0VXM0NGgwVFFsUzJuLzJa?= =?utf-8?B?T2dUMys4Ry9PVzQwYmgzMC9SaW5oOCt5TTI0OEFsaVJ0YXhhWlJaQmd6STRN?= =?utf-8?B?V0xFUEUzOFJjWWdpaUsxWXhXUFROUHBJclUrckFiVW4vQW1ZUnc3MlBtbUNv?= =?utf-8?B?Zk1ZL2hGQm9TczVRdjYyNGdwcDhPSHpwUE1sRUJIcDdDdGxoM2hxaHpubjBU?= =?utf-8?B?a1pIVVF0WUJCbG5BRkR2NFd5UEVjcEhVb1JiMlZGWG1tM2E2cUk0QU04TERN?= =?utf-8?B?OVhjeWhvQ0ZaNkNUYUV6Lzg3UFRUcDZqSXBKeWoxSGxTUGJ4dHlna3pSY3I3?= =?utf-8?B?d3pQZ0RkL1JLZWphQmYrZWd0YkMzYmMrWnpKd2hESHp6K25uSEd0YkR3cFJr?= =?utf-8?B?R0RtU29IbXpOdHAwN1ZaSEc3aDFoSjF5K0IzdU5LbGd1cExML09TSjViemlG?= =?utf-8?B?Nm1uWnBJZzVOWHpUc3FvaGpWQ2NkT0tDTTRwVlhIb3dsYjZEaWhqUzBVbjN2?= =?utf-8?B?aTIrWW03U3o2YllJTWtVamtFT2pCNlYrQTUyMmVVd0xyQUt3czNlcndodHdJ?= =?utf-8?B?NlBQbEgyVmZIZm9WejM1bi94bHY3VEpGd0I4V0FucUlKV2oza1M1VWNlRmNh?= =?utf-8?B?OHVWV1FMWlV5ZTJEMTBxRklsaE4vQWJhMHUwWXdVSFBQclZBUDd6Z2xHTDBS?= =?utf-8?B?dGxib25EZkF5em84cEwvWG0yZGtjSVdnUWQ4SmlMVG5uMnhSZjVrQmpEVVhN?= =?utf-8?B?TDNKTVN2cDdvK25oSC94am1SSDF2TlpxMlk2SjNtZ3Q4RlBoTmQ4VURVU050?= =?utf-8?B?K2JlQVJUTWxnNEJhNVp1azhpY3U3dzF2Mlg4YlhIY2M0cXRJZmxFTmJWOEhE?= =?utf-8?B?RGJsRzA5RFFaa25iUHBtTzVBYVRuQlIzQ3NtcGVPc2d2Z2NZYVBKRzRudVdo?= =?utf-8?B?Ykp5eVpvTVhvdWtLNVZSN2c1L205aldWeXRmUDZYd1pURXF5U21ZMzU1a1Jh?= =?utf-8?B?WTI0UUxjMTNwa3JNNUNldGYwTjBtd3NvNlltN0FuZTdpVlkzWndKMEo3Rm04?= =?utf-8?B?cjJiaGlQU29DbTRBNjhQcVpkVW1KTTg2Vm16M1ExcEdvTkVWTDdYYjN0eWhT?= =?utf-8?B?K0dMVU9YcnFxSmxzdndtWmhTK1VPN0UrMkYxNnF0WTBCbWhTSnpHMnltWldW?= =?utf-8?B?ZDd2ekw0QmIyM2hHQnBuaTlDaG94bUdaVmRBbXdVNmJOeE1UZlJsdEFBZmNM?= =?utf-8?B?N0d2ZndJd2dhSHIrSVJMUWxqYjRHaStUTXpGNXFoai8wYzVWOFFXbmh5RmYx?= =?utf-8?B?TnpmV3RXN0ZLZkRHckZwZkZFQjgxYWxVSG5mcUVjMkRvcXBBTnhNNGlVMzF3?= =?utf-8?B?ZW1tdytWNFpyYkNrbW9oL0RVYlNKSHpkTDMyRnBJSVF6WVd6YXpDQSsvTXFN?= =?utf-8?B?dEI4QUpMNTl0ZmZSM0tndURjc3NIVWRLR0VZZmZtZmlURG9hOFpZWDV1OWJa?= =?utf-8?B?a1pwZU1ZQ1NZTnRuRFlqK0J4eE9Qc056aStLTXBnYy9oa3cwT3VhN242aFlN?= =?utf-8?B?d2U2ZlNJMlF2NmJXMlVTQ25rN3J3TXg5bXh2R05RNmdpa3FxbVRkZUtsMVpY?= =?utf-8?B?WHFJQUdiZTZjRVhKYjlBZklUZVZyZTdCbEFoWUxMckhtZEw5Sk5PWWM3VmxE?= =?utf-8?Q?9eODHar6sBJozZjDfolv?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6dd2346a-f29f-46c7-09ac-08dc6a1a444d X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 20:07:02.9486 (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: SJ0PR84MB1580 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Liliana Marie Prikler writes: > Am Mittwoch, dem 01.05.2024 um 12:32 -0400 schrieb Morgan Smith: >> Liliana Marie Prikler writes: >>=20 >> > Am Montag, dem 29.04.2024 um 16:43 -0400 schrieb Morgan Smith: >> > > Liliana Marie Prikler writes: >> > >=20 >> > > I'm not a fan of adding another file so I came up with this >> > > solution. See attached patch. >> > Hmm, I'm a bit torn on the solution.=C2=A0 On one hand, it is a local >> > solution with just a phase, on the other having the file makes it >> > easier to just mv it. >>=20 >> I don't understand the trade-offs here.=C2=A0 I'm a fan of keeping data = as >> close to where it's used as possible (so ideally in emacs.scm).=C2=A0 I'= m >> not sure what advantages putting it in a file gives over this >> solution. > The advantage lies in only rebuilding Emacs 30. > I still feel like I'm conceptually missing something here. Emacs 30 doesn't actually exist, right? We are currently on Emacs 29. emacs-next is the closest thing we have to Emacs 30. Regardless of if we create a new file or use my phase I sent, we will only be rebuilding the emacs-next stuff. The current emacs (29) is being left alone. >> Regardless, I trust the team to do the proper procedures.=C2=A0 I simply >> believe we might do more package fiddling before Emacs 30 and that >> potential problems might be assuaged if the comp-integrity file was >> more forgiving and supported every Emacs equally.=C2=A0 Thus, I would >> encourage it to be applied in the appropriate place now to avoid >> potential headache but if we wish to wait for Emacs 30 that would >> also be a valid choice. > There are tradeoffs to be made here. In principle, we could support > "every Emacs ever", in practice, it hardly makes sense. If you need an > old Emacs in the future, you might as well use the built-in time > machine. > > The right place is a new comp-integrity.el. We can just mv it over the > old one once Emacs 30 is the default Emacs. We don't yet know how the > help changes for 31, so we can't really ask a crystal ball to insert > the right check. Ok I think I now sort of see your point. You don't want a build up of legacy support code in our files. I do understand and support that and will send a patch of that nature if you would like. However, I do think at least supporting all of the current Emacs packages in guix is a nice thing to do. In guix/build/emacs-utils.scm:emacs-generate-autoloads, there is a condition to support emacs 28. I don't think we ever use that path anymore but it is nice to have a robust function that "just works". Espiaclly back when we did have emacs 28 and 29 packages in guix. It is my personal opinion, that we should have the file support Emacs 29 and 30 for simplicity sake. But again, if you disagree with me (which is valid), I'll send you a patch creating a new file. From debbugs-submit-bounces@debbugs.gnu.org Thu May 02 00:24:34 2024 Received: (at 70632) by debbugs.gnu.org; 2 May 2024 04:24:34 +0000 Received: from localhost ([127.0.0.1]:41254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2Nzl-0008Hu-Sv for submit@debbugs.gnu.org; Thu, 02 May 2024 00:24:34 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:55585) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s2Nzk-0008Ho-FR for 70632@debbugs.gnu.org; Thu, 02 May 2024 00:24:33 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-a58c89bda70so721809766b.3 for <70632@debbugs.gnu.org>; Wed, 01 May 2024 21:24:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714623844; x=1715228644; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=bGhWMkuBGeGxj8gq8YdFdNcRcGUiVaE4/dyoEB2bsuo=; b=SJVQ4pByxF3JXnCqZAHdTyvoSAd0IiBwKkidHWsc2dDaAy5xDg3jIfCqwshTjAQG9F LD4rgTJYWEQSoETGmoA14LaTHMrmmc769l8garoOdDk+ZhhRmKRGmnyEvaGUMeXnSaTd h79co02TBvWke+wYLuup74Zspdrq0aT7m/OjoJyLKmzfrOeI+MGLl2Z1Pi0OwBZ6wp2C xQmzUVMlyFwFfEuaCxmm+MLRtSEeQQT+76Hs8rxxzfuCMtT0OcDcdJQDLffOcxC7qiui VYp4y8DfcrcF3RlRTwjzoeqYZL7I191f6g5VAQKtr8HI/AFNZ1Tgjj4olkHnKMNDcquf 5hIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714623844; x=1715228644; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bGhWMkuBGeGxj8gq8YdFdNcRcGUiVaE4/dyoEB2bsuo=; b=bgW+JEO9UfFvAtfE5fCKfD8UbKbHzHqLP16Dh6sZWBtV/LeHjifZo6MDbNld1VGZ40 c1jc6TJuOQet1TIJxdo4sJjtjLNgw5TM3Ys/yKt0Mf4384MJDAh9okyUU7/o0FAcf8DA U5XvPcVRa6kDrUf9lbzX3T98ZKu0H+rhd8JAKryvzM2cIXta6t8d+sfcr5bSmINAgIfz iTV1hL1XM5J/CIiZLlKJhWtVziDkABzfooGe1ugKoslgtfi+Xza1SKv/QtePh54GnKkY Vu+TCsHt0BTxW4ktWm44nHh5Q8vBgRiNmtQ7GH8/C3aukJYRgSTpsxiA4CvJrblLUzYG 8VUA== X-Gm-Message-State: AOJu0Ywzf8RCgmrQbKOGbSAgoEccozxxuHGlIeOxmpw5V2bs6Y+NbbLk oXe4brVSvRfhp8Bt3UlEwQLl/Fz/PSmJIeJWqwbPi9iz1wBFDnSJ X-Google-Smtp-Source: AGHT+IGWdnCZCSbiInYq0P6l/04mbAierp44YAV5H3e0YGPPUev/AmV+uBYXOGxxVGYxkFTL6+UN8A== X-Received: by 2002:a17:906:3507:b0:a58:c80e:edd9 with SMTP id r7-20020a170906350700b00a58c80eedd9mr2519073eja.77.1714623843760; Wed, 01 May 2024 21:24:03 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i23-20020a17090671d700b00a52222f2b21sm61841ejk.66.2024.05.01.21.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 21:24:03 -0700 (PDT) Message-ID: <518c80a73207138ede449fb24c72ac4b79764b1e.camel@gmail.com> Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. From: Liliana Marie Prikler To: Morgan Smith Date: Thu, 02 May 2024 06:24:00 +0200 In-Reply-To: References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 01.05.2024 um 16:06 -0400 schrieb Morgan Smith: >=20 > I still feel like I'm conceptually missing something here.=C2=A0 Emacs 30 > doesn't actually exist, right?=C2=A0 We are currently on Emacs 29. > emacs-next is the closest thing we have to Emacs 30.=C2=A0 Regardless of > if we create a new file or use my phase I sent, we will only be > rebuilding the emacs-next stuff.=C2=A0 The current emacs (29) is being > left alone. >=20 > >=20 > [...] > Ok I think I now sort of see your point.=C2=A0 You don't want a build up > of legacy support code in our files.=C2=A0 I do understand and support > that and will send a patch of that nature if you would like.=C2=A0 > However, I do think at least supporting all of the current Emacs > packages in guix is a nice thing to do. >=20 > It is my personal opinion, that we should have the file support Emacs > 29 and 30 for simplicity sake. But again, if you disagree with me > (which is valid), I'll send you a patch creating a new file. TL;DR: If we do a new file or a phase, we only rebuild emacs-next. If we modify the file in-place, we rebuild emacs, because it uses it.=20 Between a phase and a new file, a new file is preferable, because we can then 'mv' it over the old one. > In guix/build/emacs-utils.scm:emacs-generate-autoloads, there is a > condition to support emacs 28.=C2=A0 I don't think we ever use that path > anymore but it is nice to have a robust function that "just works". > Espiaclly back when we did have emacs 28 and 29 packages in guix. This is somewhat legacy code that has grown that way back when Emacs 29 was emacs-next. There was no good reason to drop it with the switch, but come Emacs 30, 31, and maintainability might be one. Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed May 08 14:49:36 2024 Received: (at 70632) by debbugs.gnu.org; 8 May 2024 18:49:36 +0000 Received: from localhost ([127.0.0.1]:50301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4mMB-0001fU-LP for submit@debbugs.gnu.org; Wed, 08 May 2024 14:49:36 -0400 Received: from mail-bn1nam02olkn2049.outbound.protection.outlook.com ([40.92.15.49]:48894 helo=NAM02-BN1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s4mM7-0001fO-6j for 70632@debbugs.gnu.org; Wed, 08 May 2024 14:49:34 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=luO94GlNQILZlKf1rgpFs/+FeAY5q3Axr3IfqCxuvovSY67/pcd0OxlZUpXy2+Z7JRzo4xraj/mTKXCS5zIgxY0YyuDfbx8SIfKS3c1E67HrIbcAvxTN+csqvJbRAtauMvLfrbbSxArgwA9xT5HG6rYd60U2rOFpyPFGT6ehKpE+1G9t8qAzykLz0hOuONt2Y77bnSzn5NU43FIvuRiuny60q6ctEPPBUOIPwXhc16mrlzOPdw+1AzAAj9y3EuV08NBSh6eqpIpVsntbgiP5K6U/RGEDtA8PZXtOR3MplEDFdeV8E65p1x3zGP4ej77nhXLZZohQ56H4+uzjA0jnKg== 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=CiNSD7trwVXZKeui6KsJg/KPr1KSPzrACqGOfd2YLZw=; b=Ob3TdFa5MoiVBkNW9y3ZrBbb3eqZ4SC60vO+Yy75EVDDIaljggCJC5X4WVqFvJ7zVVmPq9C6wEf1sUfxAu/OaHvSzfqMU7l9XAUB8FT3AEM654pNisd0ICcwjkM+UlW28oYzuCYpB0MffrUC256LDw2wibpy1I7rQt3QIr4UD0cP4VrHfL138HBGHDR50xd4QNho/FFiyQArzTiTTucJ8xOXi6n+ftEGXypOGqFsa+9ZdMc+yYTPNXQldCXOVrarE10UmpXBjSN+IFQ9Be8eNLzdeSGgfBZjiYWX5ZGcoe8ZSeO7XlNoo5PgSLzQ3GqWhfJMNXjZprRUG0zWvnRcMw== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CiNSD7trwVXZKeui6KsJg/KPr1KSPzrACqGOfd2YLZw=; b=pBKbf+fw+uF9Al0/QKckolnEZ0cntksw44OSKilVg6/VWLpjEzV8ERhSARCmAqJyta4tr7ucvPIk63Q5C4bqDLerOIKVEoztbejnu3i9uX6rAH+yUNZB7VcI13pJp4Eqyjhq8ce/axr3MRL9tmYyfaXjOnny6m/YgKVck+9MLNqOAFqwYBvy/9WH+fhD2YlTJiHGFg83A/oabAy+6lZ26ihw4FmBk8W2XblXEm0A/1ybOU/RgnXYgGV1D4gPpMnHuernzLtJzsBzuQdjuY58n0D/PGzQvFI6WQCmy9OiEkKGcTne0PsZYOfdDgkdifEaHmvkqtwSmojmM+jkGDsSvw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SJ0PR84MB1361.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:a03:381::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.42; Wed, 8 May 2024 18:48:57 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::178d:1518:8a49:2a45%6]) with mapi id 15.20.7544.045; Wed, 8 May 2024 18:48:56 +0000 From: Morgan Smith To: Liliana Marie Prikler Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. In-Reply-To: <518c80a73207138ede449fb24c72ac4b79764b1e.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 02 May 2024 06:24:00 +0200") References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> <518c80a73207138ede449fb24c72ac4b79764b1e.camel@gmail.com> X-Hashcash: 1:20:240508:liliana.prikler@gmail.com::rJq6Ql/Dwrf8sHs9:9A/ X-Hashcash: 1:20:240508:andrew@trop.in::kY17AO8oAUQLx8ph:ZXR X-Hashcash: 1:20:240508:cox.katherine.e+guix@gmail.com::iLIDt6XVBQXZUIeG:0sQ0 X-Hashcash: 1:20:240508:70632@debbugs.gnu.org::LF6VcPP3UJtkt3bL:2dO9 Date: Wed, 08 May 2024 14:48:55 -0400 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [4zMHAARR//QW9em1ZYvEmiUXM+6S0n1s] X-ClientProxiedBy: QB1P288CA0012.CANP288.PROD.OUTLOOK.COM (2603:10b6:c00:2d::25) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <87frusm960.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SJ0PR84MB1361:EE_ X-MS-Office365-Filtering-Correlation-Id: ae6b7dac-2603-4435-2d3e-08dc6f8f83fa X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|6092099003|56899024|440099019|3412199016; X-Microsoft-Antispam-Message-Info: wrQf9nCfHjk23Hftqi7XD7CPS8sZorrXPq1WoEFXiKesS5UhSmslCG0s4pmFxXC2nNH8ead7A580drmILkgZlln6eplcez4QcxQQUMk3v2E+fOqULwUwC7JjFpM6x9lerqmSmVP9EyqXb+KxF9uYbHsfrjnOLD+VEq9vAunJzsZZL9cYzM8qSpafuqwIMyAeR9vq1ekPoYZLgJpAua+fHeaKiH6vY9BtklqB2gUGKrvpXC5UnwjxNJAhYEWpl6BA8G4EEVDuGGzpJBa42lC+a8TI4cMT5SmiAycmXkVWoogwArfROUwtZetVVMfyZXHMcmmWwRx3yFyQ0lkOBqP6ecQUL3SYXy7dSVGmCF8CaTo15MgHGfhnvbSSE4hBAytDjjAhaB+Q+G2IMUb8WPNXwn+nm+vAmc2DuCNt1ClwMw/hhOBrWn+qK6qIrIjVQbULvWaO5xOgFyrgufICaNV1KIrbUGAlxFVMptD9OZIZlowkPN3cQvAdHBSWr/hRMxSeCpCp5bTDgLc7H7daRtkA9TmgTKa4uiRClmhakpRAtPnSbSroN+HcH1bKZmvVXjfKDtQzdgTO69qQvnsmV0t4JoZkW9034Op01MLmZjMzWE3KYcWP0WNeu/qmDJFfwszk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QWVwbnRBOTE2aGNvWkxvSHRPNGNIT2E0S2d4ckhoenQ1TUZKWDRtMy9pUmZW?= =?utf-8?B?aEI5TXp1aStGamMvdnRpbU9qSElUZ0NrZXdqanNDSTNiZzIyZjJYSk5XQ1VJ?= =?utf-8?B?c2RtS3lBTlF5S1pkTzFHeGp2aTF3SnpSM1FEYXU4cm5kUmMxdElQVUZnbmM2?= =?utf-8?B?MHZ5bWJ3eXJtb0dzYmFOOEdKczFhdE1NR0dCNEcxZDFMMmVqWXYvc2phTElP?= =?utf-8?B?SGp0OXJTdm5heE0xczBYbU9GdEdrQkp4YUt0ai85UXl1V0xKVE0yK0c2Tm0y?= =?utf-8?B?S25rNlkza1cvNjdxaGZJbkFlNkZpMU9xTUQ5YllvU1pnOFBIQmhlZ0FqOU93?= =?utf-8?B?Mi9rOXN1RlZXNk42cUF2ZGJQdmE0RWMrNEJHY2U2bkUrRTllQ2FCajRCWHA2?= =?utf-8?B?NDFienFrUG1zMDBSdGV6ZzBQanNmdHEveDhuemx2Nmg0Rk5QcDkyaFBxOXBQ?= =?utf-8?B?endVd01PUmg3WFhtK0tZUjM4OXJzNUJiQlR1M3AzTGhMcnJIUVZpTzBpelNj?= =?utf-8?B?c2crUHFXOUlpMkFjNDdDYytmallablVMc09TajRFdlhiMklJd0NCaDVTSys0?= =?utf-8?B?MVZjUXVTN2duOW1QWjFoMnRWNVUwRzVIZ1pvRk9seVhaSjM2eXZVY2twQzEv?= =?utf-8?B?VEk2VDdrejYyVkM0aWp0U2pzdjVKditqaWd0L3R2am1aZU1lTVJHMi9ZUEVs?= =?utf-8?B?SWZRa0l0Ylhxb2RHdHBzWnU3Z3BwMjZtaGp0aWs0Z2FIZXFmQXRmWGFtUXdL?= =?utf-8?B?b3AzNVkvcjVybHFpVkllWGFXVFN5OXBhVEpvRWx1a2tWN1YyRHROZEFQTTNq?= =?utf-8?B?YzdnY05WYk04Vzl6Z3ZUTzBSNXpOanBYZGNtcWJuTjd0QlppVFBjTUhQZ3RZ?= =?utf-8?B?STdTRDZ5Z21nNjdjL3liNXZmMTFYYm5sT0ptSU1QbG5sVmF6czh0UWRZYnJM?= =?utf-8?B?ay9HVW9GYkkyU2RiS1FScnBla3FaRXR6cm9tR0ZOendNdzlBL0xkQlV0YzhM?= =?utf-8?B?R3U4dy92ZTVxNCtjcUVoNTRRQXpISW1uRU1lRWVJalROT1Zob3diYzFFbXcw?= =?utf-8?B?NTF5a1l3bURVeFUvRVFoRE9HdjJWK1J2SFNJYkREYzZtM1FMc1FnbkFCKzZV?= =?utf-8?B?eXNKdjVGQkdPVWtldU9WYWFLcHIzNXNCQ21QRktzSDBleTM2dXBVTmxGZG5m?= =?utf-8?B?VlJub016ak9ZdzBKaHVNbW5JTWNHNUZtbGVqckxNRVY4N1RwaGNJNitQK0k2?= =?utf-8?B?REZWY21oakRVUXROdnBzT0crSXZFbGF0UllwQ21JelRYbUVySFNHWkE3TjA1?= =?utf-8?B?R1V4ejcvejJEbWVqSHhMNFVnSkp6dkducFB1Vi8ybFoweWYvR0tMU1RLY0dB?= =?utf-8?B?VVVWc2k4eXVwdWVOeUdJb0VtSFpRNmFvWWJXQVBlb1lsL0JnNjdYTXNaOUQ0?= =?utf-8?B?SWRmaVZXZnpSRUpLdnhwdFdGZEp1Vk9nb3ZvSURadzBNa1hQQ0hOWVdMV3hY?= =?utf-8?B?eU0rZmZFZkhNa2VKUDJFUUVuc0dheTFReEJCZlVSQUdXdVlCbnJUY2lSQnNF?= =?utf-8?B?c2h5RU9WWnlaOVp2U3hKdzRJOXNINExWSENOWi9VK3krYnliMHQ5YkZSWG9I?= =?utf-8?B?WGdNMDcrajZPSFNDaDB3R2hJNG8xUU0yOTNXNXlVZGozVXZKZ3FzN1pWUHo1?= =?utf-8?Q?hefLSrF5aUTsPeErF8j9?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae6b7dac-2603-4435-2d3e-08dc6f8f83fa X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2024 18:48:56.7907 (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: SJ0PR84MB1361 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 70632 Cc: Katherine Cox-Buday , 70632@debbugs.gnu.org, Andrew Tropin X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Liliana Marie Prikler writes: > Am Mittwoch, dem 01.05.2024 um 16:06 -0400 schrieb Morgan Smith: > TL;DR: If we do a new file or a phase, we only rebuild emacs-next. If > we modify the file in-place, we rebuild emacs, because it uses it.=20 > Between a phase and a new file, a new file is preferable, because we > can then 'mv' it over the old one. I apologize. In my mind we where talking about two different changes at the same time. A change to emacs-next right now, and a change that would rebuild all of emacs but live on a branch for now. I still think that's the optimal route. Apply the phase patch right now to main, and then the file modification to some branch. On a related note, I do have two changes I'd like to make when we rebuild all of emacs. I've attached the changes to this mail despite it not being quite the right place to send them. Also I didn't actually test them because I don't really want to rebuild all of that myself. >> In guix/build/emacs-utils.scm:emacs-generate-autoloads, there is a >> condition to support emacs 28.=C2=A0 I don't think we ever use that path >> anymore but it is nice to have a robust function that "just works". >> Espiaclly back when we did have emacs 28 and 29 packages in guix. > This is somewhat legacy code that has grown that way back when Emacs 29 > was emacs-next. There was no good reason to drop it with the switch, > but come Emacs 30, 31, and maintainability might be one. My issue isn't that you're wrong, but rather I would argue "it's not a big deal". To maintain clean minimal code we should remove that condition and so I see your point. But also, it is such a small addition of code that adds significant backwards compatibility to the function. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-build-system-emacs-Allow-usage-of-allowed-disallowed.patch >From bfb0492b28dddd69bc894de278b5ccbd0d12bd33 Mon Sep 17 00:00:00 2001 Message-ID: From: Morgan Smith Date: Wed, 8 May 2024 14:37:46 -0400 Subject: [PATCH 1/2] build-system/emacs: Allow usage of #:{allowed/disallowed}-references key * guix/build-system/emacs.scm (emacs-build): Pass #:allowed-references and Change-Id: Ib9a35a7b2115365b96675fb7ca3914b0ae7e67c7 #:disallowed-references keys to builder. --- guix/build-system/emacs.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index ebf97a5344..35910e1b6d 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -95,7 +95,9 @@ (define* (emacs-build name inputs (imported-modules %emacs-build-system-modules) (modules '((guix build emacs-build-system) (guix build utils) - (guix build emacs-utils)))) + (guix build emacs-utils))) + allowed-references + disallowed-references) "Build SOURCE using EMACS, and with INPUTS." (define builder (with-imported-modules imported-modules base-commit: 7b7f299bb493e485c5534b8c554e51d4f3a8c026 prerequisite-patch-id: 228487164337ccc7df5633c5c6a91fcca993b88a prerequisite-patch-id: 15497860d4d342179c53c716ebc7039f9c34d785 prerequisite-patch-id: de0d348f5e8f8548bafba10339481a08bd63bcb8 prerequisite-patch-id: 1c516a9ffd4f230d1a0c8a0d32081a6861bfe1de prerequisite-patch-id: dbf0d15c2b5f4155a322232b2433782721fb6c3d prerequisite-patch-id: 1034b52682613afdb7b6e71bb33b2a1f99e2051f prerequisite-patch-id: b3f97a6754c429c6968a861e59c5855e9a0e4984 prerequisite-patch-id: 00a8699a27f340aa6a6e97c4fb45d9ce429cb9d5 prerequisite-patch-id: df520101f3206f576f42f59d7eed65970f7c7775 prerequisite-patch-id: 5123f0e53dedcef03247a9f2eb18479f51808ef2 prerequisite-patch-id: 63c4a90f4de15b5691cff8dbfd570e11725f2a8d prerequisite-patch-id: 620d07a109a9a819b12bd25b61e36e30a505bc1e prerequisite-patch-id: cce126a37582a0dd422cb6901c2f36779d53bfbf prerequisite-patch-id: 4447b1e254600ae044ea29df1a783f41330386b6 prerequisite-patch-id: 44393351676575acadd16c4149722ba56c988c39 prerequisite-patch-id: d9d591e4b630a837ac018d805a0cdd064be5aa65 prerequisite-patch-id: 6f2fa68451c4831841049b9b165a12b98225323c prerequisite-patch-id: 6a28c36a2bffb2a3fa99cbc7519bc7be2c2e827e prerequisite-patch-id: f43ed73b1dc78274f954fe053efdd0b424b002ae prerequisite-patch-id: 4f5110050cc3c6cd44f35e8bdebf413049f362c7 prerequisite-patch-id: 06a0dab6f112fc8bb4859f13f3c943591bc86ca6 prerequisite-patch-id: ac371cc420806e0184e7320260f3aecc795507ad prerequisite-patch-id: 5218f162fa865cfe23712a8afb9a97c6e00d9a5b prerequisite-patch-id: 3421e0a088add352ff230c1471bc7d4097fc33f6 prerequisite-patch-id: 59dfcf7314edd1ced95cfa18ad97da01190abd37 prerequisite-patch-id: 088ad347566bb575087253465ff649417de83031 prerequisite-patch-id: 47a3a11659aef5d170e3dd9c8fb174e301087627 prerequisite-patch-id: 45614401deda5bdcd1527f6d7ebb1a916a31d0ff prerequisite-patch-id: 1cb26e4ca3aec0777e82c362f85102058914eec9 prerequisite-patch-id: be89334a48e8fc0aa033760be7b6bc2a497fcdf5 prerequisite-patch-id: 1fee8851c9fc5ed4f8acf135db668bbeb04d807b prerequisite-patch-id: 337bc190dcef601af64b7f226acf560d2aff7c4f prerequisite-patch-id: a6302f36dd276abd7e732cea41a5e94f67e8b87a prerequisite-patch-id: c5c17c43c0cb139d0bcb28a115fd7d66eb59ee0f prerequisite-patch-id: faef782b5cd6da66afcbdfaffa5d581d8836f1e3 prerequisite-patch-id: 9fd04d5512c103a3c8ef4992532623351a2e4086 prerequisite-patch-id: d0c9c90f1945b7fa46097290f4e6b30814b8d3c2 prerequisite-patch-id: 9c1eb832e0192fcaf56d2c230bda51a8f72e6c3b prerequisite-patch-id: b99154be37a07d694e347f158694c366acd71717 prerequisite-patch-id: fe1b89029f914c8de80bf84dedb53f6ae55af562 prerequisite-patch-id: 9e7035825b1a294f8bfccc4714439909ce0e784a prerequisite-patch-id: 339a1f2719cb4ca7b706070dd2a4632881de9629 prerequisite-patch-id: e721b9f14d8941d07e1eed5071746aa89bf95a37 prerequisite-patch-id: d926e4b96a404967a7bb24e88492444e70ec9c2c prerequisite-patch-id: 10e91de6d462fbddad8e89980cd628fdd2073b9d prerequisite-patch-id: 8979df3aeb9fa4996f1d4d8c34bbed0dcdfcc8d6 prerequisite-patch-id: 06831e794460e54dad3ef7991f21800e224530da prerequisite-patch-id: 85ba9aa78b62a407797db3a27c0d66eb2b92aa2d prerequisite-patch-id: cb22185b66d1456076d0c6c6e59b2137a102997b prerequisite-patch-id: 89da8c9f2a3b60756e28b3918543e29b32ea7c03 prerequisite-patch-id: 9e803b98dd169a0902db29b216cb7e284c16b943 prerequisite-patch-id: e4ec309b8a417ffba697c237da4dbe85ccac4e7e prerequisite-patch-id: 6e46d6b7fc279117848c0e3a0247c1d84ce58505 prerequisite-patch-id: cef5c8dde54b1d3790e6f84fdeafde5a9d8e619b prerequisite-patch-id: 24f395af4ad8c74bf144c9e2ac0c92c10c77892f prerequisite-patch-id: cfb34c2a0bbebd6aedb495953cd65a3111b5125f prerequisite-patch-id: 9084b91d673b95025583ba97f4f33c83c9591f53 prerequisite-patch-id: 4fee8738e04e83ab9952e0a05be51dca05314653 -- 2.41.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-guix-emacs-utils-Be-more-verbose-in-build-phase.patch >From 32ba147bbccaa21524487f2fa216cf1f4a18d884 Mon Sep 17 00:00:00 2001 Message-ID: <32ba147bbccaa21524487f2fa216cf1f4a18d884.1715193630.git.Morgan.J.Smith@outlook.com> In-Reply-To: References: From: Morgan Smith Date: Wed, 8 May 2024 14:40:00 -0400 Subject: [PATCH 2/2] guix: emacs-utils: Be more verbose in build phase. * guix/build/emacs-utils.scm (emacs-compile-directory): Display the filename of each file before compiling. Change-Id: I275a086ed92f7cfb2907aea9b4feb59012cc8dd5 --- guix/build/emacs-utils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index aeb364133a..f35d9e690f 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -146,6 +146,7 @@ (define* (emacs-compile-directory dir) 'comp--write-bytecode-file))))) (mapc (lambda (file) + (message "Compiling `%s'") (let (byte-to-native-output-buffer-file ;; First entry is the eln-cache of the homeless shelter, ;; second entry is the install directory. -- 2.41.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 07 02:37:40 2024 Received: (at 70632-done) by debbugs.gnu.org; 7 Jul 2024 06:37:40 +0000 Received: from localhost ([127.0.0.1]:47173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQLWl-00055n-QP for submit@debbugs.gnu.org; Sun, 07 Jul 2024 02:37:40 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:61929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sQLWj-00055d-Jl for 70632-done@debbugs.gnu.org; Sun, 07 Jul 2024 02:37:38 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-a6fd513f18bso266699966b.3 for <70632-done@debbugs.gnu.org>; Sat, 06 Jul 2024 23:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720334193; x=1720938993; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=5pDAxn1QsOfjr2FOZ605w2pcknGTR3J5jEJ6xImhWBc=; b=chOdHsO2Y4SfJs6guCTubYaIodk/IzMssaJe+iL/UaVw359Q6uxvG8iT+E5Kw6LaxO U+oa7e8JOnDZM4LDf93cWeOVB7Icv5q10KSzYLdMV8qU17NFUBQUt1UYhlKfMMvBln23 tuccIrNfrR3bLaJ1TbqgOVPJAxlAW3FeDJ8pzXFzhBbTgBlvQzZ9tixh5mKyNIHN+VvO IYuW/v+Cb+eUsV+su4sLDYr0eDjn7Blv/v2w7xiL4/RJkqUBPxUvH0Q/SgA23VmmNwv3 2/HjUsq0+1kRZ4gUT4kg6jfyw5oshraHY5/UucR+XBDjP/ecjNdzq/T7yzVXZ2N3/0cZ ZWZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720334193; x=1720938993; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5pDAxn1QsOfjr2FOZ605w2pcknGTR3J5jEJ6xImhWBc=; b=Nj/DdfDx6DhJcO66Ydn2PqYbYGIwM/hPxn2LhBNljTlUKDlig0bsZwQEARKs7jpvgi 7WsUEp8FcQQoQ96v2qWnrFB3//cgoAIzjzKfTYt0MFATRTYxlUk9Bbwn4dcKCLSyBtsH t4qpaA/qK0k7964K6hhVqPUevG9rYk9eUUhTW45eMXeQv488RS5sIs9VTpFsM5yZi8i2 UgOz8mAS43SUWEVjbIhqJSjXPS4AG9TAkAmlilAPo+kyZeNrkFoi65cvsWD8lzlA3wpA kP37FI9fPZKCsqf81QHk+j9w2jYNVBZ7JNnJmzWJ4clq3NUeeszLlkbH+eXlCexuXG/F MVDw== X-Gm-Message-State: AOJu0Yw+ShXF6h4E31C/HmqD7cmOk9VLFtig7QdyKXfKBj29bvbw5nbA wfWr1Dr6fFPI6bSAHzd2rGvt5Txet3isdtG/Tn9BGB9LQ+HBa0Gs X-Google-Smtp-Source: AGHT+IHklAFvDKgHOoMxvXsJ+Ud4vTG8rm1kstWRgxXd+7Uh6jxYjNly+MLwj4ypY/3mmGlnlJGdTQ== X-Received: by 2002:a17:907:608f:b0:a6f:e819:da9c with SMTP id a640c23a62f3a-a77ba4cffbamr628408666b.43.1720334192386; Sat, 06 Jul 2024 23:36:32 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a77ba8dab57sm266891366b.55.2024.07.06.23.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jul 2024 23:36:31 -0700 (PDT) Message-ID: <7c27d998eb2d6ad50c4ff47d77305840ed9dc9d8.camel@gmail.com> Subject: Re: [bug#70632] [PATCH 1/2] aux-files: comp-integrity: Adjust for newer emacs. From: Liliana Marie Prikler To: Morgan Smith Date: Sun, 07 Jul 2024 08:36:30 +0200 In-Reply-To: References: <71e3b67343fca5dfce8633e9aba6414b74de2832.camel@gmail.com> <632d44c7dda06b0441f8c0ba88f47ea745c7f202.camel@gmail.com> <518c80a73207138ede449fb24c72ac4b79764b1e.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Mittwoch, dem 08.05.2024 um 14:48 -0400 schrieb Morgan Smith: > Liliana Marie Prikler writes: > > > Am Mittwoch, dem 01.05.2024 um 16:06 -0400 schrieb Morgan Smith: > > TL;DR: If we do a new file [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.66 listed in bl.score.senderscore.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 70632-done Cc: Katherine Cox-Buday , Andrew Tropin , 70632-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Mittwoch, dem 08.05.2024 um 14:48 -0400 schrieb Morgan Smith: > Liliana Marie Prikler writes: >=20 > > Am Mittwoch, dem 01.05.2024 um 16:06 -0400 schrieb Morgan Smith: > > TL;DR: If we do a new file or a phase, we only rebuild emacs-next.=C2= =A0 > > If we modify the file in-place, we rebuild emacs, because it uses > > it. Between a phase and a new file, a new file is preferable, > > because we can then 'mv' it over the old one. >=20 > I apologize.=C2=A0 In my mind we where talking about two different change= s > at the same time.=C2=A0 A change to emacs-next right now, and a change > that would rebuild all of emacs but live on a branch for now. >=20 > I still think that's the optimal route.=C2=A0 Apply the phase patch right > now to main, and then the file modification to some branch. I've recently pushed an update to master that has a new integrity check for emacs-next; using emacs-next intrinsics rather than going through help-fns. Thus marking this as done. > On a related note, I do have two changes I'd like to make when we > rebuild all of emacs.=C2=A0 I've attached the changes to this mail despit= e > it not being quite the right place to send them.=C2=A0 Also I didn't > actually test them because I don't really want to rebuild all of that > myself. Sorry for the late review on those, but you might want to revisit them and send them as a new patch series. > + (message "Compiling `%s'") That doesn't look right. > [PATCH 1/2] build-system/emacs: Allow usage of > #:{allowed/disallowed}-references key >=20 > * guix/build-system/emacs.scm (emacs-build): Pass #:allowed- > references and >=20 > Change-Id: Ib9a35a7b2115365b96675fb7ca3914b0ae7e67c7 > #:disallowed-references keys to builder. The references are actually being ignored here. Cheers From unknown Sun Sep 21 14:41:14 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 04 Aug 2024 11:24:11 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator