RE: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

["Marshall, Simon" <simon.marshall@misys.com>]

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

> 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.



[-- Attachment #2: vc.el.diff --]
[-- Type: application/octet-stream, Size: 1955 bytes --]

Index: lisp/vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.420
diff -c -r1.420 vc.el
*** lisp/vc.el	23 Jun 2006 17:29:19 -0000	1.420
--- lisp/vc.el	26 Jun 2006 09:34:16 -0000
***************
*** 1846,1852 ****
      (if (and file-rev1 file-rev2)
          (let ((status
                 (if (eq vc-diff-knows-L 'no)
!                    (apply 'vc-do-command "*vc-diff*" 1 "diff"
                            (append (vc-switches nil 'diff)
                                    (list (file-relative-name file-rev1)
                                          (file-relative-name file-rev2))))
--- 1846,1852 ----
      (if (and file-rev1 file-rev2)
          (let ((status
                 (if (eq vc-diff-knows-L 'no)
!                    (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
                            (append (vc-switches nil 'diff)
                                    (list (file-relative-name file-rev1)
                                          (file-relative-name file-rev2))))
***************
*** 1864,1870 ****
            (if (eq status 2)
                (if (not vc-diff-knows-L)
                    (setq vc-diff-knows-L 'no
!                         status (apply 'vc-do-command "*vc-diff*" 1 "diff"
                                        (append 
                                         (vc-switches nil 'diff)
                                         (list (file-relative-name file-rev1)
--- 1864,1870 ----
            (if (eq status 2)
                (if (not vc-diff-knows-L)
                    (setq vc-diff-knows-L 'no
!                         status (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
                                        (append 
                                         (vc-switches nil 'diff)
                                         (list (file-relative-name file-rev1)

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel