From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dima Kogan Newsgroups: gmane.emacs.bugs Subject: bug#33054: 25.2; diff-model: M-k kills wrong hunk Date: Mon, 15 Oct 2018 13:56:27 -0700 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1539636850 5539 195.159.176.226 (15 Oct 2018 20:54:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 15 Oct 2018 20:54:10 +0000 (UTC) To: 33054@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 15 22:54:06 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gC9sK-0001Hl-Rb for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 Oct 2018 22:54:04 +0200 Original-Received: from localhost ([::1]:54852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC9uR-0003Pt-10 for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 Oct 2018 16:56:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gC9uL-0003Pc-LS for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:56:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gC9uH-00087A-2t for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:56:09 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47276) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gC9uE-000860-PX for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:56:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gC9uE-0004Md-CC for bug-gnu-emacs@gnu.org; Mon, 15 Oct 2018 16:56:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 Oct 2018 20:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33054 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.153963694816754 (code B ref -1); Mon, 15 Oct 2018 20:56:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 15 Oct 2018 20:55:48 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-Received: by fatty.jpl.nasa.gov (sSMTP sendmail emulation); Mon, 15 Oct 2018 13:56:27 -0700 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:151288 Archived-At: --=-=-= 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 --=-=-=--