From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.devel Subject: Re: diff-apply-hunk broken Date: Thu, 08 Apr 2004 07:23:18 +0300 Organization: JURTA Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <8765cgz3dd.fsf@mail.jurta.org> References: <1080547857.5425.676.camel@localhost> <1080658566.29736.101.camel@localhost> <20040331230818.GD6299@fencepost> <7wfzbnb71m.fsf@sic.twinsun.com> <7494-Fri02Apr2004093233+0300-eliz@gnu.org> <7w65cihr3j.fsf@sic.twinsun.com> <87hdw13n7o.fsf-monnier+emacs@iro.umontreal.ca> <7wsmflj0ot.fsf@sic.twinsun.com> <87brm93k9q.fsf-monnier+emacs@iro.umontreal.ca> <7wzn9tfths.fsf@sic.twinsun.com> NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1081398906 8074 80.91.224.253 (8 Apr 2004 04:35:06 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 8 Apr 2004 04:35:06 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Thu Apr 08 06:34:59 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1BBRFj-0008FI-00 for ; Thu, 08 Apr 2004 06:34:59 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1BBRFg-00068T-00 for ; Thu, 08 Apr 2004 06:34:57 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBRCY-0007dD-Rd for emacs-devel@quimby.gnus.org; Thu, 08 Apr 2004 00:31:42 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1BBRCT-0007cM-BE for emacs-devel@gnu.org; Thu, 08 Apr 2004 00:31:37 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1BBRBv-0007Vf-UK for emacs-devel@gnu.org; Thu, 08 Apr 2004 00:31:35 -0400 Original-Received: from [66.33.219.6] (helo=knife.dreamhost.com) by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBRBv-0007VY-Mv for emacs-devel@gnu.org; Thu, 08 Apr 2004 00:31:03 -0400 Original-Received: from mail.jurta.org (80-235-33-231-dsl.mus.estpak.ee [80.235.33.231]) by knife.dreamhost.com (Postfix) with ESMTP id 8F41AE408C; Wed, 7 Apr 2004 21:31:01 -0700 (PDT) Original-To: Paul Eggert In-Reply-To: <7wzn9tfths.fsf@sic.twinsun.com> (Paul Eggert's message of "Fri, 02 Apr 2004 22:47:11 -0800") User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3.50 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:21346 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:21346 Paul Eggert writes: > At 02 Apr 2004 20:48:04 -0500, Stefan Monnier writes: >>>> Is --label accepted by all known non-ancient diff implementations? >>> Yes. --label has been supported ever since diffutils 2.0, released in >>> 1992. These days it's safe to assume --label, if it's GNU diff. >> >> I can't assume GNU diff. So how about other system's `diff'? > > Some "diff" implementations lack -L, so portable applications cannot > use "diff -L". For example, Solaris 9 "diff" lacks -L. -L is not > standardized by POSIX. > > I recall that this is not a problem with GNU Emacs, as it tests > whether diff supports -L (or --label) before using that option. It seems that GNU Emacs have no such a test, but fortunately there are only three files (diff.el, smerge-mode.el and vc.el) that use a "-L" string, so it's not a problem to replace "-L" by "--label" in these files. -- Juri Linkov http://www.jurta.org/emacs/