From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Marshall, Simon" Newsgroups: gmane.emacs.devel Subject: RE: [simon.marshall@misys.com: vc-diff uses unknown -L switch] Date: Mon, 26 Jun 2006 10:35:43 +0100 Message-ID: <81CCA6588E60BB42BE68BD029ED4826007B7709B@wimex2.wim.midas-kapiti.com> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_NextPart_000_01C69903.E5087088" X-Trace: sea.gmane.org 1151314665 7057 80.91.229.2 (26 Jun 2006 09:37:45 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 26 Jun 2006 09:37:45 +0000 (UTC) Cc: "'emacs-devel@gnu.org'" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 26 11:37:43 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FunWt-00068u-Nf for ged-emacs-devel@m.gmane.org; Mon, 26 Jun 2006 11:37:16 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FunWt-0004uJ-4f for ged-emacs-devel@m.gmane.org; Mon, 26 Jun 2006 05:37:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FunWA-0004aE-Ln for emacs-devel@gnu.org; Mon, 26 Jun 2006 05:36:30 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FunW9-0004ZX-VZ for emacs-devel@gnu.org; Mon, 26 Jun 2006 05:36:30 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FunW9-0004ZN-Ig for emacs-devel@gnu.org; Mon, 26 Jun 2006 05:36:29 -0400 Original-Received: from [217.68.146.190] (helo=cluster-b.mailcontrol.com) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1Funhy-0001BO-9v; Mon, 26 Jun 2006 05:48:42 -0400 Original-Received: from wimex2.wim.midas-kapiti.com ([217.196.233.101]) by rly33b.srv.mailcontrol.com (MailControl) with ESMTP id k5Q9aP8m001981; Mon, 26 Jun 2006 10:36:25 +0100 Original-Received: by wimex2.wim.midas-kapiti.com with Internet Mail Service (5.5.2657.72) id ; Mon, 26 Jun 2006 10:35:45 +0100 Original-To: "'Andre Spiegel'" X-Mailer: Internet Mail Service (5.5.2657.72) X-Scanned-By: MailControl A-07-00-10 (www.mailcontrol.com) on 10.66.0.143 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:56189 Archived-At: This message is in MIME format. Since your mail reader does not understand this format, some or all of this message may not be legible. ------_=_NextPart_000_01C69903.E5087088 Content-Type: text/plain > I've just installed a patch to deal with this. It uses the > same mechanism that VC already uses to find out if rcsdiff > understands the --brief option. VC will first try to use -L, > and then remember whether it worked in the new variable > vc-diff-knows-L. > > The patch assumes that a "diff" that does not understand -L > returns error code 2 when the option is used. I have not > been able to verify this with Solaris 8 diff, but I'm pretty > sure that this is how it's reported. > > If anybody sees a more elegant way to implement this, please > don't hesitate to change it. Hi Andre, I just did a cvs update to try it out. On C-x v =, I get: diff: two filename arguments required I think the attached patch fixes it. Simon. ------_=_NextPart_000_01C69903.E5087088 Content-Type: application/octet-stream; name="vc.el.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="vc.el.diff" Index: lisp/vc.el=0A= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A= RCS file: /sources/emacs/emacs/lisp/vc.el,v=0A= retrieving revision 1.420=0A= diff -c -r1.420 vc.el=0A= *** lisp/vc.el 23 Jun 2006 17:29:19 -0000 1.420=0A= --- lisp/vc.el 26 Jun 2006 09:34:16 -0000=0A= ***************=0A= *** 1846,1852 ****=0A= (if (and file-rev1 file-rev2)=0A= (let ((status=0A= (if (eq vc-diff-knows-L 'no)=0A= ! (apply 'vc-do-command "*vc-diff*" 1 "diff"=0A= (append (vc-switches nil 'diff)=0A= (list (file-relative-name = file-rev1)=0A= (file-relative-name = file-rev2))))=0A= --- 1846,1852 ----=0A= (if (and file-rev1 file-rev2)=0A= (let ((status=0A= (if (eq vc-diff-knows-L 'no)=0A= ! (apply 'vc-do-command "*vc-diff*" 1 "diff" nil=0A= (append (vc-switches nil 'diff)=0A= (list (file-relative-name = file-rev1)=0A= (file-relative-name = file-rev2))))=0A= ***************=0A= *** 1864,1870 ****=0A= (if (eq status 2)=0A= (if (not vc-diff-knows-L)=0A= (setq vc-diff-knows-L 'no=0A= ! status (apply 'vc-do-command "*vc-diff*" 1 = "diff"=0A= (append =0A= (vc-switches nil 'diff)=0A= (list (file-relative-name = file-rev1)=0A= --- 1864,1870 ----=0A= (if (eq status 2)=0A= (if (not vc-diff-knows-L)=0A= (setq vc-diff-knows-L 'no=0A= ! status (apply 'vc-do-command "*vc-diff*" 1 = "diff" nil=0A= (append =0A= (vc-switches nil 'diff)=0A= (list (file-relative-name = file-rev1)=0A= ------_=_NextPart_000_01C69903.E5087088 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-devel ------_=_NextPart_000_01C69903.E5087088--