From patchwork Sun Apr 28 17:40:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 26586 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7B12427BBEA; Sun, 28 Apr 2024 18:46:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8871427BBE2 for ; Sun, 28 Apr 2024 18:45:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s18av-00073o-Ba; Sun, 28 Apr 2024 13:45:45 -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 1s18at-00073Y-F9 for guix-patches@gnu.org; Sun, 28 Apr 2024 13:45:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s18at-0002a8-69 for guix-patches@gnu.org; Sun, 28 Apr 2024 13:45:43 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s18bB-0001zO-U7 for guix-patches@gnu.org; Sun, 28 Apr 2024 13:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70632] [PATCH v2] aux-files: comp-integrity: Adjust for newer emacs. References: In-Reply-To: Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Apr 2024 17:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70632 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70632@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 70632-submit@debbugs.gnu.org id=B70632.17143263587638 (code B ref 70632); Sun, 28 Apr 2024 17:46:01 +0000 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 Date: Sun, 28 Apr 2024 13:40:51 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 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: 6FkvmO91uk9nxAIg7pKDW0xE0dZxwaprGrSk+S1XTJm2Tu4ursiz9DDclOhjwLABr70+coQqrwidAvFAP2zDkRdj2mBKl/05qTsIdmJZjZRfymmM3xKRf1zuoU9XLVyVMxWd/f9kbroLzYUWMdOZfuO2f3hkTNQrsG+VmbHirPSBHEp5xU6zU9LbAeEkWJBf09T9n14c/y7GwFsJM/DpK+fWb4IYkO4mEnveKIs0ojaFqDPXMYtrwm7Nf//EBiHIQDKgugvdjsB3QvrFOAWAz1rTxTgohBzVTumLOWDgFM5DnDKSE3PF6l+95nP1AEhW+VdyEpHy+pI03c5RYpHaG40ZloYe3kayskAx3IIULxR8I07vYDzCHR8iitst2elcxGixajXSnsDUj0FyWqPi30M2d/D0FQwXEeFdkYyDdXj2JP4vL7y+9ohkiudVxuHB7DuNL+3+/Cj27RsnUrq+S5n6mlZ61MBfWFw5utoA5cdg2soq9PxzldaA6iluw0SxSW3bfxMD3BNHQs5K6biB4BBd9exrHrr9l+Ro4q5UcFTsHhZfbjSFLDDKzsJwinVuo/dij7hU8XsJX63ofPgDa2nt/2NbPWkHUSkXz5DTqBiBqawC8iTdb5nzWTnWNsuuuz0cQtejxDhc/iXNOZPulH1djrCYqS5yuSJTXWNQUan1FMzeR4UkasvgWSg8bqe8hT2rgzbyKxwn7rqYN63KdWU/Zsgqfi2eN01HsNt+Vto+xaTp9beD0Q6gfIGeMJ81HYSv1KyynOM4MxTAewrsQqGX3ZfWKohdWIK8MkPVMWMy+ZOmGQVzdSqojC01rCUCFnD8AiOgqNcN45C5pGhysIEB65ZM53bW4JCu0NH9EQKJIFZgq1uMe2NuKBGOxqLP/hQ2Jf+g8t8oORizWs55ShkWMAxTeCRAfJVgvDjR8iFFnRvwTYXE8xBEbbtYVTsznVO8LACGIdG0eAbOMEtrZZNsWXlPVI1Z+jRy1BV9eQveQzYBBZrDEckIIm0j56O6PD41PPuxKIAUgXGLUsdJOXGQt4/yXNn/Gz5cdBLgVFJJAw281wCbYVASUZovpjNMnYhjvAyKp8J7Jv+ifdM+Imq/Embw97V/Q8Q0Q1p6AZ3kPPVFSuEfTZA12l3sZGbpdRUiUKnzEpObakpF8uoX9Mq0IT+CbBkoqw2SjvikPJ6crbKPKjjtNlFyGb2j8+5FQktfFuZtDOaL44uI1hW8sFqbLFIZQX9pjA/5bI/pRz89bjLgGlrUrxIdJm9oQ+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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d 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)))