Merged in changes from CVS trunk (Jan Djärv has fixed the XSync call in xterm.c, no need to disable it anymore).

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-506
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-507
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-508
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-238

2 files changed, 9 insertions, 6 deletions

diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 1a222e6004e..db16f2f78f3 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -665,7 +665,7 @@ useful, such as version control."
   "*Regexp matching files we don't want displayed in a speedbar buffer.
 It is generated from the variable `completion-ignored-extensions'")
 
-;; Ugly compiler silencing trick.  The real defvar comes later in this file.
+;; Compiler silencing trick.  The real defvar comes later in this file.
 (defvar speedbar-file-regexp)
 
 ;; this is dangerous to customize, because the defaults will probably
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 82c09cbd435..fafb5eff7cd 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -1,6 +1,7 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control
 
-;; Copyright (C) 1995,98,99,2000,2001,02,2003  Free Software Foundation, Inc.
+;; 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 <monnier@gnu.org>
@@ -363,7 +364,10 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
                (append (vc-switches nil 'diff) '("/dev/null")))
         ;; Even if it's empty, it's locally modified.
         1)
-    (let* ((switches (vc-switches 'SVN 'diff))
+    (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,8 +375,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
              (if async 'async 0)
              file "diff"
              (append
-              (when switches
-                (list "-x" (mapconcat 'identity switches " ")))
+              switches
               (when oldvers
                 (list "-r" (if newvers (concat oldvers ":" newvers)
                              oldvers)))))
@@ -504,5 +507,5 @@ essential information."
 
 (provide 'vc-svn)
 
-;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
+;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
 ;;; vc-svn.el ends here