From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "J.P." Newsgroups: gmane.emacs.bugs Subject: bug#63595: 30.0.50; ERC 5.6: Add buffer-list and nick-list modules Date: Sun, 20 Aug 2023 12:56:30 -0700 Message-ID: <87350da3o1.fsf__3632.68293892673$1692561463$gmane$org@neverwas.me> References: <87lehkt97a.fsf@neverwas.me> <87jztvdqxh.fsf@neverwas.me> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28587"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 63595@debbugs.gnu.org, emacs-erc@gnu.org To: Corwin Brust Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 20 21:57:35 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qXoYI-0007Ce-Bj for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 20 Aug 2023 21:57:34 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qXoXn-0001Mp-92; Sun, 20 Aug 2023 15:57:03 -0400 Original-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 1qXoXk-0001LG-AL for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 15:57:00 -0400 Original-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 1qXoXk-0006X4-1H for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 15:57:00 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qXoXl-0005Wu-Of for bug-gnu-emacs@gnu.org; Sun, 20 Aug 2023 15:57:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "J.P." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 Aug 2023 19:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63595 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 63595-submit@debbugs.gnu.org id=B63595.169256140321230 (code B ref 63595); Sun, 20 Aug 2023 19:57:01 +0000 Original-Received: (at 63595) by debbugs.gnu.org; 20 Aug 2023 19:56:43 +0000 Original-Received: from localhost ([127.0.0.1]:54896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXoXS-0005WJ-0I for submit@debbugs.gnu.org; Sun, 20 Aug 2023 15:56:43 -0400 Original-Received: from mail-108-mta181.mxroute.com ([136.175.108.181]:39763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXoXO-0005W9-GP for 63595@debbugs.gnu.org; Sun, 20 Aug 2023 15:56:40 -0400 Original-Received: from mail-111-mta2.mxroute.com ([136.175.111.2] filter006.mxroute.com) (Authenticated sender: mN4UYu2MZsgR) by mail-108-mta181.mxroute.com (ZoneMTA) with ESMTPSA id 18a148548be000d7b6.002 for <63595@debbugs.gnu.org> (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 20 Aug 2023 19:56:33 +0000 X-Zone-Loop: 8f3857473f226c33cd58e38fb9d3569524342ebccd21 X-Originating-IP: [136.175.111.2] DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=neverwas.me ; s=x; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=8J8+3V3WEKFuO7s8c/A53FfGhpUSmH6UGK5RX7MshtI=; b=WuubFQoiKzyf5p4BSw/RGxFJWb dBakFkcTwSuI47dQNq7PvY4Kl09886ePSGxjNcdwepzXnSuF5HCGm5UtRC+/ukSSkhhJM2sV0/hlU DxtbpTWGmhHwU3DjunwWQaZfnCjUdcH4KAFesVqrikPnpMBBqokWk95GrswO1Q9n1WPZo+EqcxnN6 eaBkT+5MP3sZSNmElpBSnPDncDjGG1rlO6yp9seCnayOlQPOdNYPuLg0oYgpT7RoGZe4SlEbnQNep qElQ4ZEcXYJGJIgmWwxPRyiFTgKBwxDAASOUgoiX0fpRt5Nn2OC1T3vrFQtaWv2o2WubSqS4bQCRP KCb3H0RQ==; In-Reply-To: (Corwin Brust's message of "Sun, 20 Aug 2023 12:23:30 -0500") X-Authenticated-Id: masked@neverwas.me X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:268031 Archived-At: Corwin Brust writes: > TL;DR: Couldn't apply; can you double check? Hm, I'm able to apply that patch atop a563ea8 [1]. $ cd /tmp $ git clone --depth 1 https://git.savannah.gnu.org/git/emacs.git $ cd emacs $ curl -L "$url [2]" | git am Applying: Prevent unwanted recursion in erc-nickbar-disable $ git status On branch master Your branch is ahead of 'origin/master' by 1 commit. (use "git push" to publish your local commits) nothing to commit, working tree clean $ git log -n2 --oneline 5104bc0 Prevent unwanted recursion in erc-nickbar-disable a563ea8 * lisp/isearch.el (isearch-resume): Add isearch-push-state (bug#65379). However, as I type this, I'm thinking I should have also tried it with a minimal ~/.gitconfig as well as after running ./autogen.sh. That said, I do both in CI (with a slightly updated patch), and it works fine. > detail below and thanks for the insta-response! > > corwi@Avalon MINGW64 /h/emacs-dev/emacs-nt > $ git status > On branch master > Your branch is up to date with 'origin/master'. > > nothing to commit, working tree clean > > corwi@Avalon MINGW64 /h/emacs-dev/emacs-nt > $ git apply /c/Users/corwi/Downloads/0001-5.6-Prevent-unwanted-recursion-in-erc-nickbar-disabl.patch > error: patch failed: lisp/erc/erc-speedbar.el:439 > error: lisp/erc/erc-speedbar.el: patch does not apply > error: patch failed: test/lisp/erc/erc-scenarios-status-sidebar.el:94 > error: test/lisp/erc/erc-scenarios-status-sidebar.el: patch does not apply > error: patch failed: test/lisp/erc/resources/erc-scenarios-common.el:122 > error: test/lisp/erc/resources/erc-scenarios-common.el: patch does not apply > > corwi@Avalon MINGW64 /h/emacs-dev/emacs-nt > $ I find it unlikely that none of the hunks apply cleanly. Perhaps this has something to do with white space/line endings? Maybe you need to change core.autocrlf or similar? [1] https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=a563ea89633963fb20c4159bd5e8da825ffc2248 [2] https://debbugs.gnu.org/cgi/bugreport.cgi?filename=0001-5.6-Prevent-unwanted-recursion-in-erc-nickbar-disabl.patch;msg=23;bug=63595;att=1