From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#17522: diff-mode frustrates attempt to correct corrupted diff file. Date: Sun, 25 May 2014 16:18:09 -0400 Message-ID: References: <20140518105055.GA3727@acm.acm> <20140521215636.GA3908@acm.acm> <20140525160755.GA2777@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1401049170 11563 80.91.229.3 (25 May 2014 20:19:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 25 May 2014 20:19:30 +0000 (UTC) Cc: 17522@debbugs.gnu.org To: Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 25 22:19:23 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Woet7-0003fa-9i for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 May 2014 22:19:21 +0200 Original-Received: from localhost ([::1]:53229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woet6-0000sZ-Fm for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 May 2014 16:19:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woesv-0000rA-U4 for bug-gnu-emacs@gnu.org; Sun, 25 May 2014 16:19:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Woeso-0001hb-Eg for bug-gnu-emacs@gnu.org; Sun, 25 May 2014 16:19:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:32814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woeso-0001hS-Bt for bug-gnu-emacs@gnu.org; Sun, 25 May 2014 16:19:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Woesn-0002f8-Pl for bug-gnu-emacs@gnu.org; Sun, 25 May 2014 16:19:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 May 2014 20:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17522 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 17522-submit@debbugs.gnu.org id=B17522.140104909910180 (code B ref 17522); Sun, 25 May 2014 20:19:01 +0000 Original-Received: (at 17522) by debbugs.gnu.org; 25 May 2014 20:18:19 +0000 Original-Received: from localhost ([127.0.0.1]:59924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Woes6-0002e7-Bg for submit@debbugs.gnu.org; Sun, 25 May 2014 16:18:18 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:30562) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Woes3-0002dr-S9 for 17522@debbugs.gnu.org; Sun, 25 May 2014 16:18:16 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVNLd/fU/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCwsOJhIUGA0kiAQI0hkXjnoHhDgEqRmBaoNMIQ X-IPAS-Result: ArUGAIDvNVNLd/fU/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMFCwsOJhIUGA0kiAQI0hkXjnoHhDgEqRmBaoNMIQ X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="64105569" Original-Received: from 75-119-247-212.dsl.teksavvy.com (HELO pastel.home) ([75.119.247.212]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 25 May 2014 16:18:09 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id C394F60132; Sun, 25 May 2014 16:18:09 -0400 (EDT) In-Reply-To: <20140525160755.GA2777@acm.acm> (Alan Mackenzie's message of "Sun, 25 May 2014 16:07:55 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:89490 Archived-At: >> diff-mode.el was partly changed to accommodate that looser format, but >> not 100%. > Why not? The usual: lack of time/motivation/... > If you're going to carry on making surreptitious changes to > hunk headers, you'll need to determine the start and end of hunks > reliably, especially corrupted hunks. This can't be done with 100% > certainty, and is going to involve heuristics. A good way might be to > scan a hunk _forwards_ counting lines before the first change to that > hunk. Exactly, with a before-change-function. And if the hunk is found to be borked, then try to at least not make things worse (and maybe suggest the use of diff-sanity-check-hunk, after we make it into a command). Stefan