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#1537: diff-mode for git patches trouble Date: Fri, 12 Dec 2008 14:08:19 -0500 Message-ID: References: <494110EB.3040600@mns.spb.ru> <49420B4F.9000902@mns.spb.ru> Reply-To: Stefan Monnier , 1537@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1229110043 30577 80.91.229.12 (12 Dec 2008 19:27:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 12 Dec 2008 19:27:23 +0000 (UTC) Cc: 1537@emacsbugs.donarmstrong.com To: Dmitriy Blinov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Dec 12 20:28:24 2008 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1LBDfN-0000xJ-1j for geb-bug-gnu-emacs@m.gmane.org; Fri, 12 Dec 2008 20:27:13 +0100 Original-Received: from localhost ([127.0.0.1]:48580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LBDeB-00080C-DI for geb-bug-gnu-emacs@m.gmane.org; Fri, 12 Dec 2008 14:25:59 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LBDcg-0006zr-80 for bug-gnu-emacs@gnu.org; Fri, 12 Dec 2008 14:24:26 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LBDce-0006xa-Eb for bug-gnu-emacs@gnu.org; Fri, 12 Dec 2008 14:24:24 -0500 Original-Received: from [199.232.76.173] (port=34428 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LBDcd-0006wo-3g for bug-gnu-emacs@gnu.org; Fri, 12 Dec 2008 14:24:23 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:48775) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LBDcc-0001Mi-CQ for bug-gnu-emacs@gnu.org; Fri, 12 Dec 2008 14:24:22 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mBCJOIFZ009965; Fri, 12 Dec 2008 11:24:19 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id mBCJF38p007273; Fri, 12 Dec 2008 11:15:03 -0800 X-Loop: don@donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Fri, 12 Dec 2008 19:15:02 +0000 Resent-Message-ID: Resent-Sender: don@donarmstrong.com X-Emacs-PR-Message: report 1537 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 1537-submit@emacsbugs.donarmstrong.com id=B1537.12291089105755 (code B ref 1537); Fri, 12 Dec 2008 19:15:02 +0000 X-Spam-Bayes: score:0.0000 Tokens: new, 15; hammy, 103; neutral, 39; spammy, 4. spammytokens:0.997-1--formally, 0.997-1--gits, 0.976-7--friendly, 0.866-+--here hammytokens:0.000-+--emacs, 0.000-+--Emacs, 0.000-+--H*M:fsf, 0.000-+--H*UA:Emacs, 0.000-+--H*u:Emacs Original-Received: (at 1537) by emacsbugs.donarmstrong.com; 12 Dec 2008 19:08:30 +0000 Original-Received: from pruche.dit.umontreal.ca (pruche.dit.umontreal.ca [132.204.246.22]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id mBCJ8LP9005745; Fri, 12 Dec 2008 11:08:23 -0800 Original-Received: from alfajor.home (vpn-132-204-232-87.acd.umontreal.ca [132.204.232.87]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id mBCJ8vxx007975; Fri, 12 Dec 2008 14:08:57 -0500 Original-Received: by alfajor.home (Postfix, from userid 20848) id B4B641C13C; Fri, 12 Dec 2008 14:08:19 -0500 (EST) In-Reply-To: <49420B4F.9000902@mns.spb.ru> (Dmitriy Blinov's message of "Fri, 12 Dec 2008 09:57:19 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3167=0 X-CrossAssassin-Score: 2 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Resent-Date: Fri, 12 Dec 2008 14:24:24 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:23244 Archived-At: severity 1537 wishlist thanks >> Of course, in the general case the problem is insoluble (e.g. if you >> edit the line with the "--"), but clearly we can do better in the >> "normal" case. > Probably it was incorrect to post this feature here. In fact it's git > problem but not emacs. No, it definitely has its place here: while it's true that Git's output is not very friendly to patch-editing as supported by diff-mode, the output is formally correct and unambiguous. And your example of changes is also unambiguous, so you can definitely argue that Emacs should behave correctly in this case. Stefan