Mercurial > emacs
changeset 55815:a6b86fce5676
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 28 May 2004 23:04:54 +0000 |
| parents | 45f2afeb662b |
| children | a4fe04f4d9c2 |
| files | lisp/vc-mcvs.el |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-mcvs.el Fri May 28 23:04:07 2004 +0000 +++ b/lisp/vc-mcvs.el Fri May 28 23:04:54 2004 +0000 @@ -438,17 +438,17 @@ ;;; 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 @@ ;; 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 @@ ;; 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))