Mercurial > emacs
comparison lisp/vc.el @ 2667:62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
(vc-diff-options): Variable deleted.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 04 May 1993 19:52:02 +0000 |
parents | 0988b26ce422 |
children | be85636d8b6e |
comparison
equal
deleted
inserted
replaced
2666:0988b26ce422 | 2667:62869d996485 |
---|---|
71 ;; General customization | 71 ;; General customization |
72 | 72 |
73 (defvar vc-default-back-end nil | 73 (defvar vc-default-back-end nil |
74 "*Back-end actually used by this interface; may be SCCS or RCS. | 74 "*Back-end actually used by this interface; may be SCCS or RCS. |
75 The value is only computed when needed to avoid an expensive search.") | 75 The value is only computed when needed to avoid an expensive search.") |
76 (defvar vc-diff-options '("-a" "-c2") | |
77 "*The command/flags list to be used in constructing diff commands.") | |
78 (defvar vc-suppress-confirm nil | 76 (defvar vc-suppress-confirm nil |
79 "*If non-nil, reat user as expert; suppress yes-no prompts on some things.") | 77 "*If non-nil, reat user as expert; suppress yes-no prompts on some things.") |
80 (defvar vc-keep-workfiles t | 78 (defvar vc-keep-workfiles t |
81 "*If non-nil, don't delete working files after registering changes.") | 79 "*If non-nil, don't delete working files after registering changes.") |
82 (defvar vc-initial-comment nil | 80 (defvar vc-initial-comment nil |
690 | 688 |
691 ;; Additional entry points for examining version histories | 689 ;; Additional entry points for examining version histories |
692 | 690 |
693 ;;;###autoload | 691 ;;;###autoload |
694 (defun vc-diff (historic) | 692 (defun vc-diff (historic) |
695 "Display diffs between file versions." | 693 "Display diffs between file versions. |
694 Normally this compares the current file and buffer with the most recent | |
695 checked in version of that file. This uses no arguments. | |
696 With a prefix argument, it reads the file name to use | |
697 and two version designators specifying which versions to compare." | |
696 (interactive "P") | 698 (interactive "P") |
697 (if vc-dired-mode | 699 (if vc-dired-mode |
698 (set-buffer (find-file-noselect (dired-get-filename)))) | 700 (set-buffer (find-file-noselect (dired-get-filename)))) |
699 (while vc-parent-buffer | 701 (while vc-parent-buffer |
700 (pop-to-buffer vc-parent-buffer)) | 702 (pop-to-buffer vc-parent-buffer)) |
1447 (or (vc-backend-dispatch file "vcdiff" "rcsdiff") | 1449 (or (vc-backend-dispatch file "vcdiff" "rcsdiff") |
1448 (error "File %s is not under version control." file)) | 1450 (error "File %s is not under version control." file)) |
1449 file | 1451 file |
1450 (and oldvers (concat "-r" oldvers)) | 1452 (and oldvers (concat "-r" oldvers)) |
1451 (and newvers (concat "-r" newvers)) | 1453 (and newvers (concat "-r" newvers)) |
1452 vc-diff-options | 1454 diff-switches |
1453 )) | 1455 )) |
1454 | 1456 |
1455 (defun vc-check-headers () | 1457 (defun vc-check-headers () |
1456 "Check if the current file has any headers in it." | 1458 "Check if the current file has any headers in it." |
1457 (interactive) | 1459 (interactive) |
1504 vc-keep-workfiles Non-nil value prevents workfiles from being | 1506 vc-keep-workfiles Non-nil value prevents workfiles from being |
1505 deleted when changes are checked in | 1507 deleted when changes are checked in |
1506 | 1508 |
1507 vc-suppress-confirm Suppresses some confirmation prompts, | 1509 vc-suppress-confirm Suppresses some confirmation prompts, |
1508 notably for reversions. | 1510 notably for reversions. |
1509 | |
1510 vc-diff-options A list consisting of the flags | |
1511 to be used for generating context diffs. | |
1512 | 1511 |
1513 vc-header-alist Which keywords to insert when adding headers | 1512 vc-header-alist Which keywords to insert when adding headers |
1514 with \\[vc-insert-headers]. Defaults to | 1513 with \\[vc-insert-headers]. Defaults to |
1515 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS. | 1514 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS. |
1516 | 1515 |