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#18850: smerge-mode: use diff-check-labels Date: Mon, 27 Oct 2014 13:12:53 -0400 Message-ID: References: <87h9ysecea.fsf@violet.siamics.net> <87egttdd37.fsf_-_@violet.siamics.net> <874mupdcpm.fsf@violet.siamics.net> <87vbn5bpnk.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1414430009 13036 80.91.229.3 (27 Oct 2014 17:13:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 27 Oct 2014 17:13:29 +0000 (UTC) Cc: 18850@debbugs.gnu.org To: Ivan Shmakov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 27 18:13:21 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 1Xinr7-0001en-Dy for geb-bug-gnu-emacs@m.gmane.org; Mon, 27 Oct 2014 18:13:21 +0100 Original-Received: from localhost ([::1]:35003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xinr7-0003ut-0T for geb-bug-gnu-emacs@m.gmane.org; Mon, 27 Oct 2014 13:13:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xinqw-0003qo-7x for bug-gnu-emacs@gnu.org; Mon, 27 Oct 2014 13:13:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xinqo-00030S-PU for bug-gnu-emacs@gnu.org; Mon, 27 Oct 2014 13:13:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xinqo-00030O-Lp for bug-gnu-emacs@gnu.org; Mon, 27 Oct 2014 13:13:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xinqo-0007nq-7w for bug-gnu-emacs@gnu.org; Mon, 27 Oct 2014 13:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 27 Oct 2014 17:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18850 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 18850-submit@debbugs.gnu.org id=B18850.141442998129989 (code B ref 18850); Mon, 27 Oct 2014 17:13:02 +0000 Original-Received: (at 18850) by debbugs.gnu.org; 27 Oct 2014 17:13:01 +0000 Original-Received: from localhost ([127.0.0.1]:36919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xinqn-0007nZ-5B for submit@debbugs.gnu.org; Mon, 27 Oct 2014 13:13:01 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:61287) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xinqk-0007nL-VQ for 18850@debbugs.gnu.org; Mon, 27 Oct 2014 13:12:59 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVNFpY87/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMQCzQSFBgNJIgECNIZF456B4Q4BKkZgWqDTCE X-IPAS-Result: ArUGAIDvNVNFpY87/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMQCzQSFBgNJIgECNIZF456B4Q4BKkZgWqDTCE X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="95344840" Original-Received: from 69-165-143-59.dsl.teksavvy.com (HELO pastel.home) ([69.165.143.59]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Oct 2014 13:12:53 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 23B007CFF; Mon, 27 Oct 2014 13:12:53 -0400 (EDT) In-Reply-To: <87vbn5bpnk.fsf@violet.siamics.net> (Ivan Shmakov's message of "Mon, 27 Oct 2014 13:36:31 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.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:95163 >> That looks OK, yes. Tho you don't need to change -L to --label. > The point is that, strictly speaking, (diff-check-labels) only > checks for the --label option proper, not for its aliases. Of course, part of the question, then is: are there diff commands that handle one of the two but not the other. If there are, then we should use the one that's more often supported, and if there aren't then it doesn't matter. So far, smerge-mode hasn't even bothered to check, so maybe the check isn't that important any more (IIRC it was added for Solaris's diff, tho I'd suspect that current derivatives of Solaris woujld accept either -L or --label or both). Stefan