diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-05-28 23:04:54 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-05-28 23:04:54 +0000 |
| commit | 138c4b3d36b8390387da752825f98d56535f6459 (patch) | |
| tree | 75426a55312b0bcb84a854b874c7eb41ad8e37bc /lisp/vc-mcvs.el | |
| parent | bf37bf11f9968f609663e85a3240f164aa1c4dc1 (diff) | |
| download | emacs-138c4b3d36b8390387da752825f98d56535f6459.tar.gz | |
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
Diffstat (limited to 'lisp/vc-mcvs.el')
| -rw-r--r-- | lisp/vc-mcvs.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index 94beb7eb093..5c0bac48b3a 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -438,17 +438,17 @@ The changes are between FIRST-VERSION and SECOND-VERSION." ;;; History functions ;;; -(defun vc-mcvs-print-log (file) +(defun vc-mcvs-print-log (file &optional buffer) "Get change log associated with FILE." (let ((default-directory (vc-mcvs-root file))) ;; Run the command from the root dir so that `mcvs filt' returns ;; valid relative names. (vc-mcvs-command - nil + buffer (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0) file "log"))) -(defun vc-mcvs-diff (file &optional oldvers newvers) +(defun vc-mcvs-diff (file &optional oldvers newvers buffer) "Get a difference report using Meta-CVS between two versions of FILE." (if (string= (vc-workfile-version file) "0") ;; This file is added but not yet committed; there is no master file. @@ -457,7 +457,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." ;; We regard this as "changed". ;; Diff it against /dev/null. ;; Note: this is NOT a "mcvs diff". - (apply 'vc-do-command "*vc-diff*" + (apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" file (append (vc-switches nil 'diff) '("/dev/null"))) ;; Even if it's empty, it's locally modified. @@ -467,7 +467,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." ;; valid relative names. (default-directory (vc-mcvs-root file)) (status - (apply 'vc-mcvs-command "*vc-diff*" + (apply 'vc-mcvs-command (or buffer "*vc-diff*") (if async 'async 1) file "diff" (and oldvers (concat "-r" oldvers)) |