From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YCCKO6AWxWHXIAEAgWs5BA (envelope-from ) for ; Fri, 24 Dec 2021 01:38:56 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id QDY+N6AWxWG1IAAA1q6Kng (envelope-from ) for ; Fri, 24 Dec 2021 00:38:56 +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 9840E15BED for ; Fri, 24 Dec 2021 01:38:56 +0100 (CET) Received: from localhost ([::1]:50918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Ybn-0000kA-Or for larch@yhetil.org; Thu, 23 Dec 2021 19:38:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0Yay-0000ji-I7 for guix-patches@gnu.org; Thu, 23 Dec 2021 19:38:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0Yaw-0004e7-Fl for guix-patches@gnu.org; Thu, 23 Dec 2021 19:38:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n0Yaw-000803-5V for guix-patches@gnu.org; Thu, 23 Dec 2021 19:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52763] [PATCH] etc: Match define-public only at line start. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Dec 2021 00:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52763 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52763@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164030625230712 (code B ref -1); Fri, 24 Dec 2021 00:38:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2021 00:37:32 +0000 Received: from localhost ([127.0.0.1]:35278 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0YaS-0007zI-FH for submit@debbugs.gnu.org; Thu, 23 Dec 2021 19:37:32 -0500 Received: from lists.gnu.org ([209.51.188.17]:52544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n0YaQ-0007zB-IX for submit@debbugs.gnu.org; Thu, 23 Dec 2021 19:37:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0YaQ-0000gY-8A for guix-patches@gnu.org; Thu, 23 Dec 2021 19:37:30 -0500 Received: from [2a00:1450:4864:20::442] (port=43898 helo=mail-wr1-x442.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0YaO-0004bk-Ni for guix-patches@gnu.org; Thu, 23 Dec 2021 19:37:29 -0500 Received: by mail-wr1-x442.google.com with SMTP id v11so14448651wrw.10 for ; Thu, 23 Dec 2021 16:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=KVL1FdtbNuSC7Is4ZzeFGPPHprN6b4jRIwPwzM5xnJg=; b=i31PBT/ofRmklWLvEEcmnsSP3TICvPti6L/WaPAPJjBUjzVzmHNANuge7g6tqkn9LK ZFnx7UoldiALsIF1VAwf9jHvQ57ukNY40pkepHtt+X8fd1gKNa/PD4tDvEtxuOl8YTl8 oMySWj5j3xL04vIQk4gwsrayuRgq9GrniPFj0SrtJf0A5i4VB3Nz6CvAF5CerxYgkeKx Wqmq59YtYXeo0ZFGdrjrUZ6eoVMKRmgoHPI0QMkQO3OMEmk6GUcZSP7rFIIxB30RCDDW rVtT/KKCE/dqZjCisb23YebdJNe9D23A3TEAWs8dBo6EJ9jyYYRSku8V9KqC+ExUylXE 2HpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=KVL1FdtbNuSC7Is4ZzeFGPPHprN6b4jRIwPwzM5xnJg=; b=JdsynTRq4lFSip4MDFiwSHRthEzjqORb3a/HxXjRwWR6oBMNSN8m3/8AGSFw0bLe4a 1WDgPI1jCAwTolbbUoSYzVi0NG4hEByG3IKFkeLopb26A7mY45nHL4Z1QLLuxm+CaADK 0IegZAIVk3r3RPkhPeB81V7gUJpQmMKYuB0SUv/VlVAIPX1BPG9f5EqWbs0mKEoct0A9 EIUQ0SW7kl7wEUzRyfuzK+beA0i03vIQRyKh+MonfIeVmfC75qi7lVP1eQMYgDRhRm3H /kIKz/ZNKWsy9u+dvujJa8poXDQxU+f7lDA1b1f0gnN1Sib/zdXzSlLCtMmZ0GeErJeY 8JNQ== X-Gm-Message-State: AOAM5319dkGP9Uvy0g5hCOTDtqVHtWCQGiVAEiRuMcMyEEEuZrgKIfe7 P1d0uEPurNnBP4aedpK1syKRizmLmZnBFQ== X-Google-Smtp-Source: ABdhPJwX36DykZchojI2fe+ZvUgBCeTzokaFq1di5AH3iAyPp3xoirSLoWKZ9/Cq2rWHoUc+Ga/gsQ== X-Received: by 2002:a5d:448e:: with SMTP id j14mr3272549wrq.615.1640306247303; Thu, 23 Dec 2021 16:37:27 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a3sm7283081wri.98.2021.12.23.16.37.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 16:37:26 -0800 (PST) From: Liliana Marie Prikler Date: Fri, 24 Dec 2021 01:33:14 +0100 Content-Transfer-Encoding: 7bit Message-ID: <5c3dc22c35166190de3a5ce802131df4f718d73d.camel@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::442 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=liliana.prikler@gmail.com; helo=mail-wr1-x442.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640306336; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=KVL1FdtbNuSC7Is4ZzeFGPPHprN6b4jRIwPwzM5xnJg=; b=iJsvUI15rss4L61HAdA+wYYDTXMp1/Xd9wwckV3ly9APCr7LCanxBJghsGnD+tuvsUIINw VCQzcyv3K2dEu2uKpfubXC//ohgJsAxNXgWwFRV/jy/4I9x2HR4NxjTqOvw86aencv0zOn 7pcjs/YG756ipmNsVk/TulFQaFb623SDz4mgWE448YQfS2mSS8JaOObr54lvNvo58szFSy F1hMXcP2cTyfTNrc5zer3G7BajBkP4VUiN1NJBj63PxW4y/t03x9xxvnyzDvMG8EuTITsM RfGay4yOXjCBBPsKacI4elr7VVgf7dfeOrdTCfhwIFwPimtyW2tmwWcioLO5sA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640306336; a=rsa-sha256; cv=none; b=ddM/zpYIkdUiJX8uBwZ6tFSKvQtoZTyJOStvSrgaFVledzbQc0NvjtfqG29LEdQg3XZFht yedW3U1Fa7la7gn10iblYkYKgGmQZ9JTcde1CSqhuIAXv2ovzs2T5wE5gWbUDGRLY7jACu 0ly+4NaMIHaRZObFe4vgo+yTzvefCg64tUC/8HQkF0H8I9EZg7TNdJUx8jAlfILpNzHaB5 AQv0p40yp45UPm/NVIszegjMQxu2Fcd/nGqbkiAH4iUOR9lSYwPeR5xuCao5HNJzirl56a osdsDOAYNH/WlZPIOK7A08Zg0CknjAXmRYG3C8tURrkuB5+/Ha18A/CBJMyWFA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="i31PBT/o"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="i31PBT/o"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 9840E15BED X-Spam-Score: -2.45 X-Migadu-Scanner: scn0.migadu.com X-TUID: SiL+KeX0nFU8 The current regexp simply matches the first occurence, which more often than not points to the *previous* variable. * etc/snippets/text-mode/guix-commit-message-update-package ($1): Restrict match to beginning of line with optional indentation. --- etc/snippets/text-mode/guix-commit-message-update-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/snippets/text-mode/guix-commit-message-update-package b/etc/snippets/text-mode/guix-commit-message-update-package index f187419aa2..b08df74a0b 100644 --- a/etc/snippets/text-mode/guix-commit-message-update-package +++ b/etc/snippets/text-mode/guix-commit-message-update-package @@ -8,7 +8,7 @@ gnu: ${1:`(with-temp-buffer (magit-git-wash #'magit-diff-wash-diffs "diff" "--staged") (goto-char (point-min)) - (when (re-search-forward "(define-public \\(\\S-+\\)" nil 'noerror) + (when (re-search-forward "^[ ]*(define-public \\(\\S-+\\)" nil 'noerror) (match-string-no-properties 1)))`}: Update to ${2:`(with-temp-buffer (magit-git-wash #'magit-diff-wash-diffs "diff" "--staged") -- 2.34.0