Fix some oddities in Tramp's rsync and smb methods

[gnu-emacs] / lisp / vc / diff.el

diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 0fc0d2e3f733ae82192fc8f11c42414202c0bbc9..6b316c4073c617c59870febd7401a31bcbc53200 100644 (file)
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -1,11 +1,11 @@
 ;;; diff.el --- run `diff'  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1992, 1994, 1996, 2001-2013 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1996, 2001-2016 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Frank Bresz
 ;; (according to authors.el)
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: unix, vc, tools
 
 ;; This file is part of GNU Emacs.
@@ -38,7 +38,7 @@
   :group 'tools)
 
 ;;;###autoload
-(defcustom diff-switches (purecopy "-c")
+(defcustom diff-switches (purecopy "-u")
   "A string or list of strings specifying switches to be passed to diff."
   :type '(choice string (repeat string))
   :group 'diff)
@@ -167,7 +167,7 @@ Possible values are:
       (setq default-directory thisdir)
       (let ((inhibit-read-only t))
        (insert command "\n"))
-      (if (and (not no-async) (fboundp 'start-process))
+      (if (and (not no-async) (fboundp 'make-process))
          (let ((proc (start-process "Diff" buf shell-file-name
                                      shell-command-switch command)))
            (set-process-filter proc 'diff-process-filter)