diff options
| author | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
| commit | f23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch) | |
| tree | ded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/vc-svn.el | |
| parent | e2d092da5980a7d05a5428074f8eb4925fa801e8 (diff) | |
| parent | a457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff) | |
| download | emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.bz2 emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/vc-svn.el')
| -rw-r--r-- | lisp/vc-svn.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 76fdbe5162f..b83f8e0580f 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -391,7 +391,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (vc-delistify (mapcar 'file-relative-name files)) "\n")) (vc-svn-command buffer - (if (and (= (length files) 1) (vc-stay-local-p (car files)) (fboundp 'start-process)) 'async 0) + (if (and (= (length files) 1) (vc-stay-local-p (car files))) 'async 0) files "log" ;; By default Subversion only shows the log upto the working revision, ;; whereas we also want the log of the subsequent commits. At least @@ -422,8 +422,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " ")))) (async (and (not vc-disable-async-diff) (vc-stay-local-p files) - (or oldvers newvers) ; Svn diffs those locally. - (fboundp 'start-process)))) + (or oldvers newvers)))) ; Svn diffs those locally. (apply 'vc-svn-command buffer (if async 'async 0) files "diff" |