emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/vc-svn.el [lexbind]


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/vc-svn.el [lexbind]
Date: Sat, 04 Sep 2004 05:41:20 -0400

Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.12.2.3 emacs/lisp/vc-svn.el:1.12.2.4
*** emacs/lisp/vc-svn.el:1.12.2.3       Tue Jul  6 09:41:25 2004
--- emacs/lisp/vc-svn.el        Sat Sep  4 09:26:22 2004
***************
*** 1,6 ****
  ;;; vc-svn.el --- non-resident support for Subversion version-control
  
! ;; Copyright (C) 1995,98,99,2000,2001,02,2003  Free Software Foundation, Inc.
  
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Stefan Monnier <address@hidden>
--- 1,7 ----
  ;;; vc-svn.el --- non-resident support for Subversion version-control
  
! ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
! ;;           Free Software Foundation, Inc.
  
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Stefan Monnier <address@hidden>
***************
*** 363,369 ****
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
        1)
!     (let* ((switches (vc-switches 'SVN 'diff))
           (async (and (vc-stay-local-p file)
                       (or oldvers newvers) ; Svn diffs those locally.
                       (fboundp 'start-process))))
--- 364,373 ----
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
        1)
!     (let* ((switches
!           (if vc-svn-diff-switches
!               (vc-switches 'SVN 'diff)
!             (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
           (async (and (vc-stay-local-p file)
                       (or oldvers newvers) ; Svn diffs those locally.
                       (fboundp 'start-process))))
***************
*** 371,378 ****
             (if async 'async 0)
             file "diff"
             (append
!             (when switches
!               (list "-x" (mapconcat 'identity switches " ")))
              (when oldvers
                (list "-r" (if newvers (concat oldvers ":" newvers)
                             oldvers)))))
--- 375,381 ----
             (if async 'async 0)
             file "diff"
             (append
!             switches
              (when oldvers
                (list "-r" (if newvers (concat oldvers ":" newvers)
                             oldvers)))))
***************
*** 504,508 ****
  
  (provide 'vc-svn)
  
! ;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
  ;;; vc-svn.el ends here
--- 507,511 ----
  
  (provide 'vc-svn)
  
! ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
  ;;; vc-svn.el ends here




reply via email to

[Prev in Thread] Current Thread [Next in Thread]