From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Mark Oteiza Newsgroups: gmane.emacs.bugs Subject: bug#25105: 26.0.50; diff navigation is broken Date: Thu, 5 Jan 2017 22:06:06 -0500 Message-ID: <20170106030606.GB1101@holos.localdomain> References: <87inpt6lce.fsf@gmail.com> <87tw9dc7bk.fsf@secretsauce.net> <87shoxc70l.fsf@secretsauce.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1483672040 11421 195.159.176.226 (6 Jan 2017 03:07:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 6 Jan 2017 03:07:20 +0000 (UTC) User-Agent: Mutt/1.7.2+12 (2bc2ec9ac664) (2016-11-26) Cc: 25105@debbugs.gnu.org, Dmitry Gutov , Tino Calancha , npostavs@users.sourceforge.net To: Dima Kogan Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 06 04:07:16 2017 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 1cPKs7-0002R8-HS for geb-bug-gnu-emacs@m.gmane.org; Fri, 06 Jan 2017 04:07:15 +0100 Original-Received: from localhost ([::1]:49811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPKsB-0002rb-7k for geb-bug-gnu-emacs@m.gmane.org; Thu, 05 Jan 2017 22:07:19 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPKry-0002kF-Rh for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2017 22:07:11 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPKrt-0006wy-VM for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2017 22:07:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cPKrt-0006wu-RU for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2017 22:07:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cPKrt-0007yJ-LS for bug-gnu-emacs@gnu.org; Thu, 05 Jan 2017 22:07:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Mark Oteiza Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 06 Jan 2017 03:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25105 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25105-submit@debbugs.gnu.org id=B25105.148367197530577 (code B ref 25105); Fri, 06 Jan 2017 03:07:01 +0000 Original-Received: (at 25105) by debbugs.gnu.org; 6 Jan 2017 03:06:15 +0000 Original-Received: from localhost ([127.0.0.1]:44212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cPKr8-0007x7-Ns for submit@debbugs.gnu.org; Thu, 05 Jan 2017 22:06:14 -0500 Original-Received: from mail-qk0-f195.google.com ([209.85.220.195]:34237) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cPKr7-0007wu-32 for 25105@debbugs.gnu.org; Thu, 05 Jan 2017 22:06:13 -0500 Original-Received: by mail-qk0-f195.google.com with SMTP id e1so5071697qkh.1 for <25105@debbugs.gnu.org>; Thu, 05 Jan 2017 19:06:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=udel-edu.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=NcS88T3RFUG8247h+6Ajqvs/uueal5Vyt4gOJG7Iack=; b=WEhc4yRuJqKQo/JJ3yGQ2L8jyvtfqFJiqisSG/npCJSqWQ9LOLMt7oqrO8gFeQ3kgH UfppsPPTaV9Yi3CxXUj7/bdV1bEcoGhbrt9Dggza8ryCIc4vvkU2pevtxy1lJMtU8EOf fSqy7uDFw32ox0BBlHlbec+OQBTf2BayMmVnrWYiEoHCwv6foROCeIZJV3ZDtPtuO9FX Gr81PCT+MnD0gwW+tw8PbUxnfMyR1LnJQftpY0kj5IE2EXRSnz5OsJRfHGR4E8YVdPHq iWgErLYt/3scdTqGNU+6yyf69zWil0BuCDg774BUxXlzN+8tbiuD/gvoJ64Of+2m5EcO a5SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=NcS88T3RFUG8247h+6Ajqvs/uueal5Vyt4gOJG7Iack=; b=M+LtKLLlYXe4r52Q3mYDEdkCoUWBy6m+KsIXIk9oKrie60Bmh6EDUXdX2A+NFrvXhe 8NMVvCQ7E1v8l4KDXFDgnojyb+EIsM+nQUnc7rxNN6LGDPS5YPWMnGEewMJzgpXtZli/ JR18pSV8bXieQNc3JClZw2q1TufsCIpKU78wqPIpzYyF/4O5yW7ZDex6jee38vZx5YxI cEECf8bgZZEweMhM/xnC8g6NDFb0kyMY/HrJypxgWMtwsYIXf/frff6qWnfnJBNm8Vzb B6DnKAf+Sumpm8tAKpefKV47I+UylCz7kGK6BqSqP9AdX093ik7pdUyyLvqSISzjTwoC PacQ== X-Gm-Message-State: AIkVDXK8Is3kao9fixs4V2xhmDizp7WXfRDRwzOmdeRtj7lwQog7ZcDkX4T30lB4qvSTh53T X-Received: by 10.55.142.194 with SMTP id q185mr70565812qkd.82.1483671967693; Thu, 05 Jan 2017 19:06:07 -0800 (PST) Original-Received: from holos.localdomain (pool-173-67-40-97.bltmmd.fios.verizon.net. [173.67.40.97]) by smtp.gmail.com with ESMTPSA id z22sm49567261qkb.22.2017.01.05.19.06.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jan 2017 19:06:07 -0800 (PST) Original-Received: by holos.localdomain (Postfix, from userid 1000) id A2B0360D63; Thu, 5 Jan 2017 22:06:06 -0500 (EST) Content-Disposition: inline In-Reply-To: <87shoxc70l.fsf@secretsauce.net> 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:127807 Archived-At: On 05/01/17 at 05:27pm, Dima Kogan wrote: > Dima Kogan writes: > > > The behavior I want is to always have a consistent idea of which hunk we > > are currently on. > > Some more behaviors that I think are desirable are described in the > commit message of the main patch: > > https://github.com/emacs-mirror/emacs/commit/2c8a7e50d24daf19e The only mention of the changes to navigation is "Better navigation logic". Not documented in NEWS, and no tests for the corner cases. I fail to see how fixing corner cases in diff-apply-hunk has anything to do with diff-{file,hunk}-{next-prev} At first glance, it looks like the following patch would restore the previous behavior, however it completely breaks auto refinement. diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 9dfcd944bb..3442b01d12 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -625,7 +625,7 @@ diff--wrap-navigation ;; inner one does not, which breaks the loop. (defun diff-hunk-prev (&optional count skip-hunk-start) "Go to the previous COUNT'th hunk." - (interactive (list (prefix-numeric-value current-prefix-arg) t)) + (interactive (list (prefix-numeric-value current-prefix-arg) nil)) (diff--wrap-navigation skip-hunk-start "prev hunk" @@ -636,7 +636,7 @@ diff-hunk-prev (defun diff-hunk-next (&optional count skip-hunk-start) "Go to the next COUNT'th hunk." - (interactive (list (prefix-numeric-value current-prefix-arg) t)) + (interactive (list (prefix-numeric-value current-prefix-arg) nil)) (diff--wrap-navigation skip-hunk-start "next hunk" @@ -647,7 +647,7 @@ diff-hunk-next (defun diff-file-prev (&optional count skip-hunk-start) "Go to the previous COUNT'th file." - (interactive (list (prefix-numeric-value current-prefix-arg) t)) + (interactive (list (prefix-numeric-value current-prefix-arg) nil)) (diff--wrap-navigation skip-hunk-start "prev file" @@ -658,7 +658,7 @@ diff-file-prev (defun diff-file-next (&optional count skip-hunk-start) "Go to the next COUNT'th file." - (interactive (list (prefix-numeric-value current-prefix-arg) t)) + (interactive (list (prefix-numeric-value current-prefix-arg) nil)) (diff--wrap-navigation skip-hunk-start "next file"