From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sE8IOadjA2D4bQAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 22:07:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OCbCNKdjA2AwcQAAbx9fmQ (envelope-from ) for ; Sat, 16 Jan 2021 22:07:35 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3464F9403D6 for ; Sat, 16 Jan 2021 22:07:35 +0000 (UTC) Received: from localhost ([::1]:37162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0tjK-0007Sw-7Z for larch@yhetil.org; Sat, 16 Jan 2021 17:07:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0tgs-0004Ct-7y for guix-patches@gnu.org; Sat, 16 Jan 2021 17:05:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0tgs-0004aB-0V for guix-patches@gnu.org; Sat, 16 Jan 2021 17:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0tgr-0001Gl-S9 for guix-patches@gnu.org; Sat, 16 Jan 2021 17:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44249] [PATCH] gnu: emacs: Make strip-double-wrap more robust Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 22:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 44249-submit@debbugs.gnu.org id=B44249.16108346594828 (code B ref 44249); Sat, 16 Jan 2021 22:05:01 +0000 Received: (at 44249) by debbugs.gnu.org; 16 Jan 2021 22:04:19 +0000 Received: from localhost ([127.0.0.1]:44178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0tgB-0001Fo-Ff for submit@debbugs.gnu.org; Sat, 16 Jan 2021 17:04:19 -0500 Received: from mail-bn8nam11olkn2072.outbound.protection.outlook.com ([40.92.20.72]:36673 helo=NAM11-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0tg7-0001FZ-Fu for 44249@debbugs.gnu.org; Sat, 16 Jan 2021 17:04:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mBmrRyAQQa2AuuX98lOm/mnFqVMmG6tpx7I1zdVEReFw5i3LGV7G0hkhWX2NMbdZ1M8ugEFzabYiKHNgb44Ia3JPRH5WBri7ZccT0hsyMW8h0e5uFCepog/UqpvmY6IybBpt+PtGPfe4sRA5Avhg5n7kceXg8PSg6t4LGiI9Rr3j4A0CZUVX0O+7KdrjsgQUJoDOx9+XsKz8jeCb2udNEMMemfZilYIIXn0t3eIMTPlbXQBOAfGkdHwHfToqFTFc2AvEuhHjbtploxC9mIrkQ6wHRQOp2F3ZKvmeYpexU0MmN9ORe+xc3FSa4CV6JR1/+8OH+aB5kBStnF63arE2fg== 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-SenderADCheck; bh=NHYvtc+JtYf6nw0JXqyTPiY+BExU1GBb0E16S0iRQQQ=; b=Q3EMW54LfXlTS8LXegrkK+plaLY+/tPDbj2YVkQwmRPHTNdCeRp/lqnk0b/6nf6cShMMCq209qW79GcyNrSpBFXlWrMp+t8Z8sQ+mKTTX0/03JapvufGqo1f1C+YHo1wdbnNLjfVROpfsaMbn3gfl3rDg+YUXH7zq4+WAi4zQjyhziraknqdeMiJZG55wFZ7YW8FJZjm2tBjo2diS76ucd6ZmUGD8ndR2N0ozmaHyPJv7+A7H+kwhd5dSw7xKG6exmU2AABABMWEepGcG7RGyu5V7PsHQILxHRzgwvezaOtajNj8HkcaFgk11JgawHZpRr2H3pL+626uwwzrcGlO9Q== 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=NHYvtc+JtYf6nw0JXqyTPiY+BExU1GBb0E16S0iRQQQ=; b=SjkHKCzSz8erhxiexL1NygTb1Lj1kTY/16w+2dhc3Tq3OFHh8Qd3duov1xtdNS216PE7Imj8lrRJ7BGxLsnFcqbyAyQpZiCgkH1xOpRPWncWGardn3D6urydUDW6Ny3n/6TPmbw1Sgp+kVgYMb4kIthyUXLifz8rCsHtCXoFqOnwHwhlwO27rUCg9y406T+p9uDcuM83eT2AYgZpPAtzz/6ussMSWZgt5mXizgSCuf5Flw8m7uwfdgFLEEmKwzwCX5BupLiTnxKmJLZFqZAkivziFNToNGgfyM9/elSBZLe7WdI8tiyzcAx7tmr4e+srY91qTPX8vymtgOULib1+/A== Received: from BN8NAM11FT034.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::47) by BN8NAM11HT212.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Sat, 16 Jan 2021 22:04:09 +0000 Received: from SN4PR0801MB3679.namprd08.prod.outlook.com (2a01:111:e400:fc4b::49) by BN8NAM11FT034.mail.protection.outlook.com (2a01:111:e400:fc4b::139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.12 via Frontend Transport; Sat, 16 Jan 2021 22:04:09 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:94B7BFD2C7C2DF3E35D6AF495E2278C90212E986300B2F12382BFA2AE7D19686; UpperCasedChecksum:EA11654D05CD59415E32AF4E353A8EE338005EB4DCDE65170ADA9CF088CD80F9; SizeAsReceived:8963; Count:48 Received: from SN4PR0801MB3679.namprd08.prod.outlook.com ([fe80::6458:e32b:44a8:55ee]) by SN4PR0801MB3679.namprd08.prod.outlook.com ([fe80::6458:e32b:44a8:55ee%3]) with mapi id 15.20.3763.012; Sat, 16 Jan 2021 22:04:09 +0000 References: <874kjiz5vp.fsf_-_@gnu.org> <875z3wy2cq.fsf_-_@gnu.org> From: Morgan Smith Message-ID: Date: Sat, 16 Jan 2021 17:03:55 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.6.0 In-Reply-To: <875z3wy2cq.fsf_-_@gnu.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-TMN: [IiZwm90ITs0QZ/o5/msougpNJ6mXtHhn] X-ClientProxiedBy: QB1PR01CA0002.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:2d::15) To SN4PR0801MB3679.namprd08.prod.outlook.com (2603:10b6:803:4f::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [192.168.2.37] (70.30.20.141) by QB1PR01CA0002.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c00:2d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.9 via Frontend Transport; Sat, 16 Jan 2021 22:04:00 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b6d77706-0f1c-4dd5-40e2-08d8ba6aa625 X-MS-TrafficTypeDiagnostic: BN8NAM11HT212: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tsQoquQnfSpULIdFS25XUvhFLYXaGF5/WpB4lAY0sa+lPOnd01FEL92dgnn5y+2kIDnbvGeNMRX/19ufEjxHLnJYlbu+XjjARE/K3MaNpSy7hYwz3+Ft1cX1tGiP1ILiooHGEQfTMN5Q+vaFh1RXLocq8HRmzmcoLdYGaQXcHLNLmMOyjCHCCJwaNYywPURJR/DuJSpKQUhySGzvIllMENfefonOZnOxOQJKcGm7cLzG2kwRMG2n4YPaN5Y8dpjV X-MS-Exchange-AntiSpam-MessageData: E2UXV7IiZc9RwkcuXxgaDCODTMrbCEfW0UaR1sS3xzICmlERb6hc0eNl72Vjm5piLQymuSSeMJlpqf2GTMnhsmM/sRzjEMy1fI/W8i3uOBuQDfPQZ7JuqjR0yP1dyjy8GE/4cJmahfQmgcP+TJwg+Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6d77706-0f1c-4dd5-40e2-08d8ba6aa625 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2021 22:04:09.5111 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8NAM11HT212 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: , Cc: 44249@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=SjkHKCzS; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 3464F9403D6 X-Spam-Score: 0.74 X-Migadu-Scanner: scn1.migadu.com X-TUID: pyrgalr7NeVr Hi Ludo, I think that's an elegant and wonderful idea. Assuming the first patch in this thread still applies, I vote we just apply that one. There has been some discussion in this thread on if the regex should actually look for numbers or not (notably Nicolas and you). I could go either way. I'm pretty sure the regex that's already there that matches 2 or more period separated numbers will always hold true, but feel free to loosen up the regex a little if you feel otherwise. Thanks, Morgan On 1/16/21 4:54 PM, Ludovic Courtès wrote: > Hi, > > Morgan Smith skribis: > >> I've actually been sorta half working on this for a while now. >> >> The problem is exactly that the modules field is inherited. See each >> build system includes its own module in the modules field. The various >> emacsen are built with different build systems. So emacs is going to >> need to import (guix build glib-or-gtk-build-system) and emacs-minimal >> is going to want (guix build gnu-build-system). By setting the modules >> to be the glib-or-gtk-build-system, we override the default modules in >> each inherited package. This means building emacs-minimal would result >> in this error: >> >> no code for module (guix build glib-or-gtk-build-system) > > Ooh, my bad, I had completely overlooked this “detail”. > > Then I guess the patch is fine though… in this case you could > exceptionally ;-) write (car (find-files …)) so you don’t even need to > both importing (ice-9 match). That’d save quite a few lines of code. > > WDYT? > > Thanks! > > Ludo’. >