From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 15 16:55:48 2018 Received: (at submit) by debbugs.gnu.org; 15 Oct 2018 20:55:48 +0000 Received: from localhost ([127.0.0.1]:51534 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gC9u0-0004MA-ED for submit@debbugs.gnu.org; Mon, 15 Oct 2018 16:55:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gC9ty-0004Lx-Up for submit@debbugs.gnu.org; Mon, 15 Oct 2018 16:55:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gC9ts-0007km-RZ for submit@debbugs.gnu.org; Mon, 15 Oct 2018 16:55:41 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39386) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gC9ts-0007kS-Kf for submit@debbugs.gnu.org; Mon, 15 Oct 2018 16:55:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC9tr-0003PA-Rn for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:55:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gC9to-0007fR-HW for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:55:39 -0400 Received: from smtp.jpl.nasa.gov ([128.149.139.105]:19052 helo=mail.jpl.nasa.gov) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gC9to-0007cD-57 for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:55:36 -0400 Received: from fatty.jpl.nasa.gov (fatty.jpl.nasa.gov [128.149.110.161]) (authenticated (0 bits)) by smtp.jpl.nasa.gov (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id w9FKtSS8025952 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits) verified NO) for ; Mon, 15 Oct 2018 13:55:29 -0700 Received: by fatty.jpl.nasa.gov (sSMTP sendmail emulation); Mon, 15 Oct 2018 13:56:27 -0700 From: Dima Kogan To: bug-gnu-emacs@gnu.org Subject: 25.2; diff-model: M-k kills wrong hunk Date: Mon, 15 Oct 2018 13:56:27 -0700 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Source-Sender: dima@secretsauce.net X-AUTH: Authorized X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit 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: -6.0 (------) --=-=-= Content-Type: text/plain I'm using a very recent build: e4896856172 Steps to reproduce bug: - Open attached diff. Emacs should open it in diff-mode - Put point on 'd' in the second "diff": (goto-char 98) - M-k This should kill the hunk we're on. We are unambiguously sitting on the second hunk, but the latest diff-mode is confused, thinks we're on the first hunk, and kills that instead. Kinda. Moving the point even one character forward makes it work. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=bug.patch diff --git a/111.py b/111.py --- a/111.py +++ b/111.py @@ -154,3 +154,3 @@ - aaa + bbb diff --git a/222.py b/222.py --- a/222.py +++ b/222.py @@ -224,3 +230,3 @@ writemodel(m_to) asdf - 21234 + 345 zxcv --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 16 14:26:40 2018 Received: (at 33054) by debbugs.gnu.org; 16 Oct 2018 18:26:40 +0000 Received: from localhost ([127.0.0.1]:53931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gCU3E-0006ml-0R for submit@debbugs.gnu.org; Tue, 16 Oct 2018 14:26:40 -0400 Received: from colin.muc.de ([193.149.48.1]:21218 helo=mail.muc.de) by debbugs.gnu.org with smtp (Exim 4.84_2) (envelope-from ) id 1gCU3C-0006mc-W3 for 33054@debbugs.gnu.org; Tue, 16 Oct 2018 14:26:39 -0400 Received: (qmail 4368 invoked by uid 3782); 16 Oct 2018 18:26:37 -0000 Date: 16 Oct 2018 18:26:37 -0000 Message-ID: <20181016182637.4367.qmail@mail.muc.de> From: Alan Mackenzie To: Dima Kogan Subject: Re: bug#33054: 25.2; diff-model: M-k kills wrong hunk Organization: muc.de e.V. In-Reply-To: X-Newsgroups: gnu.emacs.bug User-Agent: tin/2.4.2-20171224 ("Lochhead") (UNIX) (FreeBSD/11.2-RELEASE-p3 (amd64)) X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 33054 Cc: 33054@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: -1.0 (-) Hello, Dima: In article you wrote: > [-- text/plain, encoding 7bit, charset: US-ASCII, 14 lines --] > I'm using a very recent build: e4896856172 Very recent? That was from September 8th, over a month ago. ;-) > Steps to reproduce bug: > - Open attached diff. Emacs should open it in diff-mode > - Put point on 'd' in the second "diff": (goto-char 98) > - M-k > This should kill the hunk we're on. It does that for me. > We are unambiguously sitting on the second hunk, but the latest > diff-mode is confused, thinks we're on the first hunk, and kills that > instead. Kinda. Moving the point even one character forward makes it > work. It works for me anyway (With a build updated at most a day ago). I've looked at the git log for diff-mode.el, and nobody's changed anything relevant, that I can see, since early September. What's your environment? Operating system, and so on? Or, maybe something really wierd is happening, and it would stop happening on an up to date snapshot of Emacs. -- Alan Mackenzie (Nuremberg, Germany). From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 16 15:06:14 2018 Received: (at 33054-done) by debbugs.gnu.org; 16 Oct 2018 19:06:14 +0000 Received: from localhost ([127.0.0.1]:53967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gCUfV-0007zi-QN for submit@debbugs.gnu.org; Tue, 16 Oct 2018 15:06:13 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:37547) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gCUfU-0007zX-R7 for 33054-done@debbugs.gnu.org; Tue, 16 Oct 2018 15:06:13 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 7DD052221D; Tue, 16 Oct 2018 15:06:12 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 16 Oct 2018 15:06:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=secretsauce.net; h=references:from:to:cc:subject:in-reply-to:date:message-id :mime-version:content-type; s=fm1; bh=eFHyaOZFULYI19lyyvfnr0XCJT dd3GzLZ9i9+y5Pc8c=; b=hIP4BDSLIfM0MUv3kHTqeLxYCzhiwr5smd5Hb/In+v H7edEHZbn0Q0nye6iAXjZ3o1eXZo5uRV3oGEDNzZOijlhxp0fIrPaGqcgcJSRgrN BDvbnLSnvpJWQcC0BwFTWODM/+9vM8yhg3Dw+vsIqAcc8+2B3MQugQyC8ZSiQjEL Qz62XbgOcDAhBw9QfNkP9LW+WBvItaKX0SqA2rnu4mh7HCH54kGkur3X7Tas+psi 5UNOYxeLYOHI6209gQXAw4R2Z4zum656HcjH72PZGXxTeIWX8AqGTJAcSQtybFaY OoS+L8I70jhJC1IHUY8Rwn4LuD39HbE+m3ZmnWqBoIcw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=eFHyaO ZFULYI19lyyvfnr0XCJTdd3GzLZ9i9+y5Pc8c=; b=tWKio1o4YyZIO/GSFwAfwo YZIEQtMf3DJt0ohrrQkdLwPXdg/Gmr0oN+Cl/F9DVEJSf3dAg1lKhSvI5D7izkDA Y9ijBYYfeIpby6DXRlIqzNyFezvdMkME2En5785yiK28M4cgQJKZW4aBxs6PfLSb StD32R7YAGVubhd2NI04Xa2yDOKB/AGHSDhKf6iFjijuAb7QVo8WfWFAeazFpjR4 QkXzSITfIDvKWH9QeCE0Z6TdPrs2pq1Aa9jUzNqsWk2vEp3P2eHw/PGLRTryRV3/ 7MeE9fVR4NuVPFmxpeRdeJbUT4QaZnqK1xs7ySpBNJSDw4tcHM3m9Yr66skX+g7g == X-ME-Sender: X-ME-Proxy: Received: from shorty.local (nat-guest-187.vonkarman.net [207.151.223.187]) by mail.messagingengine.com (Postfix) with ESMTPA id BB1BE102ED; Tue, 16 Oct 2018 15:06:11 -0400 (EDT) Received: from dima by shorty.local with local (Exim 4.90) (envelope-from ) id 1gCUfS-0008B9-3D; Tue, 16 Oct 2018 12:06:10 -0700 References: <20181016182637.4367.qmail@mail.muc.de> User-agent: mu4e 0.9.17; emacs 27.0.50 From: "dima\@secretsauce.net" To: Alan Mackenzie Subject: Re: bug#33054: 25.2; diff-model: M-k kills wrong hunk In-reply-to: <20181016182637.4367.qmail@mail.muc.de> Date: Tue, 16 Oct 2018 12:06:10 -0700 Message-ID: <87r2gpu2xp.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 33054-done Cc: 33054-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: -1.7 (-) Alan Mackenzie writes: >> Steps to reproduce bug: > >> - Open attached diff. Emacs should open it in diff-mode >> - Put point on 'd' in the second "diff": (goto-char 98) >> - M-k > >> This should kill the hunk we're on. > > It does that for me. Hi Alan. Thanks for the response. I was consistently seeing the problem, but poked around a bit more after seeing your comment. I found the issue: I was doing something wrong (specifics completely uninteresting). There is no issue, and I'm closing the bug. Sorry for the noise. From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 16 15:35:32 2018 Received: (at 33054-done) by debbugs.gnu.org; 16 Oct 2018 19:35:33 +0000 Received: from localhost ([127.0.0.1]:53999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gCV7s-0000SJ-MB for submit@debbugs.gnu.org; Tue, 16 Oct 2018 15:35:32 -0400 Received: from colin.muc.de ([193.149.48.1]:64996 helo=mail.muc.de) by debbugs.gnu.org with smtp (Exim 4.84_2) (envelope-from ) id 1gCV7q-0000S7-Jk for 33054-done@debbugs.gnu.org; Tue, 16 Oct 2018 15:35:31 -0400 Received: (qmail 25613 invoked by uid 3782); 16 Oct 2018 19:35:29 -0000 Received: from acm.muc.de (p5B14712A.dip0.t-ipconnect.de [91.20.113.42]) by colin.muc.de (tmda-ofmipd) with ESMTP; Tue, 16 Oct 2018 21:35:28 +0200 Received: (qmail 10468 invoked by uid 1000); 16 Oct 2018 19:27:39 -0000 Date: Tue, 16 Oct 2018 19:27:39 +0000 To: "dima@secretsauce.net" Subject: Re: bug#33054: 25.2; diff-model: M-k kills wrong hunk Message-ID: <20181016192739.GC5722@ACM> References: <20181016182637.4367.qmail@mail.muc.de> <87r2gpu2xp.fsf@secretsauce.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87r2gpu2xp.fsf@secretsauce.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-Delivery-Agent: TMDA/1.1.12 (Macallan) From: Alan Mackenzie X-Primary-Address: acm@muc.de X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 33054-done Cc: 33054-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: -1.0 (-) Hello, Dima On Tue, Oct 16, 2018 at 12:06:10 -0700, dima@secretsauce.net wrote: > Alan Mackenzie writes: > >> Steps to reproduce bug: > >> - Open attached diff. Emacs should open it in diff-mode > >> - Put point on 'd' in the second "diff": (goto-char 98) > >> - M-k > >> This should kill the hunk we're on. > > It does that for me. > Hi Alan. Thanks for the response. I was consistently seeing the problem, > but poked around a bit more after seeing your comment. I found the > issue: I was doing something wrong (specifics completely uninteresting). > There is no issue, and I'm closing the bug. Sorry for the noise. That's OK, glad you got it sorted out! -- Alan Mackenzie (Nuremberg, Germany). From unknown Sat Jun 21 05:10:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 14 Nov 2018 12:24:05 +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