# HG changeset patch # User Richard M. Stallman # Date 736545122 0 # Node ID 62869d9964850e01df76af687f48cade2def93e0 # Parent 0988b26ce4221f9bab9689b49278ab8d5b024e1a (vc-backend-diff): Use diff-switches, not vc-diff-options. (vc-diff-options): Variable deleted. diff -r 0988b26ce422 -r 62869d996485 lisp/vc.el --- a/lisp/vc.el Tue May 04 19:33:17 1993 +0000 +++ b/lisp/vc.el Tue May 04 19:52:02 1993 +0000 @@ -73,8 +73,6 @@ (defvar vc-default-back-end nil "*Back-end actually used by this interface; may be SCCS or RCS. The value is only computed when needed to avoid an expensive search.") -(defvar vc-diff-options '("-a" "-c2") - "*The command/flags list to be used in constructing diff commands.") (defvar vc-suppress-confirm nil "*If non-nil, reat user as expert; suppress yes-no prompts on some things.") (defvar vc-keep-workfiles t @@ -692,7 +690,11 @@ ;;;###autoload (defun vc-diff (historic) - "Display diffs between file versions." + "Display diffs between file versions. +Normally this compares the current file and buffer with the most recent +checked in version of that file. This uses no arguments. +With a prefix argument, it reads the file name to use +and two version designators specifying which versions to compare." (interactive "P") (if vc-dired-mode (set-buffer (find-file-noselect (dired-get-filename)))) @@ -1449,7 +1451,7 @@ file (and oldvers (concat "-r" oldvers)) (and newvers (concat "-r" newvers)) - vc-diff-options + diff-switches )) (defun vc-check-headers () @@ -1507,9 +1509,6 @@ vc-suppress-confirm Suppresses some confirmation prompts, notably for reversions. - vc-diff-options A list consisting of the flags - to be used for generating context diffs. - vc-header-alist Which keywords to insert when adding headers with \\[vc-insert-headers]. Defaults to '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS.